Jamie Gennis
a799380eea
Merge "SurfaceFlinger: update orientation via transactions" into ics-mr0
2011-10-12 13:03:11 -07:00
Fabrice Di Meglio
83640db813
Merge "Fix bug #5446966 Changing Gravity on a TextView does not change how the text is aligned" into ics-mr0
2011-10-12 12:39:55 -07:00
Scott Main
146bd2be0c
Merge "docs: add Fujitsu USB info bug 5427262" into ics-mr0
2011-10-12 11:19:17 -07:00
Eino-Ville Talvala
878407ef19
Merge "Add video stabilization control to Camera parameters." into ics-mr0
2011-10-12 10:37:57 -07:00
Amith Yamasani
f29340482b
Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0
2011-10-12 09:59:11 -07:00
Steve Block
0a267f2f8a
Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0
2011-10-12 09:58:25 -07:00
Jean-Michel Trivi
0a08f22bd8
Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0
2011-10-12 09:40:17 -07:00
Jake Hamby
fde5f38b4d
Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0
2011-10-12 01:10:28 -07:00
Adam Powell
f9623049dc
Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0
2011-10-11 19:30:08 -07:00
Svetoslav Ganov
a747b67659
Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
2011-10-11 18:39:36 -07:00
Jake Hamby
6b98e19973
Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0
2011-10-11 17:23:04 -07:00
Adam Powell
c5532442f3
Merge "Fix bug 5434403 - invalidation problem with seek bars at edges" into ics-mr0
2011-10-11 16:14:31 -07:00
Michael Kolb
e6b14c57f9
Merge "Support spellcheck attribute in WebTextView" into ics-mr0
2011-10-11 15:25:22 -07:00
Michael Jurka
c00d4c449e
Merge "Refactoring loading of recent apps" into ics-mr0
2011-10-11 15:23:08 -07:00
Adam Powell
f6cb0f5591
Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0
2011-10-11 15:07:36 -07:00
Jeff Brown
9f0442a1d8
Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
2011-10-11 13:54:45 -07:00
Svetoslav Ganov
abcbf9be59
Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
2011-10-11 13:54:28 -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
Jamie Gennis
b8d69a55f1
SurfaceFlinger: update orientation via transactions
...
This change merges the ISurfaceComposer::setOrientation functionality
into ISurfaceComposer::setTransactionState. It enables the window
manager to atomically update both the display orientation and the
position and size of the windows in a single transaction with
SurfaceFlinger.
Bug: 5439574
Change-Id: I18a8ccc564d7d760ef8afb2d015ccdb7a7963900
2011-10-11 13:34:01 -07:00
Jeff Brown
ec4e0063a1
Use ashmem for CursorWindows.
...
Bug: 5332296
The memory dealer introduces additional delays for reclaiming
the memory owned by CursorWindows because the Binder object must
be finalized. Using ashmem instead gives CursorWindow more
direct control over the lifetime of the shared memory region.
The provider now allocates the CursorWindows and returns them
to clients with a read-only protection bit set on the ashmem
region.
Improved the encapsulation of CursorWindow. Callers shouldn't
need to care about details like how string fields are allocated.
Removed the compile-time configuration of string and numeric
storage modes to remove some dead weight.
Change-Id: I07c2bc2a9c573d7e435dcaecd269d25ea9807acd
2011-10-11 11:03:19 -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