Commit Graph

39400 Commits

Author SHA1 Message Date
Svetoslav Ganov
344c012faa am 52f7fcf8: (-s ours) Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0
* commit '52f7fcf844ffdf5f03bca58e58b1ee3e8cc1a4c5':
  DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter.
2011-10-11 15:33:25 -07:00
Jean-Michel Trivi
2c07380b6c Merge "Fix 5389442 RemoteControlClient javadoc" 2011-10-11 15:24:15 -07:00
Jeff Sharkey
eaddd0fb5b Merge "Update internal state when iface is removed." 2011-10-11 14:54:08 -07:00
Romain Guy
94c97f237f Merge "Fix the build" 2011-10-11 14:51:18 -07:00
Romain Guy
f469321dcf Merge "Check whether an AsyncTask is created/executed on a looper thread." 2011-10-11 14:10:10 -07:00
Romain Guy
3c57ef6621 Merge "Correctly apply transforms when getting a TextureView's bitmap Bug #5439406" 2011-10-11 14:07:15 -07:00
Svetoslav Ganov
538ec3564b Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0 2011-10-11 13:54:23 -07:00
John Reck
ad5e8696a3 Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base 2011-10-11 13:49:59 -07:00
Nick Pelly
746a12ec9e Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's." 2011-10-11 12:39:46 -07:00
Jeff Brown
87cd8fc860 Merge "Don't log BlockGuard violations on ENG builds." 2011-10-11 12:35:05 -07:00
Daniel Sandler
9229f6f841 Merge "Stop enabling all disabled status bar features from GlobalActions." 2011-10-11 12:01:15 -07:00
Svetoslav Ganov
b603f9cfe2 Merge changes I67d080ab,Ia3d7a5ad
* changes:
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.
2011-10-11 11:30:45 -07:00
Ying Wang
f7f0776603 Merge "Remove non-module names from PRODUCT_PACKAGES" 2011-10-11 10:01:39 -07:00
The Android Open Source Project
3829bc3c35 Reconcile with ics-factoryrom-release
Change-Id: Ibd1dca227b44e13538ea0b9f6aea45d180a010d3
2011-10-11 04:29:27 -07:00
Mathias Agopian
e64206915d Merge "fix an issue where the screen could stay off" 2011-10-10 22:21:57 -07:00
Mathias Agopian
f7cdd053fe fix an issue where the screen could stay off
this would happen when toggling on/off/on very fast, the screen
could stay black (while the panel is on).

Bug: 5429724
Change-Id: Ic8aa6aff066e6267923c0d47ef65e314e7bb6d41
2011-10-10 22:18:55 -07:00
Jim Miller
b278280b02 Merge "Fix 5386408: Fix battery state information propagation in Lock Screen" 2011-10-10 22:06:07 -07:00
The Android Automerger
57d9e5fd3a merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-10-10 20:38:59 -07:00
Jim Miller
cd21961f72 Merge "Fix 5249234: Add contentDescription to buttons on transport control on lock screen." 2011-10-10 20:06:29 -07:00
Dianne Hackborn
36814093cc Merge "Keep screen brightness at 0 while waiting for the UI to be displayed." 2011-10-10 19:16:52 -07:00
Dianne Hackborn
5f1c885046 Merge "Fix issue #5435470: SharedPreferencesImpl should read from file..." 2011-10-10 19:15:32 -07:00
Mathias Agopian
1dea97d662 Merge "Fix screen off animation when in landscape" 2011-10-10 19:05:23 -07:00
Mathias Agopian
a9040d0eef Fix screen off animation when in landscape
Change-Id: I4bc5b12d7a64a4bf8b9a851594be4d60b790d1ed
2011-10-10 19:02:07 -07:00
Jeff Sharkey
d77bdff28e Merge "Over-limit within handful of MTU's, update assets." 2011-10-10 17:47:46 -07:00
Svetoslav Ganov
497b3dd51e Merge "Adding accessibility support to the pattern lock." 2011-10-10 17:39:54 -07:00
Jake Hamby
1c30569f2a Merge "Add "format" extra to SMS delivery report intents." 2011-10-10 17:34:15 -07:00
Christopher Tate
210383b0bd Merge "Gracefully handle "needs init" transport errors at finish" 2011-10-10 17:27:05 -07:00
Justin Ho
8e921010aa Resolved conflicts for merge of 83cf0313 to master
Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344
2011-10-10 16:46:35 -07:00
Amith Yamasani
0d8566b8f2 Merge "Don't show icon for power-off confirmation dialog." 2011-10-10 16:34:34 -07:00
Hiroshi Lockheimer
0c52d89601 Merge "Ensuring previous sounds are named correctly Bug: 5416299" into ics-factoryrom 2011-10-10 16:34:23 -07:00
Jim Miller
73022e39c5 Merge "Fix 5406921: Register for receiving phone state changes when KGSVM gets created." 2011-10-10 16:30:06 -07:00
Steven Ross
fedc5e3b9a Merge "Fixes 5429869 Only displaying FaceUnlock when window is focused" 2011-10-10 16:28:36 -07:00
Dianne Hackborn
816499ecb8 Merge "Fix issue #5405788: Device continuously opening and closing..." 2011-10-10 16:08:05 -07:00
Svetoslav Ganov
e10c53dcc4 Merge "Accessibility text changed event text not populated." 2011-10-10 16:05:53 -07:00
The Android Open Source Project
82cfb9dd6d Reconcile with ics-factoryrom-release
Change-Id: I8642724549283dbcd3d104a35d5c659e5591682e
2011-10-10 15:39:42 -07:00
Romain Guy
41461c5052 Merge "Don't call saveLayer() when it's not required Bug #5435653" 2011-10-10 15:24:06 -07:00
James Dong
25be28ec4f Merge "Support AMR as a file type so that it can be imported into movie studio" 2011-10-10 15:22:04 -07:00
Gilles Debunne
ead53d8dff Merge "Bug 5437846: Crash in SpellChecker" 2011-10-10 15:18:35 -07:00
Justin Ho
0d98abbe92 am 832c5485: Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom
* commit '832c54857519c405d7aa0d3bccfe74078f1a1abf':
  Update screen lock/unlock sound Bug: 5416299
2011-10-10 14:43:35 -07:00
Justin Ho
406c8d58b6 am 17249d64: Adding Pollux notification tone Bug: 5416299
* commit '17249d6472b85e669c1b854fc413888e78af6def':
  Adding Pollux notification tone Bug: 5416299
2011-10-10 14:43:33 -07:00
Amith Yamasani
3f315a71fe am 9e7caa0b: Tie the lockscreen sounds with the ringer volume.
* commit '9e7caa0b270f8cea1fd2a61c5bffcf0df1037970':
  Tie the lockscreen sounds with the ringer volume.
2011-10-10 14:37:25 -07:00
Marco Nelissen
594ef41306 am 803ce0f9: (-s ours) Use SoundPool instead of Ringtone.
* commit '803ce0f9fdd455dc4ec0c6ad9c141c76315fd4da':
  Use SoundPool instead of Ringtone.
2011-10-10 14:37:23 -07:00
Romain Guy
2b330380bd Merge "Make sure we have the correct GL context when grabbing a bitmap Bug #5427391" 2011-10-10 14:07:10 -07:00
Jeff Brown
f4735db7de Merge "Fix ownership of CursorWindows across processes. Bug: 5332296" 2011-10-10 14:06:09 -07:00
Derek Sollenberger
ca5115073f Merge "Delay sending Plugin Draw event until the surface is ready." 2011-10-10 13:28:01 -07:00
John Reck
fe85f77701 Merge "Improve loadData JavaDoc" 2011-10-10 13:06:54 -07:00
Andreas Huber
4ae6f7dd0e Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater" 2011-10-10 12:45:02 -07:00
Mathias Agopian
8cb9d95002 Merge "enable EGL_IMG_context_priority for the omap4 platform" 2011-10-10 12:38:16 -07:00
Jeff Brown
5d2c571414 Merge "Fix Cursor leak in SettingsBackupAgent. Bug: 5434060" 2011-10-10 11:48:58 -07:00
Jeff Brown
c42c42c849 Merge "Always log StrictMode violations on ENG builds." 2011-10-10 11:48:53 -07:00