Jeff Brown
2b621bc5bb
Merge "Disable postponing performTraversals(), for now."
2011-12-06 18:09:35 -08:00
Jeff Brown
90a3c5f51d
Disable postponing performTraversals(), for now.
...
Bug: 5715378
Bug: 5721047
Change-Id: I89c674306665b6caa3a63b8a9d2b4b7c9ed020ae
2011-12-06 18:01:37 -08:00
Michael Jurka
738a154a1b
Merge "System bar now renders the back button for recents"
2011-12-06 17:37:06 -08:00
Daniel Sandler
328310c6fa
System bar now renders the back button for recents
...
We used to render the back button in Recents
itself, but that had an inconsistent visual
experience.
As a part of this change, add the early beginning
of support for private status bar APIs for dimming
navigation buttons.
Bug: 3448536
2011-12-06 17:22:19 -08:00
Scott Main
5396ca5d7d
am 0f668951: am 0a83e9d4: am b6322a5b: docs: fix broken links bug: 5542371
...
* commit '0f668951d78ad8c45af54a6c06d3c560eed29108':
docs: fix broken links bug: 5542371
2011-12-06 17:17:00 -08:00
Scott Main
0f668951d7
am 0a83e9d4: am b6322a5b: docs: fix broken links bug: 5542371
...
* commit '0a83e9d438f35cba62a10392fb9e7e1c577aa638':
docs: fix broken links bug: 5542371
2011-12-06 17:14:50 -08:00
Scott Main
0a83e9d438
am b6322a5b: docs: fix broken links bug: 5542371
...
* commit 'b6322a5bb9fda370cccf89434b939370dfa36b02':
docs: fix broken links bug: 5542371
2011-12-06 17:12:53 -08:00
Scott Main
b6322a5bb9
docs: fix broken links
...
bug: 5542371
Change-Id: If04b39918a54ccc163d255bf75d566f1875dac0a
2011-12-06 17:09:37 -08:00
Andreas Huber
e3524d33c6
am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
...
* commit '92860d5d4681e684d5f3936137c6c067c950121e':
DO NOT MERGE: Remove the AVI extractor.
2011-12-06 16:59:52 -08:00
Fabrice Di Meglio
afd93d515d
am 59685954: (-s ours) am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1
...
* commit '596859549254a63c619fdc403e49e809751ab832':
Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
2011-12-06 16:59:50 -08:00
Hong Teng
2fe9130f22
am 2be608f8: 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 an
...
* commit '2be608f88cd469b40a472551f22a9d40903beede':
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 16:59:45 -08:00
Amith Yamasani
9c316f3c6a
am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1
...
* commit 'd49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
New and improved silent mode on lockscreen.
2011-12-06 16:59:44 -08:00
Adam Powell
e49e8cc4e7
Merge "resolved conflicts for merge of 6a828712 to master"
2011-12-06 16:57:35 -08:00
Adam Powell
e4b8ff8068
resolved conflicts for merge of 6a828712 to master
...
Change-Id: I73c804667a890bcc9924951ff655137c1345541a
2011-12-06 16:53:47 -08:00
Jeff Brown
07ee3418bb
Merge "Add tap and swipe capabilities to the "input" tool."
2011-12-06 16:47:29 -08:00
Romain Guy
bdfe770e08
Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817 "
2011-12-06 16:37:58 -08:00
Romain Guy
9c4b79af22
Discard framebuffer rendering queues when discarding layers
...
Bug #5581817
Change-Id: Ie30700a29059d2ea60eb7bd3f8bd20ac48a149ab
2011-12-06 16:37:10 -08:00
Andreas Huber
92860d5d46
am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1
...
* commit '791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
2011-12-06 16:22:07 -08:00
Andreas Huber
791a31832a
Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1
2011-12-06 16:20:01 -08:00
Jeff Brown
b42d5e2b9b
Merge "Fix PIN pad."
2011-12-06 16:18:03 -08:00
Jeff Brown
07069a04ef
Fix PIN pad.
...
Some widgets apparently inject keys into the ViewRoot by sending
a DISPATCH_KEY message to its handler. Ugh.
Bug: 5711577
Change-Id: Ibe9aaf705095d152ec866c536f31f5d85e27b97f
2011-12-06 16:15:22 -08:00
Jeff Brown
797e4465fb
Add tap and swipe capabilities to the "input" tool.
...
Change-Id: Ia2950d281ef04232c5134fa045ce18272fbd6f81
2011-12-06 16:06:13 -08:00
James Dong
ed1d1838f0
am 49782b81: (-s ours) am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
...
* commit '49782b8100a752056f044f6f3f1cf16a6a1f03b4':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
2011-12-06 16:04:38 -08:00
Andreas Huber
a0befca940
am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
...
* commit 'c4738293527618f9a228c3f0f645c0a0704ada9c':
DO NOT MERGE: Remove the AVI extractor.
2011-12-06 16:04:36 -08:00
Irfan Sheriff
591f6fa7c7
am 5e2e7d5f: am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now
...
* commit '5e2e7d5fb81266640f8284abb25fe8be06693f5b':
Disable wifiwatchdog for now
2011-12-06 16:04:30 -08:00
Gilles Debunne
f9bb1cd1fc
resolved conflicts for merge of fb729202 to master
...
Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0
2011-12-06 15:57:47 -08:00
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
Andreas Huber
485d82c5e2
Merge commit 'babb7200' into manualmerge
2011-12-06 15:03:10 -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
Tor Norbye
e98ae0a050
Merge "Upgrade layoutlib generation code to use ASM 4.0"
2011-12-06 13:31:04 -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
Andreas Huber
babb72006b
Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0
2011-12-06 12:11:38 -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