Robert Greenwalt
0faacf0658
Fix NPE in trimV4AddrZeros.
...
Change-Id: Id6ab91dabce4a2adba02f2601bc1157e87b782c3
2011-12-07 16:55:38 -08:00
Amith Yamasani
3b5555fc44
Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
2011-12-07 16:54:31 -08:00
Eric Laurent
c1bbada232
am 71087709: Merge "Fix audio effect tests"
...
* commit '71087709aad07cc6492f64444acf9acc48495003':
Fix audio effect tests
2011-12-07 16:46:56 -08:00
Eric Laurent
71087709aa
Merge "Fix audio effect tests"
2011-12-07 16:45:07 -08:00
Daniel Sandler
f6c2961830
am 0a290984: am 940a49c8: am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
...
* commit '0a2909840fae6d16efc5f7afb313b03fd401cbd9':
Invalidate the whole status bar after layout transitions.
2011-12-07 16:40:49 -08:00
John Wang
2690817815
Correct the dialing number of structured MMI.
...
According to TS 22.030 6.5.2 "Structure of the MMI", the dialing number
can not end with #. The format is like *SC*SI#DN. Correct the mmi pattern
to exclude DN# case. With this fix, processCode() will tread *NNN#DN#,
e.g. *400#16 digit number# in bug 5622718, as USSD and send via
RIL_REQUEST_SEND_USSD.
bug:5622718
Change-Id: Ifc8d0edff4308602a5f3fc651cf116bf6bad3cbc
2011-12-07 16:38:56 -08:00
Daniel Sandler
0a2909840f
am 940a49c8: am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
...
* commit '940a49c89c0ccca8ba38028c209a4a135b23dd8f':
Invalidate the whole status bar after layout transitions.
2011-12-07 16:38:12 -08:00
Daniel Sandler
940a49c89c
am dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
...
* commit 'dc8cb9aa7e8f341ab88ae57e9d2cb99502844e5b':
Invalidate the whole status bar after layout transitions.
2011-12-07 16:35:46 -08:00
Daniel Sandler
dc8cb9aa7e
Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
2011-12-07 16:33:31 -08:00
Dianne Hackborn
b50c768a8a
Merge commit 'eee12419' into manualmerge
2011-12-07 16:33:15 -08:00
Russell Brenner
935c571663
am 0d8e8117: am 9a8a7be7: am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
...
* commit '0d8e8117830cb6ae450efd69b641795ff264dff8':
Update Armenian and Georgian fonts
2011-12-07 16:26:58 -08:00
Russell Brenner
0d8e811783
am 9a8a7be7: am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
...
* commit '9a8a7be701b42cefc8da464c1d1436c78383095f':
Update Armenian and Georgian fonts
2011-12-07 16:24:06 -08:00
Russell Brenner
9a8a7be701
am 1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
...
* commit '1662a874fb65b915b6c3d8a213c1bd0c718059b5':
Update Armenian and Georgian fonts
2011-12-07 16:22:24 -08:00
Russell Brenner
1662a874fb
Merge "Update Armenian and Georgian fonts" into ics-mr1
2011-12-07 16:20:15 -08:00
Jeff Brown
5481718085
am 0c5c2884: am 03be4d9c: am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
...
* commit '0c5c2884542be5313007cb2ba22c409133e5ec5a':
Make the dock orientation override the HDMI orientation.
2011-12-07 16:08:08 -08:00
Dianne Hackborn
844b13155b
am 0fea67ce: am 95c7cd56: am 87e06ec2: Merge "Fix issue #5144065 : Tap on Music icon from Home screen..." into ics-mr1
...
* commit '0fea67ce9124a6eef913febc70a2d7b3e0ca1c99':
Fix issue #5144065 : Tap on Music icon from Home screen...
2011-12-07 16:08:06 -08:00
Joe Malin
3937e05570
Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
2011-12-07 16:07:49 -08:00
Jeff Brown
0c5c288454
am 03be4d9c: am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
...
* commit '03be4d9cf456b7ad82e6fbbdea2b4902cb0e4abb':
Make the dock orientation override the HDMI orientation.
2011-12-07 16:05:48 -08:00
Dianne Hackborn
0fea67ce91
am 95c7cd56: am 87e06ec2: Merge "Fix issue #5144065 : Tap on Music icon from Home screen..." into ics-mr1
...
* commit '95c7cd56cc12179ad00623422814e8ba16646c34':
Fix issue #5144065 : Tap on Music icon from Home screen...
2011-12-07 16:05:46 -08:00
Roman Nurik
06e2e0c2ba
am 9ff5d8da: Merge "Cherry: Reduce file size for ADL presentation shareable."
...
* commit '9ff5d8daa423eafcc5bbe95a414bf6f086c90a9b':
Cherry: Reduce file size for ADL presentation shareable.
2011-12-07 16:04:09 -08:00
Roman Nurik
d63126375f
am ada19047: Merge "Cherry: Add Q3 2011 ADL slides to docs/shareables/adl"
...
* commit 'ada1904717e356f479a3801834372fd103ac74f8':
Cherry: Add Q3 2011 ADL slides to docs/shareables/adl
2011-12-07 16:04:07 -08:00
Jeff Brown
03be4d9cf4
am ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
...
* commit 'ff3b5a828ea1f7409af4475898689804bed10ede':
Make the dock orientation override the HDMI orientation.
2011-12-07 16:03:57 -08:00
Dianne Hackborn
95c7cd56cc
am 87e06ec2: Merge "Fix issue #5144065 : Tap on Music icon from Home screen..." into ics-mr1
...
* commit '87e06ec2fa57a54b92fe82f2cacfbf8a44e47baf':
Fix issue #5144065 : Tap on Music icon from Home screen...
2011-12-07 16:03:56 -08:00
Roman Nurik
9ff5d8daa4
Merge "Cherry: Reduce file size for ADL presentation shareable."
2011-12-07 15:54:16 -08:00
Roman Nurik
ada1904717
Merge "Cherry: Add Q3 2011 ADL slides to docs/shareables/adl"
2011-12-07 15:54:14 -08:00
Russell Brenner
602d6393d4
Update Armenian and Georgian fonts
...
New versions do not contain BCI hints, which were deleterious to
rendering in TextView with these particular fonts. WebView does not
use hints, and so TextView and WebView now render the same.
Font versions are updated from 1.00 to 1.01.
Bug: 5727604
Change-Id: Ib69318708994324caba36c10ac6159da70426d28
2011-12-07 15:53:21 -08:00
Joe Malin
13235db8f7
DOC CHANGE: Add text for android.os.storage
...
Change-Id: Ia5785cff3860907af4c53cbe769126496ee338c3
2011-12-07 15:50:34 -08:00
Amith Yamasani
e48a160e57
Make new ringer toggles on power menu accessible and navigable with keyboard.
...
Bug: 5721663
Added content descriptions and made the listview allow navigation between nested
views.
Change-Id: I69d78d65e1bab829f63c2e6025051206e511f00f
2011-12-07 15:42:09 -08:00
Dianne Hackborn
b32785c6e8
Merge "More fixing for issue #5366535 : Lockscreen has wrong layout..." into ics-mr0
2011-12-07 15:22:21 -08:00
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