Gilles Debunne
4c33aed7e8
Merge "Bug 5385279: IOOB in createMisspelledSuggestionSpan"
2011-10-12 09:51:17 -07:00
Gilles Debunne
94ae1ea1d4
Merge "Bug 5237623: word no longer underlined after replacement"
2011-10-12 09:50:45 -07:00
Robert Ly
5278f41d50
Merge "docs: restructure animation and add container doc"
2011-10-12 09:50:31 -07:00
Robert Ly
5a3acd38a4
Merge "docs: restructure graphics docs and add hw-acceleration docs"
2011-10-12 09:50:26 -07:00
Amith Yamasani
475ad8237d
Merge "Backup owner info as part of settings backup."
2011-10-12 09:45:22 -07:00
Jean-Michel Trivi
793a6a9a7a
am 49f61439: (-s ours) Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0
...
* commit '49f61439db7f8960745b0a5664795b5a5ad31ef8':
DO NOT MERGE Fix 5389442 RemoteControlClient javadoc
2011-10-12 09:42:48 -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
d43ee6bad6
am 34877877: Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0
...
* commit '34877877bb563e7e20600e6777cca4dc358a12d9':
Fix bug in CDMA WDP datagram handling (fixes incoming MMS).
2011-10-12 01:21:34 -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
2b60ce2f6f
am 35af3639: Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0
...
* commit '35af3639a169b1b8e5f4d96579795e5480080b52':
Fix bug 5173029 - make fast scroller aware of scrolling containers
2011-10-11 19:33:29 -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
998bac2750
am 52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0
...
* commit '5276373430af24448324941af6b911d90a3ddd10':
Dragging in touch explore mode should not become exploring.
2011-10-11 18:41:05 -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
Justin Ho
33b5eec0c8
Merge "Integrating updated system bar assets Bug: 5353986"
2011-10-11 17:53:40 -07:00
Jake Hamby
1f522b1696
am c5b28bd0: Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0
...
* commit 'c5b28bd00dd1be682103275815f588870c6fec7d':
Change DCS of MO SMS to the correct value for UCS-2 encoding.
2011-10-11 17:32:53 -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
0ea2ce2daf
am acf7d982: Merge "Fix bug 5434403 - invalidation problem with seek bars at edges" into ics-mr0
...
* commit 'acf7d982ae981c039ec8445a30da91be0a4fbbc5':
Fix bug 5434403 - invalidation problem with seek bars at edges
2011-10-11 16:16:09 -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
Svetoslav Ganov
14a838f3b1
Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API"
2011-10-11 16:00:54 -07:00
Michael Kolb
bbcdc1f7e2
am f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0
...
* commit 'f0f7a9139b40e9b90a2981aa7aba49fa2c24ca1d':
Support spellcheck attribute in WebTextView
2011-10-11 15:33:37 -07:00
Michael Jurka
de44d3654b
am 78bbcd31: Merge "Refactoring loading of recent apps" into ics-mr0
...
* commit '78bbcd31aac4e6744a00ee0a6bd6ac5cc1bec673':
Refactoring loading of recent apps
2011-10-11 15:33:36 -07:00
Adam Powell
98e731ece3
am 1a4c4334: Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0
...
* commit '1a4c4334f02152c96cfc71136dc31085826c6894':
Fix bug 5396097 - menu theme consistency
2011-10-11 15:33:33 -07:00
Jeff Brown
d5e7d2793f
am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0
...
* commit '58bf986c3e3948242e89654e6d59b97a21345582':
Use ashmem for CursorWindows. Bug: 5332296
2011-10-11 15:33:28 -07:00
Svetoslav Ganov
297764ca43
am a72a8063: (-s ours) Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0
...
* commit 'a72a80632b07dd7faf0ca2a4a0eae2770b14caa6':
DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event.
2011-10-11 15:33:26 -07:00
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
Michael Kolb
e6b14c57f9
Merge "Support spellcheck attribute in WebTextView" into ics-mr0
2011-10-11 15:25:22 -07:00
Jean-Michel Trivi
2c07380b6c
Merge "Fix 5389442 RemoteControlClient javadoc"
2011-10-11 15:24:15 -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 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
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
John Reck
ad5e8696a3
Merge branch 'master' of ssh://android-git:29418/platform/frameworks/base
2011-10-11 13:49:59 -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
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
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
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