summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Speed up thumbnail generation.Chih-Chung Chang2011-08-155-53/+28
| | | | | | | | We don't need to have precise position for thumbnails, so we add a tolerance parameter to the decoder. The decoder can return an earlier frame within the tolerance time given. Change-Id: I0a49ed6b03f8c3264606e4143dd5ecf48e9d0f62
* Merge "Fix bug 4981687 - WiFi connection dialog should dismiss when tapped ↵Adam Powell2011-08-141-2/+2
|\ | | | | | | outside."
| * Fix bug 4981687 - WiFi connection dialog should dismiss when tapped outside.Adam Powell2011-08-141-2/+2
| | | | | | | | | | | | | | | | 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
* | Merge "Fix bug 5154361 - New force close dialog text breaks button order rules"Adam Powell2011-08-142-5/+5
|\ \
| * | Fix bug 5154361 - New force close dialog text breaks button order rulesAdam Powell2011-08-142-5/+5
| |/ | | | | | | | | | | | | Reorder the force close/ANR dialog buttons to better match the new rules/intent from UX. Change-Id: I30fed56aabd0cc91d07852807347057176d82aaa
* | Merge "Fix bug 5159736 - Make DeviceDefault the default"Adam Powell2011-08-148-6/+46
|\ \
| * | Fix bug 5159736 - Make DeviceDefault the defaultAdam Powell2011-08-148-6/+46
| |/ | | | | | | | | | | | | Have the framework refer to the DeviceDefault themes for ICS apps that don't explicitly request another theme. Change-Id: I27dd0bbaa60f71df4f36e47d260f556d923ba075
* | Merge "Fail request for audio focus when linkToDeath fails"Jean-Michel Trivi2011-08-141-12/+13
|\ \
| * | Fail request for audio focus when linkToDeath failsJean-Michel Trivi2011-08-141-12/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Several API changes as requested by ES:"Daniel Lehmann2011-08-142-70/+74
|\ \ \ | |_|/ |/| |
| * | Several API changes as requested by ES:Daniel Lehmann2011-08-142-70/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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
* | | Merge "MediaScanner: Clear file path before deleting records to avoid ↵Mike Lockwood2011-08-141-7/+11
|\ \ \ | |_|/ |/| | | | | accidental file deletions"
| * | MediaScanner: Clear file path before deleting records to avoid accidental ↵Mike Lockwood2011-08-141-7/+11
| |/ | | | | | | | | | | | | | | | | | | 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>
* | Merge "Fix leak of global references and AudioFocusDeathHandler objects."Jean-Michel Trivi2011-08-141-14/+25
|\ \
| * | Fix leak of global references and AudioFocusDeathHandler objects.Jean-Michel Trivi2011-08-141-14/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Fix android.text.format.Time to use GetBooleanField on its boolean field.Elliott Hughes2011-08-141-2/+2
| |/ |/| | | | | | | Bug: 5162851 Change-Id: I49b1429e86ffa91fbfb8b4c9d1a0c6d30c72621e
* | Merge "Fix bug 5078498 - Icons jump around on split action bar"Adam Powell2011-08-125-21/+83
|\ \
| * | Fix bug 5078498 - Icons jump around on split action barAdam Powell2011-08-125-21/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Update sim_removed_message string."Wink Saville2011-08-121-1/+1
|\ \ \ | |/ / |/| |
| * | Update sim_removed_message string.Wink Saville2011-08-121-1/+1
| |/ | | | | | | | | Bug: 5009608 Change-Id: I157e21e747e338749169cd573162218e99580880
* | Merge "<blink/> is not an acceptable default behavior. Bug #5156334"Romain Guy2011-08-122-3/+11
|\ \
| * | <blink/> is not an acceptable default behavior.Romain Guy2011-08-122-3/+11
| | | | | | | | | | | | | | | | | | Bug #5156334 Change-Id: I9f803b090e81f4e490d0cccd6347a0f9f64bd20f
* | | Merge "Turn off hinting by default for higher density displays."Dianne Hackborn2011-08-123-2/+49
|\ \ \
| * | | Turn off hinting by default for higher density displays.Dianne Hackborn2011-08-123-2/+49
| | | | | | | | | | | | | | | | | | | | | | | | Also adds an API for apps to control whether hinting is used. Change-Id: I1a06b06255fbb8d0f02a8ce48c2cd60019088ed3
* | | | Merge "Issue 5081351: isWiredHeadsetOn() permission."Eric Laurent2011-08-123-12/+6
|\ \ \ \
| * | | | Issue 5081351: isWiredHeadsetOn() permission.Eric Laurent2011-08-123-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Use a weakreference to prevent the static variable from holding an ↵Amith Yamasani2011-08-121-5/+11
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Activity."
| * | | | Use a weakreference to prevent the static variable from holding an Activity.Amith Yamasani2011-08-121-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5057764 Change-Id: If734e3ef4928b21a5e31e0ad50c97da287c3c116
* | | | | Merge "fix an orientation change drawing artifact."Mathias Agopian2011-08-121-3/+2
|\ \ \ \ \
| * | | | | fix an orientation change drawing artifact.Mathias Agopian2011-08-121-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "If release has been called before finalize, do not expect MediaPlayer ↵James Dong2011-08-121-5/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | still exists"
| * | | | | | If release has been called before finalize, do not expect MediaPlayer still ↵James Dong2011-08-121-5/+13
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | am e5cb629f: Merge "Add missing include" include existsConley Owens2011-08-120-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e5cb629f3761b272ea52104c1093e0007f5c41b5': Add missing include
| * \ \ \ \ \ Merge "Add missing include" include existsConley Owens2011-08-120-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ am b654e6e5: am d144748d: Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b654e6e55a3e8d7e8c2e0b8b1ff4bb4f76c10e05': Add missing include
| | | * \ \ \ \ \ am d144748d: Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd144748d4767b2ccfb13857e23f78bc944e9531d': Add missing include
| | | | * \ \ \ \ \ Merge "Add missing include"Jean-Baptiste Queru2011-08-111-0/+2
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Add missing includeJean-Baptiste Queru2011-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I00181029e80a2ba75320550c14e950fadbab8a64
* | | | | | | | | | | am 648dc03c: am 4dbd1bc6: am 5f074067: am 712a8cca: Merge ↵Amith Yamasani2011-08-121-1/+3
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "VolumePreference.onActivityStop only stops playback" * commit '648dc03cd038a726b25929f9ffc142eb16e891e8': VolumePreference.onActivityStop only stops playback
| * | | | | | | | | | am 4dbd1bc6: am 5f074067: am 712a8cca: Merge ↵Amith Yamasani2011-08-121-1/+3
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "VolumePreference.onActivityStop only stops playback" * commit '4dbd1bc6ae84cb4d0cd28922e917473ec6e53517': VolumePreference.onActivityStop only stops playback
| | * | | | | | | | | am 5f074067: am 712a8cca: Merge "VolumePreference.onActivityStop only stops ↵Amith Yamasani2011-08-111-1/+3
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | playback" * commit '5f07406717db34927f5095de3829b1e74ebd7c16': VolumePreference.onActivityStop only stops playback
| | | * | | | | | | | am 712a8cca: Merge "VolumePreference.onActivityStop only stops playback"Amith Yamasani2011-08-111-1/+3
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '712a8cca1f9e438af224f93c3a4644853331af2e': VolumePreference.onActivityStop only stops playback
| | | | * | | | | | | Merge "VolumePreference.onActivityStop only stops playback"Amith Yamasani2011-08-111-1/+3
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | VolumePreference.onActivityStop only stops playbackSamuel Asteberg2011-02-031-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In VolumePreference.onActivityStop, the cleanup has been replaced with only stopping ringtone playback for the seekbar. This will avoid problems when switching between applications that previously lead to inconsistencies in the ring volume dialog. Change-Id: Ia751fe0893610c4f5650eb07705481400642a84e
* | | | | | | | | | | | am 9903da81: Merge "Added stub for getting buffer" stub existsConley Owens2011-08-120-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9903da81cb52f629bffb73748c1da5cdda921ca4': added stub for getting buffer from surface texture
| * | | | | | | | | | | Merge "Added stub for getting buffer" stub existsConley Owens2011-08-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am 44874c23: am c962512c: Merge "added stub for getting buffer from surface ↵Jean-Baptiste Queru2011-08-111-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | texture" * commit '44874c236de282b0d898f179fc9fdafa84aae40d': added stub for getting buffer from surface texture
| | | * | | | | | | | | am c962512c: Merge "added stub for getting buffer from surface texture"Jean-Baptiste Queru2011-08-111-0/+1
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'c962512cac19e2bb1103c0c1a5f739d40d4d7740': added stub for getting buffer from surface texture
| | | | * | | | | | | | Merge "added stub for getting buffer from surface texture"Jean-Baptiste Queru2011-08-111-0/+1
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | | * | | | | | | added stub for getting buffer from surface textureChris Craik2011-08-111-0/+1
| | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If61153cacdd8027848f40f8d9035f7c4aead0a98
generated by cgit v1.1 at 2025-03-23 23:09:19 +0000