Fabrice Di Meglio
5968595492
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)
2011-12-06 15:49:29 -08:00
Fabrice Di Meglio
1e99421196
Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
2011-12-06 15:47:27 -08:00
Hong Teng
2be608f88c
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.
2011-12-06 15:39:37 -08:00
Amith Yamasani
d49ec62cfb
am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
...
* commit 'f336408000c4be36045401fb4df89528249e7383':
New and improved silent mode on lockscreen.
2011-12-06 15:37:31 -08:00
Hong Teng
6db79c35c0
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
2011-12-06 15:37:25 -08:00
Amith Yamasani
f336408000
Merge "New and improved silent mode on lockscreen." into ics-mr1
2011-12-06 15:36:10 -08:00
Fabrice Di Meglio
99cdc6a3b5
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
...
- disable GSUB / GPOS table loading
Change-Id: I2ae058c9d926242586f90dc2a98302ff886f1fe1
2011-12-06 15:31:19 -08:00
Amith Yamasani
6243edd818
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
2011-12-06 14:48:38 -08:00
Adam Powell
6a828712ad
am 720efc43: Merge "Lower touch slop in ViewConfiguration." into ics-mr1
...
* commit '720efc43d89ce9fd50b66f22cdb1bb4363cfb291':
Lower touch slop in ViewConfiguration.
2011-12-06 14:00:18 -08:00
Adam Powell
720efc43d8
Merge "Lower touch slop in ViewConfiguration." into ics-mr1
2011-12-06 13:58:20 -08:00
James Dong
49782b8100
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
2011-12-06 12:55:39 -08:00
James Dong
6b8b5a0a41
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
2011-12-06 12:52:52 -08:00
Andreas Huber
c473829352
am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
...
* commit '05d630691127c022befd071b2bede87c707112a9':
DO NOT MERGE: Remove the AVI extractor.
2011-12-06 12:46:46 -08:00
Andreas Huber
05d6306911
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
2011-12-06 12:44:53 -08:00
Adam Powell
7d39f85acf
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
2011-12-06 12:08:47 -08:00
Hong Teng
96bea6a5e9
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
2011-12-06 11:51:47 -08:00
Irfan Sheriff
5e2e7d5fb8
am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now
...
* commit '40cb30c2df2176c03f24cbdc194e3af5a4f64758':
Disable wifiwatchdog for now
2011-12-06 11:37:40 -08:00
Irfan Sheriff
40cb30c2df
am 7b62313e: Disable wifiwatchdog for now
...
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
Disable wifiwatchdog for now
2011-12-06 11:34:58 -08:00
Andreas Huber
92f604c4d4
DO NOT MERGE: Remove the AVI extractor.
...
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
2011-12-06 11:24:34 -08:00
Gilles Debunne
fb72920209
am 98a85c2d: Merge "Invalidated bounds tightened in TextView" into ics-mr1
...
* commit '98a85c2de6b3f27ba1ccb2cfd44a775b4f490f72':
Invalidated bounds tightened in TextView
2011-12-06 11:22:19 -08:00
Irfan Sheriff
7b62313eab
Disable wifiwatchdog for now
...
Change-Id: I2ac4fa706f3d0a415cb8e86002173b776aba4e02
2011-12-06 11:21:22 -08:00
Gilles Debunne
98a85c2de6
Merge "Invalidated bounds tightened in TextView" into ics-mr1
2011-12-06 11:20:18 -08:00
Eric Fischer
e9493f6838
am 58ad16cf: Merge "Import revised translations. DO NOT MERGE" into ics-mr1
...
* commit '58ad16cfeaac1c2124d0f9e9d2b5c493e163128c':
Import revised translations. DO NOT MERGE
2011-12-06 10:36:30 -08:00
Eric Fischer
58ad16cfea
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
2011-12-06 10:34:41 -08:00
Svetoslav Ganov
1113e75588
am ea25ea7e: Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
...
* commit 'ea25ea7ef30be14dd940f1667e0308bfff5b4d85':
Adding a system preference whether to speak passwords in accessibility mode.
2011-12-06 10:29:13 -08:00
Eric Fischer
c92b5c227a
Import revised translations. DO NOT MERGE
...
Change-Id: I1d49a1533bd0481543280a379a9f93bd7027e54a
2011-12-06 10:27:06 -08:00
Svetoslav Ganov
ea25ea7ef3
Merge "Adding a system preference whether to speak passwords in accessibility mode." into ics-mr1
2011-12-06 10:27:04 -08:00
Jeff Brown
e589fc8984
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)
2011-12-05 22:52:20 -08:00
Jeff Brown
4079702ac2
Merge "Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)" into ics-mr1
2011-12-05 22:50:49 -08:00
Jim Miller
a3e3c4dd37
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
2011-12-05 22:14:37 -08:00
Jim Miller
17f9fe13c7
Merge "Fix 5705837: Dismiss keyguard when launching Settings from Statusbar" into ics-mr1
2011-12-05 22:12:54 -08:00
Jesse Hall
2eb4a5ee5b
am 3e7b412d: Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
...
* commit '3e7b412d7d6332830ceaf123edb5e211757c69ce':
Fix statusbar crash on devices with no Bluetooth
2011-12-05 21:24:53 -08:00
Jesse Hall
3e7b412d7d
Merge "Fix statusbar crash on devices with no Bluetooth" into ics-mr1
2011-12-05 21:23:29 -08:00
Jeff Brown
f98c2a67fe
Fix memory corruption issues in TextLayoutCache. (DO NOT MERGE)
...
Ensure log_clusters array is big enough.
Bug: 5714171
Explicitly handle the cases where the entire string or a single
run might have a length of 0.
Harfbuzz assumes the length of the item is at least 1.
If the length is zero, then it will clobber memory at index -1
into the log_clusters array.
Bug: 5705479
Change-Id: If28a9866221081f69973c1d12d7fe0cf8db2edd0
2011-12-05 20:40:03 -08:00
Matthew Xie
12479141dd
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
2011-12-05 19:58:12 -08:00
Matthew Xie
0d9a41e74c
Merge "Broadcast turning on/off intent as early as possible when switch on/off BT" into ics-mr1
2011-12-05 19:56:54 -08:00
Dianne Hackborn
ec42750e4d
am 0c0120ef: Merge "Fix issue #5714517 : App shortcuts can result in bad task intents" into ics-mr1
...
* commit '0c0120efa2dedaf25ae789bced5a3f9fa33c32bb':
Fix issue #5714517 : App shortcuts can result in bad task intents
2011-12-05 19:18:34 -08:00
Dianne Hackborn
0c0120efa2
Merge "Fix issue #5714517 : App shortcuts can result in bad task intents" into ics-mr1
2011-12-05 19:16:54 -08:00
Dianne Hackborn
24ec870322
am 52245ac7: Merge "Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G" into ics-mr1
...
* commit '52245ac7c41735c561199d9ec7e9577d592ca852':
Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G
2011-12-05 19:09:17 -08:00
Dianne Hackborn
52245ac7c4
Merge "Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G" into ics-mr1
2011-12-05 19:07:52 -08:00
Daniel Sandler
83f79c9098
am f66664a5: Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
...
* commit 'f66664a50e914e1cc5d66046cfc4c5b195a09eab':
Fix sticky menu icon on tablet status bar.
2011-12-05 19:04:13 -08:00
Daniel Sandler
f66664a50e
Merge "Fix sticky menu icon on tablet status bar." into ics-mr1
2011-12-05 19:02:28 -08:00
Dianne Hackborn
77eaaf04c6
Fix issue #5713576 : Home redraws after returning from app on Nexus S 4G
...
Turn of destroying of activities during memory trimming.
Change-Id: Ibea415c13fca4f67f56adefe81a1495f5f9ad273
2011-12-05 19:00:42 -08:00
Dianne Hackborn
f5b8671c34
Fix issue #5714517 : App shortcuts can result in bad task intents
...
New API to let you build an Intent whose base configuration is correct,
but has an additional "selector" to pick out the specific app that you
would like launched.
Change-Id: Ide9db6dc60e2844b7696cfe09b28337fe7dd63db
2011-12-05 17:42:41 -08:00
Adam Powell
7cd1851d82
am 9a856f4e: Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
...
* commit '9a856f4ee7b49f735e31b57a09bee2f033ce20a5':
Drop API level for notification compatibility BG to 8 (from 10)
2011-12-05 17:40:18 -08:00
Adam Powell
9a856f4ee7
Merge "Drop API level for notification compatibility BG to 8 (from 10)" into ics-mr1
2011-12-05 17:38:23 -08:00
Matthew Xie
a6ba6fd4bb
Broadcast turning on/off intent as early as possible when switch on/off BT
...
Move broadcastState(BluetoothAdapter.STATE_TURNING_ON/OFF) before any other
method calls when turn on/off Bluetooth.
Bug 5703346
Change-Id: Iddbdab58367a7d648708aa23671eb09701d66793
2011-12-05 17:36:01 -08:00
Eric Laurent
5433e25f6c
am 7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
...
* commit '7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
2011-12-05 17:22:58 -08:00
Eric Laurent
7b6aff2373
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
2011-12-05 17:20:53 -08:00
Fred Quintana
f3f7d65b65
am b5f2dfbc: Merge "By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don\'t have much RAM as defined by the call ActivityManager.isLargeRAM()" into ics-mr1
...
* commit 'b5f2dfbc221d3dc799232e0ada3b6621d3d4d597':
By default ICS allows two syncs to run in parallel. Make it only do one at a time for devices that don't have much RAM as defined by the call ActivityManager.isLargeRAM()
2011-12-05 16:47:06 -08:00