Merge commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3' into eclair-plus-aosp
* commit '6a07f9fbe9f270795d3338415ca03a3333ec50e3':
bug 2148061: if PduBody is zero length, treat it as an empty message.
Merge commit 'ac939d086c42afeaef0982cee0e5861184dd82eb' into eclair-plus-aosp
* commit 'ac939d086c42afeaef0982cee0e5861184dd82eb':
Fix issue #2148939: Sholes slow to wake up in landscape mode
Merge commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8' into eclair-plus-aosp
* commit 'cc96652c7049569c1bc7b1f93ba454a7cb891fd8':
Remove fflush when storing thumbanil to sdcard.
This was introduced when I did the fading of the lock screen,
which relies on setting the policy visibility of the windows behind
it to be hidden. As a result, when the orientation changed or
the activity was restarted, they wouldn't be resized or reported
as drawn, and the activity manager would wait until its timeout
before unfreezing the screen.
We now have a new method on WindowState to find out if a window
has drawn itself, which is used in the appropriate places.
Change-Id: If05f8b1947d3029917f62ad0f89b43544bd0a4dc
Merge commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d' into eclair-plus-aosp
* commit '94bbfa47b043c50e10e6558e461d018b7d13bb5d':
Handle expiration of discovery mode in system server.
Also trigger low battery when battery reaches the specified level
rather than when it drops below the level.
Fixes bug b/1788656
Change-Id: I81f5cbb9892fc6574320d92e153211f83c69f415
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2' into eclair-plus-aosp
* commit 'e03848eb93fde30aee4201f8b41b91fa57475bc2':
When change from narrow screen to wide screen, we will
Merge commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2' into eclair-plus-aosp
* commit '0faa5c6c5a6da598fd6cdac3a5c1f1f9a2090ad2':
Only scan windows media files when those codecs are enabled.
Merge commit '954e98e023568b354aeec0a54668155ad9083398' into eclair-plus-aosp
* commit '954e98e023568b354aeec0a54668155ad9083398':
Add official assets for tabs in compatibility mode
Merge commit '141e4f1d69186104c3e169ee7365b62bc425859a' into eclair-plus-aosp
* commit '141e4f1d69186104c3e169ee7365b62bc425859a':
Add auto-brightness mode to the list of backed-up settings
Merge commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31' into eclair-plus-aosp
* commit '8e55eaccffeda078d7389b7fb66b0c6df347bf31':
Changing contact status to Presence-based
Merge commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735' into eclair-plus-aosp
* commit 'db9c3f2e9adb2763ff79aaed9b27df31c71dc735':
Fix 2146581: Make tabs work for donut apps
Merge commit '093f581090d8cf98f5877746d924107f7695dd8b' into eclair-plus-aosp
* commit '093f581090d8cf98f5877746d924107f7695dd8b':
The touch screen is probably a feature.
Merge commit '3579c4c6729dd8aa077550531a8337bf0664b23d' into eclair-plus-aosp
* commit '3579c4c6729dd8aa077550531a8337bf0664b23d':
Fix http://b/issue?id=2106682 (Don't show status if we don't have it).
Merge commit '075a18d607c3aa8386b4d06aea22f4bfacbe447b' into eclair-plus-aosp
* commit '075a18d607c3aa8386b4d06aea22f4bfacbe447b':
Turn on haptic feedback by default.
Merge commit '5648dbb1dabc0231fe953ad45916c067c79986c8' into eclair-plus-aosp
* commit '5648dbb1dabc0231fe953ad45916c067c79986c8':
DO NOT MERGE: Cleaning up the PipedStreamTest
Merge commit '2d6c325e780143a7725aaa32af11f8a4658f7cd3' into eclair-plus-aosp
* commit '2d6c325e780143a7725aaa32af11f8a4658f7cd3':
API XML changes to accompany dalvik.system deprecation.
Merge commit '057018399c7ce6d3893ee5fc622f1592f51773b9' into eclair-plus-aosp
* commit '057018399c7ce6d3893ee5fc622f1592f51773b9':
Remove query parameters for delaying group updates.
