Fred Quintana
8b533e7bd6
Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" into ics-mr0
2011-10-13 11:41:19 -07:00
Daniel Sandler
742b029ad6
Merge "Stop enabling all disabled status bar features from GlobalActions. (DO NOT MERGE)" into ics-mr0
2011-10-13 10:51:19 -07:00
Mangesh Ghiware
35e8259f7b
Merge "Add setting for configuring zoom level on double-tap." into ics-mr0
2011-10-13 09:17:10 -07:00
Mike Lockwood
db86dfe416
Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0
2011-10-13 08:55:04 -07:00
Justin Ho
75556227da
Merge "Volume overlay right padding increased" into ics-mr0
2011-10-13 07:32:32 -07:00
Wu-cheng Li
eb28cf6737
Merge "Improve camera javadoc and fix some errors." into ics-mr0
2011-10-12 23:34:01 -07:00
Brian Colonna
980433a36e
Merge "Fixes 5446301" into ics-mr0
2011-10-12 19:14:03 -07:00
Jim Miller
e0e19cea9e
Merge "Fix 5444675: Fix vibrate regression on Pattern and PIN unlock screens." into ics-mr0
2011-10-12 18:49:25 -07:00
Jamie Gennis
c901ca0abc
Surface: fix a protected buffer test
...
This change renames the ScreenshotsOfProtectedBuffersFail to
ScreenshotsOfProtectedBuffersSucceed and changes the test to verify that
the screenshot succeeds.
Change-Id: I960bb8eed4211578cb4dc446b08392937da064b6
2011-10-12 18:42:33 -07:00
Daniel Lehmann
13450de0f5
Merge "Allow clearing out the source bounds" into ics-mr0
2011-10-12 18:16:15 -07:00
Wink Saville
eeba5bfcb2
Merge "Set roaming indicator to off if Perferred Roaming List is not loaded." into ics-mr0
2011-10-12 18:13:20 -07:00
Dianne Hackborn
d76ff352af
Merge "Fix issue #5445966 : WindowManager reporting -long on prime when it shouldn't be." into ics-mr0
2011-10-12 17:01:18 -07:00
Winson Chung
6c3dc0329b
Merge "DO NOT MERGE. Improve screenshot chord debouncing. Bug: 5011907" into ics-mr0
2011-10-12 17:00:11 -07:00
John Wang
41a676f7ad
Merge "Support selectNetworkManually in LTEPhone." into ics-mr0
2011-10-12 15:34:56 -07:00
Justin Ho
9a85152891
Merge "Updated list selectors Bug: 5450396" into ics-mr0
2011-10-12 15:33:49 -07:00
Robert Ly
9b0f91a0b7
Merge "DO NOT MERGE cherrypick from master docs: changes to toc for RS, graphics, and animation Change-Id: I542ac4cda24907ba0df4d63e5d7b4047e8091215" into ics-mr0
2011-10-12 15:32:38 -07:00
Robert Ly
549e692672
Merge "DO NOT MERGE cherrypick from master docs: restructure graphics docs and add hw-acceleration docs change-Id: I0f6288d1aa5430794ac672324c3e0fc7b714455d" into ics-mr0
2011-10-12 15:05:26 -07:00
Robert Ly
c5e6d47735
Merge "DO NOT MERGE cherrypick from master" into ics-mr0
2011-10-12 15:05:01 -07:00
Andreas Huber
4336560726
Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS" into ics-mr0
2011-10-12 13:51:05 -07:00
Daniel Sandler
e815c90662
Merge "Fix obsolete Honeycomb platlogo." into ics-mr0
2011-10-12 13:11:13 -07:00
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
