ADHOC/replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
45,751 Commits 2 Branches 0 Tags 54 MiB
9e6d9c6085
Commit Graph

45751 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
9e6d9c6085 Merge "Add support for optional titles in action modes" 2012-02-24 17:00:37 -08:00
Mathias Agopian
561d42d853 Merge "remove libui dependency on libEGL" 2012-02-24 16:44:40 -08:00
Mathias Agopian
870b8aa15c remove libui dependency on libEGL 
Change-Id: I1194f04085637d5c384e134967249430cc43b6ee
 2012-02-24 16:42:46 -08:00
Dianne Hackborn
657ab8a15d am 44b1a43d: am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '44b1a43d823ec3cb93e02df4834b27a75bb30ba5':
 2012-02-24 16:42:14 -08:00
Dianne Hackborn
e475b2cae3 Merge "resolved conflicts for merge of 34706a4c to master" 2012-02-24 16:39:59 -08:00
Dianne Hackborn
189752708c resolved conflicts for merge of 34706a4c to master 
Change-Id: I4dd24f3b917aa7e3d2c4b0fae51e951dfcf88ba8
 2012-02-24 16:37:35 -08:00
James Dong
0ffc8c6ea2 Merge "Improved comment about DrmStore.ConstraintsColumns" 2012-02-24 16:36:34 -08:00
James Dong
ec9ac749f5 Merge "Only allow valid types to be used in DrmErrorEvent and DrmInfoEvent" 2012-02-24 16:35:20 -08:00
Dianne Hackborn
bf9473b430 am 4a6e6991: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '4a6e6991b0df0d1b269193b9e9edbd3bc44ba238':
 2012-02-24 16:29:44 -08:00
Dianne Hackborn
de3f69a237 am e65a9ab1: am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit 'e65a9ab1ea42d1f6190bee844ee666b7910d71ef':
  Fix build.
 2012-02-24 16:26:57 -08:00
Dianne Hackborn
2f171c6e50 am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:25:30 -08:00
Dianne Hackborn
126004dade am 5786f5cf: Merge "Fix build." into ics-mr1 
* commit '5786f5cf1b248b79f938b3fa3c5d534159261f09':
  Fix build.
 2012-02-24 16:24:40 -08:00
Dianne Hackborn
49b0cca899 Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Dianne Hackborn
d020d61377 am 92ce6314: am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '92ce6314c15bd6d59a94a247ae63f1da9b4ccab2':
 2012-02-24 15:47:40 -08:00
Dianne Hackborn
f7a84a8c64 am 911b505f: am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '911b505f11c719906985f169a4f45930bdec8695':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:44:55 -08:00
Dianne Hackborn
5d5f8054dc am 140da7c4: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '140da7c4140f0536c3fad1f7be555ebd58055b63':
 2012-02-24 15:42:43 -08:00
Dianne Hackborn
28857486a4 am dc5fa185: am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit 'dc5fa1859d03ecca36fc6be2fed7bbd4ba70b51f':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:41:35 -08:00
Dianne Hackborn
7a519dfe47 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:07 -08:00
Dianne Hackborn
651a8f4bf9 am 133dc2d7: Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 
* commit '133dc2d7aecc68990c363c861716b134910a4ced':
  Fix issue #6048808: sometimes auto-correct is inactive
 2012-02-24 15:38:03 -08:00
Dianne Hackborn
a270567a78 Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 2012-02-24 15:36:33 -08:00
Mathias Agopian
1c071f828c Merge "deprecate L_8, LA_88 and RGB_332 in sdk" 2012-02-24 15:09:54 -08:00
Robert Greenwalt
a60852fc60 Merge "Seperate RIL constants from the framework." 2012-02-24 15:02:30 -08:00
Mathias Agopian
ff615cc7a1 deprecate L_8, LA_88 and RGB_332 in sdk 
re-add support for pixelformats L_8, LA_88 and RGB_332 in libui
for backward compatibility.

This may or may not fix 6058926

Bug: 6049685
Change-Id: Ic1b8b4cc994522f7fe664da64c0ef76b98bc6d53
 2012-02-24 14:58:36 -08:00
Glenn Kasten
db58102434 Merge "Pull CPU statistics code out of threadLoop()" 2012-02-24 14:25:15 -08:00
The Android Open Source Project
619fc0e28c am 5cb79935: am 2ddd7b3e: Reconcile with ics-mr1-release 
* commit '5cb79935b9ebb74a410d78a986391dda6e9f7994':
 2012-02-24 14:14:47 -08:00
The Android Open Source Project
b5110d49e6 am 2ddd7b3e: Reconcile with ics-mr1-release 
* commit '2ddd7b3e8753816ccaaf5e2fe5b0b51892c4c853':
 2012-02-24 14:12:35 -08:00
The Android Open Source Project
8210d88c03 Reconcile with ics-mr1-release 
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
 2012-02-24 14:05:51 -08:00
The Android Open Source Project
a3f66272e3 am cb20fab2: am aac21480: Reconcile with ics-mr1-release 
* commit 'cb20fab2ee39cfcb43400b88098b75a8aab4b0e0':
 2012-02-24 14:04:16 -08:00
Andreas Huber
f194523529 Merge "Make sure we return input/output buffers to the codec not just while" 2012-02-24 14:03:27 -08:00
Andreas Huber
aaa2843c03 Merge "Fix two more locations that use the old setObject("buffer", ...) paradigm" 2012-02-24 14:02:52 -08:00
The Android Open Source Project
c7b46b6260 am aac21480: Reconcile with ics-mr1-release 
* commit 'aac214800b518259306960ff9cc90de65d095398':
 2012-02-24 14:01:27 -08:00
The Android Open Source Project
bb4bcfc028 Reconcile with ics-mr1-release 
Change-Id: I496b3ff789ad7d4cb5f3cf720fbcab423a3694f6
 2012-02-24 13:57:46 -08:00
Glenn Kasten
29348a8925 Merge "Remove TrackBase::mFlags" 2012-02-24 13:17:36 -08:00
Svetoslav Ganov
88ecefa475 Merge "Regression: Cannot query the content of certain windows." 2012-02-24 11:33:46 -08:00
Jean-Baptiste Queru
d8a1448ff5 am ed7e1e83: am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit 'ed7e1e830165678421ee7d1b3dac044214a6e635':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:11:10 -08:00
Jean-Baptiste Queru
b3a5ddc098 am 47023027: am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit '470230275431c8ae85debc3c089b6942c55fef0f':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:07:45 -08:00
Jean-Baptiste Queru
f50a9dc7bb am 26d9944e: am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit '26d9944e3f75123708ef0cfb158f48709348a361':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:05:15 -08:00
Jean-Baptiste Queru
8ebb94eb7e am 6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 
* commit '6a300a5413898ff8b728e77c5a23290cae60e9b5':
  stagefright aacenc: Make the bits to write in WriteBits unsigned
 2012-02-24 11:02:29 -08:00
Daniel Sandler
a7e4b1a23c Merge "New notification priority and related APIs." 2012-02-24 10:53:42 -08:00
Svetoslav Ganov
a7e2d3cfaf Merge "UiTestAutomationBridge does not terminate its HandlerThread." 2012-02-24 10:52:10 -08:00
Jean-Baptiste Queru
93bd8c1c7b am 70450553: am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit '70450553f8f1e6ec4967f86a4b811db2940e8772':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:35:47 -08:00
Jean-Baptiste Queru
e21887471d am 78fc0c0b: am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 
* commit '78fc0c0bfae913a4a44011225396ae525b335fb1':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:33:05 -08:00
Jean-Baptiste Queru
5a5fafcc79 am 14c6e272: am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit '14c6e2728c2ae39aab6fc9a9a77c402d7322afc0':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:32:34 -08:00
Jean-Baptiste Queru
57408cc033 am 428ece23: am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 
* commit '428ece23f414d288981ea0ac8f326e9e71a57959':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:30:12 -08:00
Jean-Baptiste Queru
0827014e5a am 2accfc11: am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit '2accfc110a71add56f5e4c35228e88dfa3024676':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:29:45 -08:00
Jean-Baptiste Queru
9f32cdb3ae Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned" 2012-02-24 10:28:01 -08:00
Jean-Baptiste Queru
332c28848f am c4aa19a5: am ea227787: Merge changes I903353c5,I822dcc74 
* commit 'c4aa19a578b8a11bea225994c58116b407e63a69':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:27:06 -08:00
Jean-Baptiste Queru
c89356e2f2 am d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint" 
* commit 'd6a25154d94c48ab2ef12641c789458ab14ca94f':
  stagefright aacenc: Fix an inline asm constraint
 2012-02-24 10:26:53 -08:00
Jean-Baptiste Queru
a7ea406dc9 am ea227787: Merge changes I903353c5,I822dcc74 
* commit 'ea227787253e29da2d688399b097e05708d3bf73':
  stagefright amrnb: Properly negate all values
  stagefright amrnb: Fix a bug on architectures where long is 64 bit
 2012-02-24 10:24:34 -08:00
Svetoslav Ganov
f41564ab04 Merge "AccessibilityNodeInfos node properly cached." 2012-02-24 10:23:06 -08:00