OSDN Git Service
Joe Malin [Thu, 8 Dec 2011 01:14:44 +0000 (17:14 -0800)]
am
aa2719df: am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
aa2719df72225402737009b1cc2e3cfea8e74bc7':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:14:42 +0000 (17:14 -0800)]
am
0e385ee4: am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
0e385ee4de901f4c509374fad5bc040a2ac80721':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Dianne Hackborn [Thu, 8 Dec 2011 01:12:39 +0000 (17:12 -0800)]
am
b259c04d: Merge "Merge commit \'
eee12419\' into manualmerge" into ics-mr1
* commit '
b259c04d4321536ef9f5cc9b55079d3bd450eef7':
DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen...
Joe Malin [Thu, 8 Dec 2011 01:11:59 +0000 (17:11 -0800)]
am
3937e055: Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
* commit '
3937e055708a8618f184feab204fed4bb41f3f6e':
DOC CHANGE: Add text for android.os.storage
Dianne Hackborn [Thu, 8 Dec 2011 01:11:57 +0000 (17:11 -0800)]
am
b32785c6: Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
* commit '
b32785c6e893743956e28b285b8e6f6fc7aa8edb':
More fixing for issue #
5366535: Lockscreen has wrong layout...
Dianne Hackborn [Thu, 8 Dec 2011 01:10:34 +0000 (17:10 -0800)]
Merge "Merge commit '
eee12419' into manualmerge" into ics-mr1
Robert Greenwalt [Thu, 8 Dec 2011 01:10:26 +0000 (17:10 -0800)]
am
fbb09ea8: Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
* commit '
fbb09ea84f7a9df94358f05f4e680cb363bae663':
Fix NPE in trimV4AddrZeros.
Robert Greenwalt [Thu, 8 Dec 2011 01:09:05 +0000 (17:09 -0800)]
Merge "Fix NPE in trimV4AddrZeros." into ics-mr1
Amith Yamasani [Thu, 8 Dec 2011 00:56:17 +0000 (16:56 -0800)]
am
3b5555fc: Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
* commit '
3b5555fc4483f6813f3df4787d98dd5357851566':
Make new ringer toggles on power menu accessible and navigable with keyboard.
Robert Greenwalt [Thu, 8 Dec 2011 00:43:59 +0000 (16:43 -0800)]
Fix NPE in trimV4AddrZeros.
Change-Id: Id6ab91dabce4a2adba02f2601bc1157e87b782c3
Amith Yamasani [Thu, 8 Dec 2011 00:54:31 +0000 (16:54 -0800)]
Merge "Make new ringer toggles on power menu accessible and navigable with keyboard." into ics-mr1
Daniel Sandler [Thu, 8 Dec 2011 00:34:46 +0000 (16:34 -0800)]
am
dc8cb9aa: Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
* commit '
dc8cb9aa7e8f341ab88ae57e9d2cb99502844e5b':
Invalidate the whole status bar after layout transitions.
Daniel Sandler [Thu, 8 Dec 2011 00:33:31 +0000 (16:33 -0800)]
Merge "Invalidate the whole status bar after layout transitions." into ics-mr1
Dianne Hackborn [Thu, 8 Dec 2011 00:33:15 +0000 (16:33 -0800)]
Merge commit '
eee12419' into manualmerge
Russell Brenner [Thu, 8 Dec 2011 00:21:52 +0000 (16:21 -0800)]
am
1662a874: Merge "Update Armenian and Georgian fonts" into ics-mr1
* commit '
1662a874fb65b915b6c3d8a213c1bd0c718059b5':
Update Armenian and Georgian fonts
Russell Brenner [Thu, 8 Dec 2011 00:20:15 +0000 (16:20 -0800)]
Merge "Update Armenian and Georgian fonts" into ics-mr1
Joe Malin [Thu, 8 Dec 2011 00:07:49 +0000 (16:07 -0800)]
Merge "DOC CHANGE: Add text for android.os.storage" into ics-mr0
Jeff Brown [Thu, 8 Dec 2011 00:04:30 +0000 (16:04 -0800)]
am
ff3b5a82: Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
* commit '
ff3b5a828ea1f7409af4475898689804bed10ede':
Make the dock orientation override the HDMI orientation.
Dianne Hackborn [Thu, 8 Dec 2011 00:04:29 +0000 (16:04 -0800)]
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...
Russell Brenner [Wed, 7 Dec 2011 23:53:21 +0000 (15:53 -0800)]
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
Joe Malin [Tue, 6 Dec 2011 21:43:01 +0000 (13:43 -0800)]
DOC CHANGE: Add text for android.os.storage
Change-Id: Ia5785cff3860907af4c53cbe769126496ee338c3
Amith Yamasani [Wed, 7 Dec 2011 22:31:49 +0000 (14:31 -0800)]
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
Dianne Hackborn [Wed, 7 Dec 2011 23:22:21 +0000 (15:22 -0800)]
Merge "More fixing for issue #
5366535: Lockscreen has wrong layout..." into ics-mr0
Jeff Brown [Wed, 7 Dec 2011 23:04:39 +0000 (15:04 -0800)]
Merge "Make the dock orientation override the HDMI orientation." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:01:55 +0000 (15:01 -0800)]
Merge "Fix issue #
5144065: Tap on Music icon from Home screen..." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 23:00:05 +0000 (15:00 -0800)]
Merge "DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen..." into ics-mr0
Dianne Hackborn [Wed, 7 Dec 2011 22:56:51 +0000 (14:56 -0800)]
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
Jason Simmons [Wed, 7 Dec 2011 22:36:39 +0000 (14:36 -0800)]
Merge "Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged." into ics-aah
Winson Chung [Wed, 7 Dec 2011 22:35:59 +0000 (14:35 -0800)]
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)
Winson Chung [Wed, 7 Dec 2011 22:33:31 +0000 (14:33 -0800)]
Merge "Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)" into ics-mr1
Dianne Hackborn [Tue, 15 Nov 2011 01:45:19 +0000 (17:45 -0800)]
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
Dave Burke [Wed, 7 Dec 2011 22:07:49 +0000 (14:07 -0800)]
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.
Dave Burke [Wed, 7 Dec 2011 22:05:41 +0000 (14:05 -0800)]
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
Dianne Hackborn [Wed, 7 Dec 2011 22:03:01 +0000 (14:03 -0800)]
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
Jason Simmons [Wed, 7 Dec 2011 21:52:23 +0000 (13:52 -0800)]
Add an option that disables the AUDIO_BECOMING_NOISY intent send when a headset is hotplugged.
HDMI audio hotplug is treated as a "headset" in the audio services. When a headset is unplugged,
WiredAccessoryObserver sends an AUDIO_BECOMING_NOISY broadcast so that applications can take
appropriate action (e.g. pausing audio if headphones were unplugged).
However, on Tungsten, when you unplug HDMI audio, the Music2 service was getting the NOISY intent
and pausing the transmitter media player. We could add Tungsten-specific code to Music2 to
disable this behavior, but it's probably better to disable this broadcast entirely because
applications on Tungsten probably shouldn't treat HDMI hotplug in the same way they treat
headphone hotplug on phones.
Change-Id: I2d2b913f74f51fb496bd2f00f32e109bbff01fa1
Robert Greenwalt [Wed, 7 Dec 2011 21:17:35 +0000 (13:17 -0800)]
Robert Greenwalt [Wed, 7 Dec 2011 21:10:59 +0000 (13:10 -0800)]
Fix the build.
Change-Id: I71d1d9958182966d2eff0d34fa05ac57f2cabc48
Andreas Huber [Wed, 7 Dec 2011 20:50:47 +0000 (12:50 -0800)]
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug:
5666532
Robert Greenwalt [Wed, 7 Dec 2011 20:31:35 +0000 (12:31 -0800)]
am
f352491a: Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
* commit '
f352491aad71b5c0a30238707bdb83c9dc34fd9e':
Trim leading zeros from ipv4 addrs.
Robert Greenwalt [Wed, 7 Dec 2011 20:29:14 +0000 (12:29 -0800)]
Merge "Trim leading zeros from ipv4 addrs." into ics-mr1
Daniel Sandler [Wed, 7 Dec 2011 20:16:18 +0000 (15:16 -0500)]
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
Irfan Sheriff [Wed, 7 Dec 2011 20:08:01 +0000 (12:08 -0800)]
am
a85cc282: Merge "Fix CS wakelock handling" into ics-mr1
* commit '
a85cc28229c2d5114fcc83c3d7ebfd6894fd4b98':
Fix CS wakelock handling
Irfan Sheriff [Wed, 7 Dec 2011 20:06:31 +0000 (12:06 -0800)]
Merge "Fix CS wakelock handling" into ics-mr1
Bart Sears [Wed, 7 Dec 2011 19:43:27 +0000 (11:43 -0800)]
am
b56076ac: Merge "Fix WebTextView rings" into ics-mr1
* commit '
b56076ac9f5ece5995363952e85d6dd8e4620e27':
Fix WebTextView rings
Bart Sears [Wed, 7 Dec 2011 19:41:57 +0000 (11:41 -0800)]
Merge "Fix WebTextView rings" into ics-mr1
Joe Malin [Wed, 7 Dec 2011 19:30:11 +0000 (11:30 -0800)]
am
3744d1fa: am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
3744d1faf582214132b9ba000d54cdbf44425113':
DOC CHANGE: Add Content URI ref doc
Joe Malin [Wed, 7 Dec 2011 19:28:25 +0000 (11:28 -0800)]
am
9e2cf49f: Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
* commit '
9e2cf49fa360e70b33a870e9ae0b3eec11752972':
DOC CHANGE: Add Content URI ref doc
Irfan Sheriff [Wed, 7 Dec 2011 19:25:21 +0000 (11:25 -0800)]
Fix CS wakelock handling
Change-Id: Ibe1c1ab3e26ff0ae7cab7bfb0bd868bfab246037
Joe Malin [Wed, 7 Dec 2011 19:26:20 +0000 (11:26 -0800)]
Merge "DOC CHANGE: Add Content URI ref doc" into ics-mr0
Dianne Hackborn [Wed, 7 Dec 2011 19:04:04 +0000 (11:04 -0800)]
am
fb90df8c: Merge "Truthiness is good." into ics-mr1
* commit '
fb90df8c6e6d48c4b6701014a3053915b94f4b9e':
Truthiness is good.
The Android Open Source Project [Wed, 7 Dec 2011 19:03:56 +0000 (11:03 -0800)]
am
3de8d36b: Reconcile with ics-mr0-release
* commit '
3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
Irfan Sheriff [Wed, 7 Dec 2011 19:03:26 +0000 (11:03 -0800)]
am
8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1
* commit '
8a4cd3b1053d92ecb34628218f303343746691f4':
Disable poor network connection alone
Scott Main [Wed, 7 Dec 2011 19:03:10 +0000 (11:03 -0800)]
am
0a83e9d4: am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
0a83e9d438f35cba62a10392fb9e7e1c577aa638':
docs: fix broken links bug:
5542371
Andreas Huber [Wed, 7 Dec 2011 19:03:00 +0000 (11:03 -0800)]
am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
Fabrice Di Meglio [Wed, 7 Dec 2011 19:02:58 +0000 (11:02 -0800)]
am
1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
* commit '
1e99421196c1b34363267d6e6f02b16a299c9012':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
Hong Teng [Wed, 7 Dec 2011 19:02:53 +0000 (11:02 -0800)]
am
6db79c35: Merge "Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." int
* commit '
6db79c35c0cb4e26c6aff4a913777fd21069fd3c':
Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
Amith Yamasani [Wed, 7 Dec 2011 19:02:51 +0000 (11:02 -0800)]
am
f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
* commit '
f336408000c4be36045401fb4df89528249e7383':
New and improved silent mode on lockscreen.
Adam Powell [Wed, 7 Dec 2011 19:02:38 +0000 (11:02 -0800)]
am
720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1
* commit '
720efc43d89ce9fd50b66f22cdb1bb4363cfb291':
Lower touch slop in ViewConfiguration.
James Dong [Wed, 7 Dec 2011 19:02:31 +0000 (11:02 -0800)]
am
6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '
6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
Andreas Huber [Wed, 7 Dec 2011 19:02:29 +0000 (11:02 -0800)]
am
05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '
05d630691127c022befd071b2bede87c707112a9':
DO NOT MERGE: Remove the AVI extractor.
Irfan Sheriff [Wed, 7 Dec 2011 19:02:27 +0000 (11:02 -0800)]
am
40cb30c2: am
7b62313e: Disable wifiwatchdog for now
* commit '
40cb30c2df2176c03f24cbdc194e3af5a4f64758':
Disable wifiwatchdog for now
Gilles Debunne [Wed, 7 Dec 2011 19:02:25 +0000 (11:02 -0800)]
am
98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1
* commit '
98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
Invalidated bounds tightened in TextView
Eric Fischer [Wed, 7 Dec 2011 19:02:01 +0000 (11:02 -0800)]
am
58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
Import revised translations. DO NOT MERGE
Jason Simmons [Wed, 7 Dec 2011 18:47:48 +0000 (10:47 -0800)]
resolved conflicts for merge of
ea25ea7e to ics-aah
Change-Id: I9d387ad2107486406f364f1cebc709126e2d27a5
Dianne Hackborn [Wed, 7 Dec 2011 18:33:19 +0000 (10:33 -0800)]
Merge "Truthiness is good." into ics-mr1
Robert Greenwalt [Wed, 7 Dec 2011 17:58:48 +0000 (09:58 -0800)]
Trim leading zeros from ipv4 addrs.
Underlying libraries will interpret leading zeros as octal values and
fail.
bug:
5262995
Change-Id: Iff949225bb6b941f7274ee81754e1f41ed719a6c
Jeff Brown [Wed, 7 Dec 2011 17:27:41 +0000 (09:27 -0800)]
am
4079702a: Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
* commit '
4079702ac27b51282a25de5f7c20f6fba6b71995':
Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)
Jim Miller [Wed, 7 Dec 2011 17:27:39 +0000 (09:27 -0800)]
am
17f9fe13: Merge "Fix
5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
* commit '
17f9fe13c7c78eaab521f6f85b48b0e8f5adddbc':
Fix
5705837: Dismiss keyguard when launching Settings from Statusbar
Jesse Hall [Wed, 7 Dec 2011 17:27:37 +0000 (09:27 -0800)]
am
3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
* commit '
3e7b412d7d6332830ceaf123edb5e211757c69ce':
Fix statusbar crash on devices with no Bluetooth
Matthew Xie [Wed, 7 Dec 2011 17:27:35 +0000 (09:27 -0800)]
am
0d9a41e7: Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
* commit '
0d9a41e74c81e8297ee439473c301a50da20cf0b':
Broadcast turning on/off intent as early as possible when switch on/off BT
The Android Open Source Project [Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
Irfan Sheriff [Wed, 7 Dec 2011 05:06:03 +0000 (21:06 -0800)]
Merge "Disable poor network connection alone" into ics-mr1
Jeff Brown [Wed, 7 Dec 2011 03:54:24 +0000 (19:54 -0800)]
Make the dock orientation override the HDMI orientation.
Bug:
5714422
Change-Id: I5a229f987fb88a25d2e49d0c73184f556ffc1114
John Reck [Wed, 7 Dec 2011 01:23:39 +0000 (17:23 -0800)]
Fix WebTextView rings
Bug:
5718531
Don't scroll the rings and fix the border's alpha
Change-Id: I5e629d2b3b1b2bf4760c01d0f927e3f81949e9bd
Scott Main [Wed, 7 Dec 2011 01:12:53 +0000 (17:12 -0800)]
am
b6322a5b: docs: fix broken links bug:
5542371
* commit '
b6322a5bb9fda370cccf89434b939370dfa36b02':
docs: fix broken links bug:
5542371
Scott Main [Wed, 7 Dec 2011 01:09:37 +0000 (17:09 -0800)]
docs: fix broken links
bug:
5542371
Change-Id: If04b39918a54ccc163d255bf75d566f1875dac0a
John Grossman [Wed, 7 Dec 2011 00:44:04 +0000 (16:44 -0800)]
Merge "Tungsten: Improve RX player error handling." into ics-aah
Irfan Sheriff [Tue, 6 Dec 2011 22:41:14 +0000 (14:41 -0800)]
Disable poor network connection alone
- Keep the walled garden detection in place
Bug:
5719771
Change-Id: I9e5d69b6d56096be904106b1db48c02db4c0fb50
Andreas Huber [Wed, 7 Dec 2011 00:20:01 +0000 (16:20 -0800)]
Merge "Merge commit '
babb7200' into manualmerge" into ics-mr1
Fabrice Di Meglio [Tue, 6 Dec 2011 23:47:27 +0000 (15:47 -0800)]
Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
Hong Teng [Tue, 6 Dec 2011 23:37:25 +0000 (15:37 -0800)]
Merge "Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1
Amith Yamasani [Tue, 6 Dec 2011 23:36:10 +0000 (15:36 -0800)]
Merge "New and improved silent mode on lockscreen." into ics-mr1
Fabrice Di Meglio [Tue, 6 Dec 2011 22:27:12 +0000 (14:27 -0800)]
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
- disable GSUB / GPOS table loading
Change-Id: I2ae058c9d926242586f90dc2a98302ff886f1fe1
Andreas Huber [Tue, 6 Dec 2011 23:03:10 +0000 (15:03 -0800)]
Merge commit '
babb7200' into manualmerge
Amith Yamasani [Tue, 6 Dec 2011 03:58:48 +0000 (19:58 -0800)]
New and improved silent mode on lockscreen.
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.
Set VIBRATE_IN_SILENT=1 when upgrading device.
Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
Irfan Sheriff [Tue, 6 Dec 2011 19:20:30 +0000 (11:20 -0800)]
Disable wifiwatchdog for now
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
Winson Chung [Mon, 5 Dec 2011 22:56:29 +0000 (14:56 -0800)]
Workaround for issue where the notifyDatasetChanged call chain is broken when Launcher is killed. (Bug
5703782)
Change-Id: Ic57a7ce85f41d58cd40b7d30eef4a1bf685182e5
John Grossman [Tue, 6 Dec 2011 22:05:05 +0000 (14:05 -0800)]
Tungsten: Improve RX player error handling.
First, clear an issue which was causing an assert to fire. Basically,
once a decoder pump had entered the error state and was shutdown, it
was not clearing its status, and when a substream attempt to recycle
the pump, startup was failing an assert (no thread had been created,
meaning that the system was not initialized, yet status indicated an
error). This was a small one-liner in aah_decoder_pump.cpp.
Second, try to become a little nuanced about how we handle errors in
the decoder pump. A comment in the code pretty much says it all, but
the summary is that we don't want to completely abort playback because
a single chunk of ES failed to decode, but if nothing is decoding and
we are making no progress at all, we probably need to put the
MediaPlayer instance into the fatal Error state and signal the app
level so that further action can be taken (automatic recovery attempts
followed by bug reports and signalling the user if those fail).
This is to address the fallout of http://b/issue?id=
5498460, where
something at the OMX decoder level becomes unhappy about not being
able to obtain an output buffer which eventually unwinds to this
assert which results in a dead mediaserver. After this change, the
mediaserver will no longer crash, and may even recover (depending on
whether or not the OMX unhappiness is transient or not), but the
primary issue (unhappy OMX) is probably still around. It is quite
difficult to reproduce, I will probably need to open a different bug
to track that issue.
Change-Id: I5b65b818378a5ae9c915e91b7db7129f0bda6837
Signed-off-by: John Grossman <johngro@google.com>
Adam Powell [Tue, 6 Dec 2011 21:58:20 +0000 (13:58 -0800)]
Merge "Lower touch slop in ViewConfiguration." into ics-mr1
James Dong [Tue, 6 Dec 2011 20:52:52 +0000 (12:52 -0800)]
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:44:53 +0000 (12:44 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:11:38 +0000 (12:11 -0800)]
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0
Adam Powell [Tue, 6 Dec 2011 03:26:54 +0000 (19:26 -0800)]
Lower touch slop in ViewConfiguration.
Our typical touchscreens are now good enough that we don't need the
touch slop to be as large as it once was. Lower it to increase
responsiveness while scrolling.
Move the touch slop constant to the config resource
config_viewConfigurationTouchSlop so that it may be more easily
tweaked in device-specific overlays.
Change-Id: I7c11d8affcb98e91654203beb13a26cfeec18f7c
Hong Teng [Tue, 6 Dec 2011 19:51:47 +0000 (11:51 -0800)]
Fix for issue
5712743 video editor functional test : testPreviewDuringExport fails
-Correct the invalid filename, which contains control character.
And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
Irfan Sheriff [Tue, 6 Dec 2011 19:34:58 +0000 (11:34 -0800)]
am
7b62313e: Disable wifiwatchdog for now
* commit '
7b62313eab4af8835a64fb3fe1e15e5e534a9479':
Disable wifiwatchdog for now
Andreas Huber [Tue, 6 Dec 2011 18:01:27 +0000 (10:01 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
Irfan Sheriff [Tue, 6 Dec 2011 19:20:30 +0000 (11:20 -0800)]
Disable wifiwatchdog for now
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
Gilles Debunne [Tue, 6 Dec 2011 19:20:18 +0000 (11:20 -0800)]
Merge "Invalidated bounds tightened in TextView" into ics-mr1