drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
64,124 Commits 1 Branch 0 Tags
Commit Graph

64124 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephen Hines
bfda435744 Merge "Remove warnings about unused results." 2011-12-06 18:33:42 -08:00
Stephen Hines
f7f930480c Merge "NULL should not be const for RS." 2011-12-06 18:33:35 -08:00
Jeff Brown
d11b88dc91 am 2b621bc5: Merge "Disable postponing performTraversals(), for now." 
* commit '2b621bc5bb52339cc677beb89d0495b8b5d4f444':
  Disable postponing performTraversals(), for now.
 2011-12-06 18:11:39 -08:00
Jeff Brown
2b621bc5bb Merge "Disable postponing performTraversals(), for now." 2011-12-06 18:09:35 -08:00
Gilles Debunne
6583ce5b89 Minor tweak in getLocationInWindow 
Change-Id: Ib3f30dbfb3aee7c46c58e1f7832e3394702c0ff6
 2011-12-06 18:09:02 -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
James Dong
ca402cdcac Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed 
to the callback could be 0.

Change-Id: Ie921f0af8284eccfd02c4a5826ed41fe19f9676f
related-to-bug: 5613451
 2011-12-06 17:58:22 -08:00
Michael Jurka
dd4e3b6054 am 738a154a: Merge "System bar now renders the back button for recents" 
* commit '738a154a1b27ff908616c336d4adf400a141eebf':
  System bar now renders the back button for recents
 2011-12-06 17:39:02 -08:00
John Reck
8463c88ddf Fix WebTextView rings 
Bug: 5718531
 Don't scroll the rings and fix the border's alpha

Change-Id: I5e629d2b3b1b2bf4760c01d0f927e3f81949e9bd
 2011-12-06 17:38:57 -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
a46935e1d0 am 5396ca5d: am 0f668951: am 0a83e9d4: am b6322a5b: docs: fix broken links bug: 5542371 
* commit '5396ca5d7dc6e389c70a602b7dcabde0fc789471':
  docs: fix broken links bug: 5542371
 2011-12-06 17:19:38 -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
f90d1ac0d5 am e3524d33: am 92860d5d: (-s ours) am 791a3183: Merge "Merge commit \'babb7200\' into manualmerge" into ics-mr1 
* commit 'e3524d33c6f0296f38d53ec05397698a74fd755a':
  DO NOT MERGE: Remove the AVI extractor.
 2011-12-06 17:04:27 -08:00
Fabrice Di Meglio
e9b3a206da am afd93d51: am 59685954: (-s ours) am 1e994211: Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1 
* commit 'afd93d515dadcabd9f4b02176813eb5818372621':
  Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)
 2011-12-06 17:04:25 -08:00
Hong Teng
b984658fe6 am 2fe9130f: 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 o 
* commit '2fe9130f227b31e3d24987f442c3374f2299d9f5':
  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 17:04:22 -08:00
Amith Yamasani
493a3a4ac7 am 9c316f3c: am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1 
* commit '9c316f3c6ac785fd27be97a119dfe8f1303a8ed4':
  New and improved silent mode on lockscreen.
 2011-12-06 17:04:20 -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
bcc895f94f am e49e8cc4: Merge "resolved conflicts for merge of 6a828712 to master" 
* commit 'e49e8cc4e799a2a6793c148b6a4b74d8f69026dd':
  Lower touch slop in ViewConfiguration.
 2011-12-06 16:59:37 -08:00
Adam Powell
e49e8cc4e7 Merge "resolved conflicts for merge of 6a828712 to master" 2011-12-06 16:57:35 -08:00
The Android Automerger
3888503a5d merge in ics-mr1-release history after reset to ics-mr1 2011-12-06 16:54:17 -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
313ae3b1e9 am 07ee3418: Merge "Add tap and swipe capabilities to the "input" tool." 
* commit '07ee3418bbb6b83351641969b39463cf45a10671':
  Add tap and swipe capabilities to the "input" tool.
 2011-12-06 16:49:49 -08:00
Stephen Hines
d53333cc21 Remove warnings about unused results. 
Change-Id: I53004b4452c5e1ac6ff0dab8430de7f73e8a99b9
 2011-12-06 16:48:43 -08:00
Stephen Hines
4d322043ab NULL should not be const for RS. 
Change-Id: I24d96843c40f822bf064a0fa1fc0440b6bf0518d
 2011-12-06 16:47:32 -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
a21b73511c am bdfe770e: Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" 
* commit 'bdfe770e0874295827534558f2cba040644a3a13':
  Discard framebuffer rendering queues when discarding layers Bug #5581817
 2011-12-06 16:39:30 -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
Irfan Sheriff
19380daaf4 Disable poor network connection alone 
- Keep the walled garden detection in place

Bug: 5719771
Change-Id: I9e5d69b6d56096be904106b1db48c02db4c0fb50
 2011-12-06 16:21:03 -08:00
Andreas Huber
791a31832a Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1 2011-12-06 16:20:01 -08:00
Jeff Brown
e7f67b390c am b42d5e2b: Merge "Fix PIN pad." 
* commit 'b42d5e2b9b7f607f08975bae59f4bbcb76266256':
  Fix PIN pad.
 2011-12-06 16:19:48 -08:00
Jeff Brown
b42d5e2b9b Merge "Fix PIN pad." 2011-12-06 16:18:03 -08:00
James Dong
cc6f1edd8c am ed1d1838: 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 'ed1d1838f07851484f378a3e2d6df63736aa78be':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
 2011-12-06 16:17:34 -08:00
Andreas Huber
b959db055d am a0befca9: am c4738293: (-s ours) am 05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 
* commit 'a0befca9401249332443e2db45dd5226f2ac81d7':
  DO NOT MERGE: Remove the AVI extractor.
 2011-12-06 16:17:32 -08:00
Irfan Sheriff
e6aadfe654 am 591f6fa7: am 5e2e7d5f: am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now 
* commit '591f6fa7c7dc9b82ccd6d5b0d758116babbaa058':
  Disable wifiwatchdog for now
 2011-12-06 16:17:30 -08:00
Gilles Debunne
0dfb86010c am f9bb1cd1: resolved conflicts for merge of fb729202 to master 
* commit 'f9bb1cd1fcff7079445dae494ce5d56276092c11':
  Invalidated bounds tightened in TextView
 2011-12-06 16:17:28 -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