ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
42,140 Commits 2 Branches 0 Tags 54 MiB
f1154c79c1
Commit Graph

42140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
aadc681f50 Merge "Truthiness is good." into ics-mr1 2011-12-07 10:33:19 -08:00
The Android Open Source Project
1f6d428286 Reconcile with ics-mr1-release 
Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
 2011-12-07 07:44:31 -08:00
The Android Open Source Project
13f0768ba9 am 6ee7bca1: (-s ours) am 3de8d36b: Reconcile with ics-mr0-release 
* commit '6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
  DO NOT MERGE: Remove the AVI extractor.
  Disable wifiwatchdog for now
 2011-12-07 07:29:38 -08:00
The Android Open Source Project
8abaab91b2 am 3de8d36b: Reconcile with ics-mr0-release 
* commit '3de8d36b6fd166cf63ca256c455c0ea26a849668':
  DO NOT MERGE: Remove the AVI extractor.
  Disable wifiwatchdog for now
 2011-12-07 07:27:57 -08:00
The Android Open Source Project
9e86a344c1 Reconcile with ics-mr0-release 
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
 2011-12-07 07:24:54 -08:00
Narayan Kamath
d329537168 Merge "Allow data uris to be data sources" 2011-12-07 04:15:43 -08:00
Mathias Agopian
478ae5eb5a Improve the VSYNC api a bit. 
- add the ability to set the vsync delivery rate, when the rate is
set to N>1 (ie: receive every N vsync), SF process' is woken up for
all of vsync, but clients only see the every N events.

- add the concept of one-shot vsync events, with a call-back
to request the next one. currently the call-back is a binder IPC.

Change-Id: I09f71df0b0ba0d88ed997645e2e2497d553c9a1b
 2011-12-06 22:43:10 -08:00
Irfan Sheriff
fef9734b56 am 7c92e2dc: am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1 
* commit '7c92e2dccb4e5cb5314455692ac32d2ccff24292':
  Disable poor network connection alone
 2011-12-06 21:09:44 -08:00
Irfan Sheriff
6f2e64fcf1 am 8a4cd3b1: Merge "Disable poor network connection alone" into ics-mr1 
* commit '8a4cd3b1053d92ecb34628218f303343746691f4':
  Disable poor network connection alone
 2011-12-06 21:07:36 -08:00
Irfan Sheriff
17d23095d2 Merge "Disable poor network connection alone" into ics-mr1 2011-12-06 21:06:03 -08:00
Stephen Hines
c4d605f44b Merge "Remove warnings about unused results." 2011-12-06 18:33:42 -08:00
Stephen Hines
b4b690370c Merge "NULL should not be const for RS." 2011-12-06 18:33:35 -08:00
Jeff Brown
9bbbcf8c65 Merge "Disable postponing performTraversals(), for now." 2011-12-06 18:09:35 -08:00
Michael Jurka
1a097519c7 Merge "System bar now renders the back button for recents" 2011-12-06 17:37:06 -08:00
Scott Main
e92ca67b7a 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
653598534c 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
f0eac29469 am b6322a5b: docs: fix broken links bug: 5542371 
* commit 'b6322a5bb9fda370cccf89434b939370dfa36b02':
  docs: fix broken links bug: 5542371
 2011-12-06 17:12:53 -08:00
Andreas Huber
29c5c4f577 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
370a0ea3e7 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
3717403c8d 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
de727eb690 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
165e6c01ca Merge "resolved conflicts for merge of 6a828712 to master" 2011-12-06 16:57:35 -08:00
The Android Automerger
78bfa13ffc merge in ics-mr1-release history after reset to ics-mr1 2011-12-06 16:54:17 -08:00
Adam Powell
152ecbcbfd resolved conflicts for merge of 6a828712 to master 
Change-Id: I73c804667a890bcc9924951ff655137c1345541a
 2011-12-06 16:53:47 -08:00
Jeff Brown
aac54b54b0 Merge "Add tap and swipe capabilities to the "input" tool." 2011-12-06 16:47:29 -08:00
Romain Guy
9d310b95dc Merge "Discard framebuffer rendering queues when discarding layers Bug #5581817" 2011-12-06 16:37:58 -08:00
Andreas Huber
7419051ce0 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
0c62c3799e Merge "Merge commit 'babb7200' into manualmerge" into ics-mr1 2011-12-06 16:20:01 -08:00
Jeff Brown
4243b24c13 Merge "Fix PIN pad." 2011-12-06 16:18:03 -08:00
James Dong
92ce52ab33 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
5a066fabb7 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
0b23b237c8 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
eaa8870230 resolved conflicts for merge of fb729202 to master 
Change-Id: Ic571594b14f2822094d5c1aa4c4b1e9da4a2eae0
 2011-12-06 15:57:47 -08:00
Fabrice Di Meglio
852ef84d0a 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
662eb58742 Merge "Fix TextLayoutCache issue when loading Font tables (DO NOT MERGE)" into ics-mr1 2011-12-06 15:47:27 -08:00
Hong Teng
68149c7683 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
e4a4db8236 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
862884d205 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
3dbdd8f5e4 Merge "New and improved silent mode on lockscreen." into ics-mr1 2011-12-06 15:36:10 -08:00
Andreas Huber
325e028e16 Merge commit 'babb7200' into manualmerge 2011-12-06 15:03:10 -08:00
Adam Powell
bdfa931022 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
6e5c8b6b4f Merge "Lower touch slop in ViewConfiguration." into ics-mr1 2011-12-06 13:58:20 -08:00
Tor Norbye
7f5b06e440 Merge "Upgrade layoutlib generation code to use ASM 4.0" 2011-12-06 13:31:04 -08:00
James Dong
e3c80aafbf 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
102c083007 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
fbf277811b 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
047dc0fd96 Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1 2011-12-06 12:44:53 -08:00
Andreas Huber
6ac5344822 Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr0 2011-12-06 12:11:38 -08:00
Irfan Sheriff
aa68c19731 am 40cb30c2: am 7b62313e: Disable wifiwatchdog for now 
* commit '40cb30c2df2176c03f24cbdc194e3af5a4f64758':
  Disable wifiwatchdog for now
 2011-12-06 11:37:40 -08:00
Irfan Sheriff
e2f918580a am 7b62313e: Disable wifiwatchdog for now 
* commit '7b62313eab4af8835a64fb3fe1e15e5e534a9479':
  Disable wifiwatchdog for now
 2011-12-06 11:34:58 -08:00