Jeff Brown
ff3b5a828e
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
2011-12-07 15:04:39 -08:00
Dianne Hackborn
87e06ec2fa
Merge "Fix issue #5144065 : Tap on Music icon from Home screen..." into ics-mr1
2011-12-07 15:01:55 -08:00
Dianne Hackborn
eee1241938
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #5366535 : Lockscreen..." into ics-mr0
2011-12-07 15:00:05 -08:00
Dianne Hackborn
d9efb95a0e
More fixing for issue #5366535 : Lockscreen has wrong layout...
...
...but corrects itself
Change upgrade window to not allow the device to rotate while it is shown.
Change-Id: I75b126ab8806b84a0351e2706ebea10570bde575
2011-12-07 14:56:51 -08:00
Svetoslav Ganov
243bae802b
am ba621bd3: Merge "Make the URL for the JavaScript based screen-reader used by WebView configurable."
...
* commit 'ba621bd3595b7238df8cfc4ad2f456eedecdb87f':
Make the URL for the JavaScript based screen-reader used by WebView configurable.
2011-12-07 14:41:11 -08:00
Winson Chung
36138bf49a
am 1f45d252: am a21ce1f1: am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
...
* commit '1f45d25257f791ce031e7e5bc3c7806a8b82b2eb':
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
2011-12-07 14:39:08 -08:00
Svetoslav Ganov
ba621bd359
Merge "Make the URL for the JavaScript based screen-reader used by WebView configurable."
2011-12-07 14:38:05 -08:00
Winson Chung
1f45d25257
am a21ce1f1: am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
...
* commit 'a21ce1f1107e1aad19335bebe4aed915158b5ca6':
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
2011-12-07 14:36:34 -08:00
Svetoslav Ganov
3ca5a74c17
Make the URL for the JavaScript based screen-reader used by WebView configurable.
...
The URl from which to inject a screen-reader for WebView accessiblity support should be
configurable because: 1) The accessibility engineering team should be able to point
devices to a staging build of the screen-reader; 2) We would like to be able to change
this URL via the Google services mechanism.
bug:5718543
Change-Id: I3d4d343f1c93e0e0173f04b2912949fe8a3566b9
2011-12-07 14:35:59 -08:00
Winson Chung
a21ce1f110
am 0a361b10: Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
...
* commit '0a361b10a665a3d158c846722290f26ce62276e1':
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)
2011-12-07 14:35:04 -08:00
Winson Chung
0a361b10a6
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug 5703782)" into ics-mr1
2011-12-07 14:33:31 -08:00
Dianne Hackborn
04ea2d98af
DO NOT MERGE. Integrate from MR 1 to fix issue #5366535 : Lockscreen...
...
...has wrong layout but corrects itself
Maybe fix issue #5405788 : Device continuously opening and closing...
...the "Complete action using" dialog
I have never been able to reproduce this consistently, but here is
another stab in the twilight. It looks like during boot we have
a potential race where we could reset the config sequence number after
we had gone through a config change, causing ActivityThread to ignore
a following config change. Maybe this change will help.
Change-Id: I7199b6de370488e8d897d6a78ff6f15624da862c
2011-12-07 14:18:05 -08:00
Mathias Agopian
99bd43b2bb
am 4a46ee57: Merge "Improve the VSYNC api a bit."
...
* commit '4a46ee57f10f4a121776cfc05143aa580a92b5e5':
Improve the VSYNC api a bit.
2011-12-07 14:17:12 -08:00
Mathias Agopian
4a46ee57f1
Merge "Improve the VSYNC api a bit."
2011-12-07 14:15:21 -08:00
Dave Burke
4170420b3c
am 7554c57c: am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
...
* commit '7554c57c173352c0b3e9026b54fdda9fad101f8b':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
2011-12-07 14:13:46 -08:00
Dave Burke
7554c57c17
am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
...
* commit '6727a43f6d8ff193b86ca90b2daa761c47157638':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
2011-12-07 14:11:14 -08:00
Dave Burke
6727a43f6d
am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
...
* commit '54a53841a9ff48ba4cd004469ae4ff77caed900a':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
2011-12-07 14:08:13 -08:00
Dave Burke
54a53841a9
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
2011-12-07 14:05:41 -08:00
Dianne Hackborn
ae0a0a84d1
Fix issue #5144065 : Tap on Music icon from Home screen...
...
... a different app opens
In some cases when reparenting activities we could end up with a reply
chain that crosses task boundaries, so if an activity below that needs
to be reparented we pull that and the activities above it up into the
new task.
Change-Id: Ia4fa041ab7069e39dac162ddbf5b8e1de98675b9
2011-12-07 14:03:01 -08:00
Robert Greenwalt
c9db51bb3b
am 131746ba: am e55e5b84: am 3957b5fc: Fix the build.
...
* commit '131746ba380c4c55b075e7aac00a395821526ccd':
Fix the build.
2011-12-07 13:21:45 -08:00
Robert Greenwalt
131746ba38
am e55e5b84: am 3957b5fc: Fix the build.
...
* commit 'e55e5b84e53889791c0b6be8cad7cc134c9dfcba':
Fix the build.
2011-12-07 13:19:37 -08:00
Robert Greenwalt
e55e5b84e5
am 3957b5fc: Fix the build.
...
* commit '3957b5fc49335f13b15080b8e7146580026c0479':
Fix the build.
2011-12-07 13:17:04 -08:00
Robert Greenwalt
3957b5fc49
Fix the build.
...
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48
2011-12-07 13:10:59 -08:00
Daniel Sandler
a3850b6839
Improve handling of small largeIcons in tablet ticker.
...
The tablet system bar is too short for a full notification
row, but it will show the largeIcon of a new notification in
its full frame, intruding into the main application content
rectangle a bit. This is a good thing---the notifications
really pop out at you---but it looks a little odd if the
largeIcon is actually *small*: the icon is vertically
centered in the larger (invisible) rectangle, making it look
poorly centered on the system bar.
This change will detect short largeIcons and center them in
the system bar's height instead. Additionally, it applies
the same ticker background all the way to the left
underneath largeIcons that are not full-frame (and therefore
have transparent regions).
Bug: 5708907
Bug: 5560485
Change-Id: I32af45632df164c58fb960110063dbaa08b5536c
2011-12-07 15:53:00 -05:00
Andreas Huber
7dea9aaff5
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
...
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug: 5666532
2011-12-07 12:50:47 -08:00
Robert Greenwalt
edee57973c
am 86a94395: am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit '86a943951b16b0da04ab64ef805d4a83da70a9b1':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:36:04 -08:00
Robert Greenwalt
86a943951b
am 2ebd3612: am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit '2ebd3612d82f728873f87cdbea9fa5513b5cfb39':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:33:24 -08:00
Robert Greenwalt
2ebd3612d8
am f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
...
* commit 'f352491aad71b5c0a30238707bdb83c9dc34fd9e':
Trim leading zeros from ipv4 addrs.
2011-12-07 12:31:11 -08:00
Robert Greenwalt
f352491aad
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
2011-12-07 12:29:14 -08:00
Daniel Sandler
5a82660832
Invalidate the whole status bar after layout transitions.
...
This should ensure that the menu icon doesn't persist
on-screen even after it's been removed from its parent.
(Related to the KeyButtonView animation glow and the tricks
it plays with invalidation.)
Bug: 5647480
Change-Id: I8ca503ef647aed99335d3dbecedce38fa0b70c65
2011-12-07 15:22:30 -05:00
Irfan Sheriff
71d39ba177
am a6071c33: am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
...
* commit 'a6071c338b0f46a47fe9c4bce87d4684e3c93dc7':
Fix CS wakelock handling
2011-12-07 12:13:00 -08:00
Irfan Sheriff
a6071c338b
am 8c2122cb: am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
...
* commit '8c2122cb3e347c607126c49d76fb165125a02295':
Fix CS wakelock handling
2011-12-07 12:10:58 -08:00
Irfan Sheriff
8c2122cb3e
am a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
...
* commit 'a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
Fix CS wakelock handling
2011-12-07 12:08:41 -08:00
Irfan Sheriff
a85cc28229
Merge "Fix CS wakelock handling" into ics-mr1
2011-12-07 12:06:31 -08:00
Bart Sears
06fefa9f99
am 63051d71: am 654ac45c: am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit '63051d71ef3da31c9764f6998e275adedbbcd9f5':
Fix WebTextView rings
2011-12-07 11:48:44 -08:00
Bart Sears
63051d71ef
am 654ac45c: am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit '654ac45c21b257613957c8c172a3fdff79903fcd':
Fix WebTextView rings
2011-12-07 11:46:11 -08:00
Bart Sears
654ac45c21
am b56076ac: Merge "Fix WebTextView rings" into ics-mr1
...
* commit 'b56076ac9f5ece5995363952e85d6dd8e4620e27':
Fix WebTextView rings
2011-12-07 11:43:54 -08:00
Bart Sears
b56076ac9f
Merge "Fix WebTextView rings" into ics-mr1
2011-12-07 11:41:57 -08:00
Joe Malin
a0221b0fa8
am 7c918ad4: am 3eebad61: am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '7c918ad493392ccb9cc24d3f2f35cab55916f582':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:34:39 -08:00
Joe Malin
7c918ad493
am 3eebad61: am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3eebad61b4df7f5b4c898545aa7ec9076bc077d0':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:33:01 -08:00
Joe Malin
3eebad61b4
am 3744d1fa: am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:30:41 -08:00
Joe Malin
3744d1faf5
am 9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
...
* commit '9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
2011-12-07 11:28:25 -08:00
Irfan Sheriff
87f0a7b1aa
Fix CS wakelock handling
...
Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
2011-12-07 11:28:21 -08:00
Joe Malin
9e2cf49fa3
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
2011-12-07 11:26:20 -08:00
Alex Sakhartchouk
4a8b4d7a55
am 7cee3183: Merge "Fixing file writing bug"
...
* commit '7cee31835de45eaff5922fc8647545d9bd30b567':
Fixing file writing bug
2011-12-07 11:09:59 -08:00
Alex Sakhartchouk
7cee31835d
Merge "Fixing file writing bug"
2011-12-07 11:07:42 -08:00
Alex Sakhartchouk
c08a1cc38f
Merge "Revert "Removing changes not meant for MR1"" into graphics-dev
2011-12-07 11:06:39 -08:00
Dianne Hackborn
9cade77ef0
am 138d870f: am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit '138d870fb7b83bc2af54e87546abb883476298ff':
Truthiness is good.
2011-12-07 10:52:07 -08:00
Dianne Hackborn
138d870fb7
am 1f1fa7ed: am fb90df8c: Merge "Truthiness is good." into ics-mr1
...
* commit '1f1fa7edd608137863b863da44ee26efb5a93e23':
Truthiness is good.
2011-12-07 10:49:56 -08:00
Gilles Debunne
5ad18abbcb
am e6513486: Merge "Minor tweak in getLocationInWindow"
...
* commit 'e6513486ee83e3ce9e99ee3f08f470fc568f120f':
Minor tweak in getLocationInWindow
2011-12-07 10:42:14 -08:00