Scott Main
0be11ca779
Merge "docs: update Notification dev guide with info about custom notification text colors"
2011-09-22 17:18:25 -07:00
Dianne Hackborn
eb0fba6d23
Merge "Fix issue #5355844 : PowerManager does not call screenTurningOn after boot."
2011-09-22 15:06:23 -07:00
Robert Ly
a871bae5fc
Merge "cherrypick from hc-mr2 Change-Id: I0c3a19f11790142d8dbc7bdf354542c69c3c754f"
2011-09-22 11:02:52 -07:00
Robert Ly
4d398a8a12
Merge "cherrypick from hc-mr2 Change-Id: Iec29f5d063c2c42a56afb971e071b4535559ac01"
2011-09-22 11:02:47 -07:00
Robert Ly
fd94f6e0a2
Merge "cherrypick from hc-mr2 Change-Id: I292eb859d90f918bb69ff32f115569144995dba9"
2011-09-22 11:02:43 -07:00
The Android Open Source Project
ceae51e4dd
Reconcile with ics-factoryrom-release
...
Change-Id: I5f3fe0c78905638535925d842337bffcd504a95b
2011-09-22 10:57:24 -07:00
Wink Saville
a4e4828cd1
am 904fb9d7: Merge "Notify people of empty proxies too." into ics-factoryrom
...
* commit '904fb9d79cc72879e4c6767c219ec78feda8e62b':
Notify people of empty proxies too.
2011-09-22 10:53:40 -07:00
Wink Saville
47bc29ea64
Merge "Notify people of empty proxies too." into ics-factoryrom
2011-09-22 10:52:25 -07:00
Daniel Sandler
eeb12ee468
am 2dbe444e: Merge "Properly generate systemUiVisibilityChanged callbacks." into ics-factoryrom
...
* commit '2dbe444e5dd89b83829df6a3f48c491a844ecd28':
Properly generate systemUiVisibilityChanged callbacks.
2011-09-22 10:31:49 -07:00
Daniel Sandler
2f96a0c23a
am cc22b992: Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom
...
* commit 'cc22b99249ac80891af99be941862edc9569fc4b':
Revert "Allow views to setSystemUiVisibility() with the same value and have it work."
2011-09-22 10:31:47 -07:00
Daniel Sandler
08069e2791
Merge "Properly generate systemUiVisibilityChanged callbacks." into ics-factoryrom
2011-09-22 10:29:33 -07:00
Daniel Sandler
1a3e64f777
Merge "Revert "Allow views to setSystemUiVisibility() with the same value and have it work."" into ics-factoryrom
2011-09-22 10:29:31 -07:00
Fabrice Di Meglio
7152cd47d7
Merge "Bug 5279842: mis alignment after scroll"
2011-09-22 10:25:57 -07:00
Scott Main
9c6b9ba222
Merge "docs: clean the slate of newness for all side navs"
2011-09-22 10:05:49 -07:00
Chet Haase
138c6f6f5f
Merge "Fix 5335993, calculate correct size of lockscreen buttons"
2011-09-22 07:55:23 -07:00
The Android Automerger
5d83396e8b
merge in ics-factoryrom-release history after reset to ics-factoryrom
2011-09-22 06:28:37 -07:00
Edwin Wong
a939526ae8
Merge "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG: 5284436"
2011-09-21 23:05:57 -07:00
Jeff Brown
245138ad55
Merge "Disallow 180 rotation for phones. Bug: 4981385"
2011-09-21 21:09:15 -07:00
Jeff Brown
701e51ac7e
Merge "Handle orientation changes more systematically. Bug: 4981385"
2011-09-21 21:09:10 -07:00
Jeff Brown
21230c6410
Handle orientation changes more systematically.
...
Bug: 4981385
Simplify the orientation changing code path in the
WindowManager. Instead of the policy calling setRotation()
when the sensor determined orientation changes, it calls
updateRotation(), which figures everything out. For the most
part, the rotation actually passed to setRotation() was
more or less ignored and just added confusion, particularly
when handling deferred orientation changes.
Ensure that 180 degree rotations are disallowed even when
the application specifies SCREEN_ORIENTATION_SENSOR_*.
These rotations are only enabled when docked upside-down for
some reason or when the application specifies
SCREEN_ORIENTATION_FULL_SENSOR.
Ensure that special modes like HDMI connected, lid switch,
dock and rotation lock all cause the sensor to be ignored
even when the application asks for sensor-based orientation
changes. The sensor is not relevant in these modes because
some external factor (or the user) is determining the
preferred rotation.
Currently, applications can still override the preferred
rotation even when there are special modes in play that
might say otherwise. We could tweak this so that some
special modes trump application choices completely
(resulting in a letter-boxed application, perhaps).
I tested this sort of tweak (not included in the patch)
and it seems to work fine, including transitions between
applications with varying orientation.
Delete dead code related to animFlags.
Handle pausing/resuming orientation changes more precisely.
Ensure that a deferred orientation change is performed when
a drag completes, even if endDragLw() is not called because the
drag was aborted before the drop happened. We pause
the orientation change in register() and resume in unregister()
because those methods appear to always be called as needed.
Change-Id: If0a31de3d057251e581fdee64819f2b19e676e9a
2011-09-21 19:26:15 -07:00
Svetoslav Ganov
bf0613e733
am 624181af: Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom
...
* commit '624181af38f7f9e4fe4a18ca3e15204f30609312':
Settings are restored in alphabetical order rather in order of dependency.
2011-09-21 19:08:28 -07:00
Svetoslav Ganov
b0ebc84fa6
Merge "Settings are restored in alphabetical order rather in order of dependency." into ics-factoryrom
2011-09-21 19:06:26 -07:00
Jaikumar Ganesh
4317643963
am 90fb9aa9: Merge "Make Bluetooth Health constant public." into ics-factoryrom
...
* commit '90fb9aa93a350d5571a378923c2566f48e44ad3e':
Make Bluetooth Health constant public.
2011-09-21 18:57:00 -07:00
Kenny Root
e20a7f206c
am 9c711282: Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
...
* commit '9c711282ad234e104c34eb4408d85fc1bb149ded':
Unhide new PackageManager APIs for API 14
2011-09-21 18:56:52 -07:00
Justin Ho
2d4c24e6b5
am 22aa7805: Merge "Thinner clock font" into ics-factoryrom
...
* commit '22aa7805dd0d9bf1c31b5cff526fda793477d8a7':
Thinner clock font
2011-09-21 18:56:50 -07:00
John Wang
6f01e62c40
am 6588bba3: Merge "Notify the sim state after callback registration." into ics-factoryrom
...
* commit '6588bba33fbf2756253d19764022a743e13573e9':
Notify the sim state after callback registration.
2011-09-21 18:56:49 -07:00
John Wang
b156ea7fc6
am 27b402ab: Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
...
* commit '27b402abe5c24a3e21a39458541001ea91465b8f':
Set enable_puk_unlock_screen true by default.
2011-09-21 18:56:47 -07:00
Adam Powell
a229a38557
Merge "Fix bug 5300621 - Share menu disappears in gallery"
2011-09-21 18:26:13 -07:00
Jaikumar Ganesh
d35be08d9c
Merge "Make Bluetooth Health constant public." into ics-factoryrom
2011-09-21 17:44:32 -07:00
Kenny Root
668b223c42
Merge "Unhide new PackageManager APIs for API 14" into ics-factoryrom
2011-09-21 16:35:52 -07:00
Dianne Hackborn
29e6fa1343
Merge "Fix issue #5253941 : ICS ignoring provider's android:process flag"
2011-09-21 16:19:45 -07:00
Dianne Hackborn
75d83f7a2e
Merge "Improvements to power manager turning on screen."
2011-09-21 16:18:38 -07:00
Justin Ho
839aa345f8
Merge "Thinner clock font" into ics-factoryrom
2011-09-21 15:38:56 -07:00
John Wang
cebaafdc8f
Merge "Notify the sim state after callback registration." into ics-factoryrom
2011-09-21 15:34:28 -07:00
John Wang
def0f98acf
Merge "Set enable_puk_unlock_screen true by default." into ics-factoryrom
2011-09-21 15:32:39 -07:00
Mangesh Ghiware
7eaca5a4bb
Merge "Use overview scale when restored scale is 0."
2011-09-21 15:20:03 -07:00
Dianne Hackborn
83275c74cb
Merge "Keyguard sound needs to hold wake lock."
2011-09-21 15:15:18 -07:00
Wink Saville
dbc190ed30
am 4aa8d943: Merge "Reduce connectivity logging" into ics-factoryrom
...
* commit '4aa8d943a970008915b703758743b107927d96fa':
Reduce connectivity logging
2011-09-21 14:14:28 -07:00
Wink Saville
b5b4e66b27
Merge "Reduce connectivity logging" into ics-factoryrom
2011-09-21 14:12:42 -07:00
Adam Powell
5529f11591
Merge "Fix bug 5341804 - Unable to type into the find on page CAB"
2011-09-21 14:06:41 -07:00
Andreas Huber
7e40a5a614
Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
2011-09-21 13:56:09 -07:00
Jack Palevich
994384ddbb
Merge "Avoid allocating temporary memory for Matrix operations."
2011-09-21 12:40:41 -07:00
Adam Cohen
b06cf7bd70
am 41298971: Merge "Fixing disappearing lock screen, issue 5319246" into ics-factoryrom
...
* commit '41298971c774a336257fff4a97ed5d5505bbfb60':
Fixing disappearing lock screen, issue 5319246
2011-09-21 11:19:36 -07:00
Adam Cohen
ed3b8048fa
Merge "Fixing disappearing lock screen, issue 5319246" into ics-factoryrom
2011-09-21 11:17:19 -07:00
Glenn Kasten
e51e742373
Merge "Bug 5234242 audio continues after discontinuity"
2011-09-21 10:51:43 -07:00
Jean-Michel Trivi
ebf2b8b631
am 9c43016b: Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
...
* commit '9c43016b52afa855156aac2dc81a2bbe1e4ab436':
Bug 5045498 Keep track of RemoteControlClient play state change time
2011-09-21 09:36:56 -07:00
Jean-Michel Trivi
0b95000116
Merge "Bug 5045498 Keep track of RemoteControlClient play state change time" into ics-factoryrom
2011-09-21 09:34:59 -07:00
Justin Ho
73d6c0d7bf
am 7a2063b1: Merge "New sync icon for Phone stat_sys area Bug: 5076774" into ics-factoryrom
...
* commit '7a2063b1d59dd6d7575dc91b6dd93b4a8d462b16':
New sync icon for Phone stat_sys area Bug: 5076774
2011-09-21 09:17:41 -07:00
Justin Ho
c267c413a1
Merge "New sync icon for Phone stat_sys area Bug: 5076774" into ics-factoryrom
2011-09-21 09:15:53 -07:00
Jason Sams
58d76cc886
Merge "Cleanup RS logs Reduce the startup/shutdown info and format the logs in a consistent manner."
2011-09-21 08:53:10 -07:00