56454 Commits

Author SHA1 Message Date
Adam Powell
1029866a12 Fix bug 5159596 - Slider grabs touch point when trying to scroll a list
SeekBar widgets were not good citizens when placed in scrolling containers.
Detect when a SeekBar being touched is in a scrolling container and fall
back to a touch slop-based method for beginning a drag. Taps along the
seek bar itself will still change the value on touch up, even if the touch
slop never initiated a proper drag.

Factor out the code used to determine scrolling container status in View
into something that can be reused elsewhere in the framework; leave it
@hidden for now.

Change-Id: I59a21e8ab2c3b0092fafedbcd6ae1ee15f45971c
2011-08-14 18:29:23 -07:00
Adam Powell
37d81ac316 Merge "Fix bug 4981687 - WiFi connection dialog should dismiss when tapped outside." 2011-08-14 17:38:27 -07:00
Adam Powell
27b1c978ce Merge "Fix bug 5154361 - New force close dialog text breaks button order rules" 2011-08-14 17:23:29 -07:00
Adam Powell
d42bc52030 Fix bug 4981687 - WiFi connection dialog should dismiss when tapped outside.
Be more forceful in how we allow touch outside to dismiss in
non-fullscreen situations. Dialogs will be canceled. Activities will
be finished.

Change-Id: I041a60501319829a2214f9249d154d5513049a0f
2011-08-14 17:16:37 -07:00
Adam Powell
40a9784d48 Fix bug 5154361 - New force close dialog text breaks button order rules
Reorder the force close/ANR dialog buttons to better match the new
rules/intent from UX.

Change-Id: I30fed56aabd0cc91d07852807347057176d82aaa
2011-08-14 17:13:10 -07:00
Adam Powell
32ab095751 Merge "Fix bug 5159736 - Make DeviceDefault the default" 2011-08-14 16:57:45 -07:00
Adam Powell
6e90a362bc Fix bug 5159736 - Make DeviceDefault the default
Have the framework refer to the DeviceDefault themes for ICS apps that
don't explicitly request another theme.

Change-Id: I27dd0bbaa60f71df4f36e47d260f556d923ba075
2011-08-14 16:49:22 -07:00
Jean-Michel Trivi
70b5c66a24 Merge "Fail request for audio focus when linkToDeath fails" 2011-08-14 16:12:09 -07:00
Daniel Lehmann
b93ce4ae86 Merge "Several API changes as requested by ES:" 2011-08-14 16:01:59 -07:00
Daniel Lehmann
f188dfda30 Several API changes as requested by ES:
- Switch from resource ids to names to prevent breakage on package upgrade
   Bug:5135277
 - Add SYNC1...SYNC4 columns to StreamItems and StreamItemPhotos
   Bug:5119385
 - Remove ACTION, ACTION_URI from Groups, StreamItems and StreamItemPhotos
   (this reduces db size and prevents click intercepting)
   Bug:5135808
 - Add some raw-contact fields to the StreamItem query
   Bug:5134081

Doing those changes in one block to prevent too many db upgrade steps

Change-Id: I5618e210206e0315b91f5883e6b6b386dccb5881
2011-08-14 15:39:22 -07:00
Jean-Michel Trivi
baf674eedd Fail request for audio focus when linkToDeath fails
When requesting audio focus and linkToDeath() threw a
 RemoteException, AudioService was only logging a warning, and
 was still changing the focus, with a non-null death handler.
The change first check that linkToDeath() didn't fail, and only
 then proceeds to change the focus (dispatch focus change
 notification, updates the focus stack, and updates the remote
 controls).

Change-Id: I0b96dd3c6e924d93f419880349d49f8b360b110b
2011-08-14 15:16:21 -07:00
Mike Lockwood
52727fc38a Merge "MediaScanner: Clear file path before deleting records to avoid accidental file deletions" 2011-08-14 14:39:12 -07:00
Jean-Michel Trivi
5a586199ce Merge "Fix leak of global references and AudioFocusDeathHandler objects." 2011-08-14 14:24:09 -07:00
Elliott Hughes
be414332a1 Fix android.text.format.Time to use GetBooleanField on its boolean field.
Bug: 5162851
Change-Id: I49b1429e86ffa91fbfb8b4c9d1a0c6d30c72621e
2011-08-14 13:31:03 -07:00
Jean-Michel Trivi
061214bb71 Fix leak of global references and AudioFocusDeathHandler objects.
Need to call unlinkToDeath() for the object to be garbage collected.
Save the object in the FocusStackEntry, unlink to death when we remove it from the stack.
See http://b/issue?id=5048400

Change-Id: I84c5ba46017d0a8744b5e7509a7c7a5c8dd918fb
author: olivier@google.com
2011-08-14 11:37:24 -07:00
Mike Lockwood
f2e2b523dd MediaScanner: Clear file path before deleting records to avoid accidental file deletions
Bug: 5140112
See also http://code.google.com/p/android/issues/detail?id=3692

Change-Id: I971eea83a2f3986a0b0ea018b7211f2525b914ab
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-08-14 10:35:54 -07:00
Adam Powell
99f09c27a4 Merge "Fix bug 5078498 - Icons jump around on split action bar" 2011-08-12 23:36:20 -07:00
Adam Powell
14b7e2c168 Fix bug 5078498 - Icons jump around on split action bar
Revise measurement and layout code for the lower menu on a split
action bar.

Fix some metrics in the action mode close button and in button bars.

Change-Id: I76215e28ae3b0199162dedd32794b25c9e38a346
2011-08-12 23:34:47 -07:00
Wink Saville
a91f2703ae Merge "Update sim_removed_message string." 2011-08-12 23:22:08 -07:00
Romain Guy
3a5f2e6f09 Merge "<blink/> is not an acceptable default behavior. Bug #5156334" 2011-08-12 19:39:20 -07:00
Dianne Hackborn
9beeb95c80 Merge "Turn off hinting by default for higher density displays." 2011-08-12 19:17:09 -07:00
Dianne Hackborn
f43fa5746e Turn off hinting by default for higher density displays.
Also adds an API for apps to control whether hinting is used.

Change-Id: I1a06b06255fbb8d0f02a8ce48c2cd60019088ed3
2011-08-12 18:59:39 -07:00
Eric Laurent
54074fe3c8 Merge "Issue 5081351: isWiredHeadsetOn() permission." 2011-08-12 18:48:35 -07:00
Amith Yamasani
f9ef0db88f Merge "Use a weakreference to prevent the static variable from holding an Activity." 2011-08-12 18:35:50 -07:00
Eric Laurent
497b3fe725 Issue 5081351: isWiredHeadsetOn() permission.
AudioManager.isWiredHeadsetOn() should not require permission MODIFY_AUDIO_SETTINGS.
Remove permission checks on all getters in audio policy manager as permission enforcement
is really usefull for setters.
Also deprecate AudioManager.isWiredHeadsetOn() which name and implementation are deceptive.

Change-Id: I38f8df7c26c0d417bf0e2b74e4c11c2d143f2ecd
2011-08-12 17:43:35 -07:00
Mathias Agopian
7b53848d14 Merge "fix an orientation change drawing artifact." 2011-08-12 17:13:01 -07:00
Mathias Agopian
b290b5e3cb fix an orientation change drawing artifact.
a wrong orientation would be briefly shown when
rotation the screen. this happened when the window manager
set a custom transformation and the h/w composer was used.

the custom transformation was applied twice in that case.

Bug: 5037522
Change-Id: Ic1f87b63cd843f4475e4265d1624463825d775c4
2011-08-12 17:09:09 -07:00
James Dong
65de903a88 Merge "If release has been called before finalize, do not expect MediaPlayer still exists" 2011-08-12 16:41:56 -07:00
James Dong
43ef913815 If release has been called before finalize, do not expect MediaPlayer still exists
o also, we should releae the surface object when release is called, not wait until finalize is called.

related-to-bug: 5157956

Change-Id: I0233ad61d8349c3e3800de68b752b9548ece1742
2011-08-12 16:39:47 -07:00
Conley Owens
e81ad0aa13 am e5cb629f: Merge "Add missing include" include exists
* commit 'e5cb629f3761b272ea52104c1093e0007f5c41b5':
  Add missing include
2011-08-12 16:27:01 -07:00
Amith Yamasani
5d36715a76 am 648dc03c: am 4dbd1bc6: am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"
* commit '648dc03cd038a726b25929f9ffc142eb16e891e8':
  VolumePreference.onActivityStop only stops playback
2011-08-12 16:26:57 -07:00
Conley Owens
d136456e29 am 9903da81: Merge "Added stub for getting buffer" stub exists
* commit '9903da81cb52f629bffb73748c1da5cdda921ca4':
  added stub for getting buffer from surface texture
2011-08-12 16:26:31 -07:00
Alex Sakhartchouk
c929158f0e Merge "Fix to the memory leak problem." 2011-08-12 15:29:46 -07:00
Romain Guy
50d133e290 <blink/> is not an acceptable default behavior.
Bug #5156334

Change-Id: I9f803b090e81f4e490d0cccd6347a0f9f64bd20f
2011-08-12 15:25:28 -07:00
Dianne Hackborn
7c0d8472d0 Merge "Fix some crashes that are happening in the system process." 2011-08-12 15:22:32 -07:00
Marco Nelissen
585f727b38 Merge "Don't remove effects on session 0" 2011-08-12 15:17:26 -07:00
Dianne Hackborn
61aa9f3b56 Merge "Don't use HW accel drawing in lock screen on lower-end devices." 2011-08-12 15:16:54 -07:00
Jason Sams
f5af42933d Merge "Fix the RS frame timeout. Previous a slow app would block from receiving new commands until the timer expired. This change will expire the timer immediatly." 2011-08-12 15:16:39 -07:00
claireho
2574bf6880 Merge "Thai font update for Bug2954567." 2011-08-12 15:16:21 -07:00
Jason Sams
bfc7891bdd Fix the RS frame timeout.
Previous a slow app would block from receiving new
commands until the timer expired.  This change will
expire the timer immediatly.

Change-Id: I42b949d21f98ee0f1d3156763cd723c3e9cabb67
2011-08-12 15:05:15 -07:00
Marco Nelissen
2255a1e64f Don't remove effects on session 0
b/5159902
Change-Id: Id6f29fb1c687069f7480dd81d4745a558f202226
2011-08-12 14:54:56 -07:00
Amith Yamasani
352c01e213 Use a weakreference to prevent the static variable from holding an Activity.
Bug: 5057764

Change-Id: If734e3ef4928b21a5e31e0ad50c97da287c3c116
2011-08-12 14:40:43 -07:00
Adam Powell
202a4eae02 Merge "Fix bug 5095223 - ICS action bar incorrectly resizing app icons" 2011-08-12 14:37:37 -07:00
Romain Guy
e52531121d Merge "Make sure we correctly copy caches keys. Bug #5136067" 2011-08-12 14:35:27 -07:00
Romain Guy
e5df231434 Make sure we correctly copy caches keys.
Bug #5136067

Change-Id: I366e840bef44415436dc7b13d89cfb610feed663
2011-08-12 14:23:53 -07:00
Dianne Hackborn
b375632c9c Don't use HW accel drawing in lock screen on lower-end devices.
This saves about 8MB in the system process because we don't need
to do HW accelerated drawing there anymore.

Change-Id: Ieaf72fe772536e12d10cf129d9338ca9fce6a6d4
2011-08-12 14:23:03 -07:00
Adam Powell
f2b0961944 Fix bug 5095223 - ICS action bar incorrectly resizing app icons
Remove experimental auto-mipmapping of icons.

Change-Id: I326ca396331a050985200b2ecf0d892474262916
2011-08-12 14:21:57 -07:00
Dianne Hackborn
8e8d65ff5f Fix some crashes that are happening in the system process.
- When shutting down, if the screen goes to sleep there is code
  that tries to do a notifyAll without holding the lock:

java.lang.IllegalMonitorStateException: object not locked by thread before notifyAll()
	at java.lang.Object.notifyAll(Native Method)
	at com.android.server.am.ActivityStack.checkReadyForSleepLocked(ActivityStack.java:776)
	at com.android.server.am.ActivityStack$1.handleMessage(ActivityStack.java:282)
	at android.os.Handler.dispatchMessage(Handler.java:99)
	at android.os.Looper.loop(Looper.java:137)
	at com.android.server.ServerThread.run(SystemServer.java:603)

- If an invalid Uri object is sent to the system process it can crash because
  the Uri class throws an assertion while unmarshalling.  Change this to an
  IllegalArgumentException so it gets sent back to the caller:

java.lang.AssertionError
	at android.net.Uri$PathPart.readFrom(Uri.java:2224)
	at android.net.Uri$HierarchicalUri.readFrom(Uri.java:1106)
	at android.net.Uri$1.createFromParcel(Uri.java:1689)
	at android.net.Uri$1.createFromParcel(Uri.java:1681)
	at android.content.IContentService$Stub.onTransact(IContentService.java:53)
	at android.content.ContentService.onTransact(ContentService.java:120)
	at android.os.Binder.execTransact(Binder.java:338)
	at dalvik.system.NativeStart.run(Native Method)

- StrictMode can try to access the first index in the stack crawl of a stack crawl
  array of length 0.  Not sure why this happens, but make the code more robust:

java.lang.ArrayIndexOutOfBoundsException: length=0; index=0
	at android.app.ApplicationErrorReport$CrashInfo.<init>(ApplicationErrorReport.java:341)
	at android.os.StrictMode$ViolationInfo.<init>(StrictMode.java:1978)
	at android.os.StrictMode$AndroidBlockGuardPolicy.startHandlingViolationException(StrictMode.java:1097)
	at android.os.StrictMode$AndroidBlockGuardPolicy.onReadFromDisk(StrictMode.java:1068)
	at libcore.io.BlockGuardOs.read(BlockGuardOs.java:137)
	at libcore.io.IoBridge.read(IoBridge.java:426)
	at java.io.FileInputStream.read(FileInputStream.java:179)
	at java.io.InputStream.read(InputStream.java:148)
	at com.android.internal.os.ProcessStats.readFile(ProcessStats.java:804)
	at com.android.internal.os.ProcessStats.getCpuSpeedTimes(ProcessStats.java:564)
	at com.android.internal.os.ProcessStats.getLastCpuSpeedTimes(ProcessStats.java:545)
	at com.android.server.am.ActivityManagerService.updateCpuStatsNow(ActivityManagerService.java:1470)
	at com.android.server.am.ActivityManagerService.batteryNeedsCpuUpdate(ActivityManagerService.java:1522)
	at com.android.internal.os.BatteryStatsImpl$MyHandler.handleMessage(BatteryStatsImpl.java:110)
	at android.os.Handler.dispatchMessage(Handler.java:99)
	at android.os.Looper.loop(Looper.java:137)
	at com.android.server.am.ActivityManagerService$AThread.run(ActivityManagerService.java:1302)

(Also fix this code to not cause strict mode to trigger at all, because there is
no need, because this is just reading stuff from /proc.)

- The system seems to crash during boot if it thinks it needs to rotate
  the screen, when it is trying to take the freeze snapshot way too early.
  There is no need to freeze the screen during boot or if the screen is off:

java.lang.NullPointerException
	at android.view.Surface.init(Native Method)
	at android.view.Surface.<init>(Surface.java:256)
	at com.android.server.wm.ScreenRotationAnimation.<init>(ScreenRotationAnimation.java:91)
	at com.android.server.wm.WindowManagerService.startFreezingDisplayLocked(WindowManagerService.java:8758)
	at com.android.server.wm.WindowManagerService.startAppFreezingScreenLocked(WindowManagerService.java:3971)
	at com.android.server.wm.WindowManagerService.startAppFreezingScreen(WindowManagerService.java:4003)
	at com.android.server.am.ActivityRecord.startFreezingScreenLocked(ActivityRecord.java:515)
	at com.android.server.am.ActivityStack.ensureActivityConfigurationLocked(ActivityStack.java:3997)
	at com.android.server.am.ActivityManagerService.updateConfigurationLocked(ActivityManagerService.java:12535)
	at com.android.server.am.ActivityManagerService.updateConfiguration(ActivityManagerService.java:12439)
	at com.android.server.wm.WindowManagerService.systemReady(WindowManagerService.java:6161)
	at com.android.server.ServerThread.run(SystemServer.java:521)

Change-Id: I85062bb5f6b0909a0f52feedaa75e7611d9d7fbd
2011-08-12 14:20:59 -07:00
Jason Simmons
88a2053e58 Merge "Add a null check to handle failure of android::createPlayer" 2011-08-12 14:20:48 -07:00
John Reck
8b84ac9553 Merge "Remove WebDriver" 2011-08-12 14:20:11 -07:00