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

75573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Romain Guy
d8c5dd041f am 16d9a259: am 8bd12ea8: Merge "Decode common GL error codes when logging frame error status" into jb-dev 
* commit '16d9a2596e632fbc055c2885b117b47b2a4c8774':
  Decode common GL error codes when logging frame error status
 2012-04-26 14:11:52 -07:00
Eric Fischer
0652263ba9 Merge "Import translations. DO NOT MERGE" 2012-04-26 14:09:08 -07:00
Romain Guy
16d9a2596e am 8bd12ea8: Merge "Decode common GL error codes when logging frame error status" into jb-dev 
* commit '8bd12ea8001f72f4450e318e43c50dbc46b4869c':
  Decode common GL error codes when logging frame error status
 2012-04-26 14:09:02 -07:00
Amith Yamasani
c350a46efc am 89b5761a: am 87b16c80: Merge "Remove power menu on tablets." into jb-dev 
* commit '89b5761a8201b78599ce28956b9e9fd7dc56edd7':
  Remove power menu on tablets.
 2012-04-26 14:07:43 -07:00
Romain Guy
8bd12ea800 Merge "Decode common GL error codes when logging frame error status" into jb-dev 2012-04-26 14:06:41 -07:00
Romain Guy
a44a63ac5c Decode common GL error codes when logging frame error status 
Change-Id: I38b333eea53aef20340ce48dfcb0dd30a223f7a8
 2012-04-26 14:05:02 -07:00
Amith Yamasani
89b5761a82 am 87b16c80: Merge "Remove power menu on tablets." into jb-dev 
* commit '87b16c803932e8d54889cdb60117034fdc2ef75c':
  Remove power menu on tablets.
 2012-04-26 14:04:50 -07:00
Amith Yamasani
87b16c8039 Merge "Remove power menu on tablets." into jb-dev 2012-04-26 14:02:53 -07:00
Eric Fischer
0b6408b6bf Import translations. DO NOT MERGE 
Change-Id: Icf41e6ee76e70096d79e1ee098540dc97a9e02bb
 2012-04-26 14:02:52 -07:00
Romain Guy
c9498d33f0 am 83e72f40: am dcb1eab4: Merge "Keep opaque bitmaps opaque after scaling Bug #6293845" into jb-dev 
* commit '83e72f40c7a426f9f2fb90c37e41055c19ac090d':
  Keep opaque bitmaps opaque after scaling Bug #6293845
 2012-04-26 13:42:30 -07:00
Romain Guy
83e72f40c7 am dcb1eab4: Merge "Keep opaque bitmaps opaque after scaling Bug #6293845" into jb-dev 
* commit 'dcb1eab429edaf23d5eb67bbf78095391f071946':
  Keep opaque bitmaps opaque after scaling Bug #6293845
 2012-04-26 13:39:18 -07:00
Romain Guy
dcb1eab429 Merge "Keep opaque bitmaps opaque after scaling Bug #6293845" into jb-dev 2012-04-26 13:37:11 -07:00
Romain Guy
8f8d9fb52c Keep opaque bitmaps opaque after scaling 
Bug #6293845

Change-Id: If9e82993f4c9702244ddedb5667421a6fcc7a0c5
 2012-04-26 13:35:36 -07:00
Ying Wang
def0ccc374 am 532d2c70: am 002f5377: Apply --extra-packages in case --custom-pacakge is also specified. 
* commit '532d2c70cef4689e6b48fae1a078021858177033':
  Apply --extra-packages in case --custom-pacakge is also specified.
 2012-04-26 13:19:09 -07:00
Ying Wang
532d2c70ce am 002f5377: Apply --extra-packages in case --custom-pacakge is also specified. 
* commit '002f53770a7f6850eab4d7e381e91dc94d28968f':
  Apply --extra-packages in case --custom-pacakge is also specified.
 2012-04-26 13:16:49 -07:00
Ying Wang
002f53770a Apply --extra-packages in case --custom-pacakge is also specified. 
Cherry-picked from master.

Change-Id: I2d67b8821afdf064f4186ccd8def1b65f9a7dc88
 2012-04-26 13:13:08 -07:00
Gilles Debunne
37e845b055 am c661516e: am 64ac862f: Merge "Basic renaming refactoring in Layout" into jb-dev 
* commit 'c661516efdef589b1eff5b80a7a54d614f1dabb0':
  Basic renaming refactoring in Layout
 2012-04-26 13:04:07 -07:00
John Reck
866ebb15f2 am 7f6a6c78: am a75fbc3c: Merge "On new content, attach functor directly" into jb-dev 
* commit '7f6a6c787d108b8c1d5686ee0031352e91c9370d':
  On new content, attach functor directly
 2012-04-26 13:04:02 -07:00
Teng-Hui Zhu
6e5fdc27ed am 1e3ef860: (-s ours) am 85973212: Merge "DO NOT MERGE:The visiblerect calculation should take view\'s scaling into consideration" into jb-dev 
* commit '1e3ef860c5649278c5c6e353b7f2503de543ae1e':
  DO NOT MERGE:The visiblerect calculation should take view's scaling into consideration
 2012-04-26 13:03:43 -07:00
Adam Powell
ccae3151f3 am 0e7cfa94: am 9004053c: Merge "Fix janky programmatic ListView scrolling" into jb-dev 
* commit '0e7cfa941577e5feccb87a9584f5038f8fbcfdf3':
  Fix janky programmatic ListView scrolling
 2012-04-26 13:03:42 -07:00
Steve Block
856d8ac200 am 85061b31: am ff35000c: Merge "Fix JavaDoc style for several WebView classes" into jb-dev 
* commit '85061b315f895a0a13657aaefd2d8562658bcc05':
  Fix JavaDoc style for several WebView classes
 2012-04-26 13:03:40 -07:00
Dave Burke
71c3d06108 am 74d6018f: am 2996cf03: Merge "Unhide new AAC-ELD audio record type." into jb-dev 
* commit '74d6018f8db25c412f3cfb61c58a39f8c8408470':
  Unhide new AAC-ELD audio record type.
 2012-04-26 13:03:39 -07:00
Andreas Huber
2b646ba575 am 36da6a2c: am 129a6ccb: Merge "The MediaExtractor can now unselect tracks and has more control over seeking." into jb-dev 
* commit '36da6a2c86337182803fb191ed5435f17836e23c':
  The MediaExtractor can now unselect tracks and has more control over seeking.
 2012-04-26 13:03:37 -07:00
Michael Kolb
38c846c1be am d5515509: am 77974166: Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev 
* commit 'd5515509ef0404c49570d95e37739f6c787cd3da':
  Fix NPE in isPrivateBrowsingEnabled()
 2012-04-26 13:03:36 -07:00
Eric Laurent
b00d41b998 am 426606d7: am 8037cad6: Merge "Fix AudioManager.forceVolumeControlStream()" into jb-dev 
* commit '426606d78597b2b591f0bf4f0ee47c29b2d296f9':
  Fix AudioManager.forceVolumeControlStream()
 2012-04-26 13:03:34 -07:00
Makoto Onuki
31cef9cbc4 am 2d94830e: am f307268c: Merge "Clearify javadoc on Phone.NORMALIZED_NUMBER." into jb-dev 
* commit '2d94830e8ae9a0e37c1e9e1f06f6a7ed33c0ba68':
  Clearify javadoc on Phone.NORMALIZED_NUMBER.
 2012-04-26 13:03:33 -07:00
Amith Yamasani
51e8480176 Remove power menu on tablets. 
It had been added temporarily for testing, reverting to old behavior.

Change-Id: I1ea3fc41de311ba44949eb7abb7db3057eef1357
 2012-04-26 12:54:39 -07:00
Gilles Debunne
c661516efd am 64ac862f: Merge "Basic renaming refactoring in Layout" into jb-dev 
* commit '64ac862f7bb40f2ec2d65510904cf157b1cf60a5':
  Basic renaming refactoring in Layout
 2012-04-26 12:54:10 -07:00
Gilles Debunne
64ac862f7b Merge "Basic renaming refactoring in Layout" into jb-dev 2012-04-26 12:51:59 -07:00
John Reck
7f6a6c787d am a75fbc3c: Merge "On new content, attach functor directly" into jb-dev 
* commit 'a75fbc3c76dfe6a1c678b66f83cef878e3f3cdf4':
  On new content, attach functor directly
 2012-04-26 12:29:47 -07:00
John Reck
a75fbc3c76 Merge "On new content, attach functor directly" into jb-dev 2012-04-26 12:27:56 -07:00
Teng-Hui Zhu
1e3ef860c5 am 85973212: Merge "DO NOT MERGE:The visiblerect calculation should take view\'s scaling into consideration" into jb-dev 
* commit '85973212e9a63590118c2ad8937798bc1aa62687':
  DO NOT MERGE:The visiblerect calculation should take view's scaling into consideration
 2012-04-26 11:58:45 -07:00
Adam Powell
0e7cfa9415 am 9004053c: Merge "Fix janky programmatic ListView scrolling" into jb-dev 
* commit '9004053c59e20127b04abbdb249bf1e44768da9e':
  Fix janky programmatic ListView scrolling
 2012-04-26 11:58:40 -07:00
Steve Block
85061b315f am ff35000c: Merge "Fix JavaDoc style for several WebView classes" into jb-dev 
* commit 'ff35000ce1d7b0416c42ba1054a193fb5cfe8e8e':
  Fix JavaDoc style for several WebView classes
 2012-04-26 11:58:36 -07:00
Dave Burke
74d6018f8d am 2996cf03: Merge "Unhide new AAC-ELD audio record type." into jb-dev 
* commit '2996cf03a2fd419bc91a45d7db733e2e81bf84f4':
  Unhide new AAC-ELD audio record type.
 2012-04-26 11:58:35 -07:00
Andreas Huber
36da6a2c86 am 129a6ccb: Merge "The MediaExtractor can now unselect tracks and has more control over seeking." into jb-dev 
* commit '129a6ccbb8037ab36259329f702d12a225f75510':
  The MediaExtractor can now unselect tracks and has more control over seeking.
 2012-04-26 11:58:32 -07:00
Michael Kolb
d5515509ef am 77974166: Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev 
* commit '77974166dbb962fee42ae3f5066523349d5700ed':
  Fix NPE in isPrivateBrowsingEnabled()
 2012-04-26 11:58:30 -07:00
Eric Laurent
426606d785 am 8037cad6: Merge "Fix AudioManager.forceVolumeControlStream()" into jb-dev 
* commit '8037cad6c19cacc55f0e25a2d41e15599666973c':
  Fix AudioManager.forceVolumeControlStream()
 2012-04-26 11:58:18 -07:00
Makoto Onuki
2d94830e8a am f307268c: Merge "Clearify javadoc on Phone.NORMALIZED_NUMBER." into jb-dev 
* commit 'f307268cd5b4fdc47706e9bc9d9ebdb8a84851a9':
  Clearify javadoc on Phone.NORMALIZED_NUMBER.
 2012-04-26 11:58:15 -07:00
Teng-Hui Zhu
85973212e9 Merge "DO NOT MERGE:The visiblerect calculation should take view's scaling into consideration" into jb-dev 2012-04-26 11:28:17 -07:00
Adam Powell
9004053c59 Merge "Fix janky programmatic ListView scrolling" into jb-dev 2012-04-26 11:14:02 -07:00
Adam Powell
0b8acd81d5 Fix janky programmatic ListView scrolling 
Adjust AbsListView to use a linear interpolator for smooth scrolling
rather than the default scroller behavior. This prevents irregular
motion as the scroll is altered in-flight to account for varying
height list items.

Bug 6397800

Change-Id: I8cc33dfc18903943369e1353930c48e2652b0142
 2012-04-26 11:10:27 -07:00
Steve Block
ff35000ce1 Merge "Fix JavaDoc style for several WebView classes" into jb-dev 2012-04-26 11:02:32 -07:00
Dave Burke
2996cf03a2 Merge "Unhide new AAC-ELD audio record type." into jb-dev 2012-04-26 10:58:57 -07:00
Andreas Huber
129a6ccbb8 Merge "The MediaExtractor can now unselect tracks and has more control over seeking." into jb-dev 2012-04-26 10:56:58 -07:00
Michael Kolb
77974166db Merge "Fix NPE in isPrivateBrowsingEnabled()" into jb-dev 2012-04-26 10:54:58 -07:00
Ying Wang
79e95db4e1 Merge "Apply --extra-packages in case --custom-pacakge is also specified." 2012-04-26 10:47:20 -07:00
Andreas Huber
f2855b3df5 The MediaExtractor can now unselect tracks and has more control over seeking. 
Change-Id: I12c28bf31fe9fb4057352999fa38213ae289a417
related-to-bug: 6276111
 2012-04-26 10:43:31 -07:00
Michael Kolb
13d7c03eb8 Fix NPE in isPrivateBrowsingEnabled() 
Bug: 6393286

Change-Id: I1fd9c57b7bd68a9c495cbb0df45a406f83b22b5f
 2012-04-26 10:43:08 -07:00
Eric Laurent
8037cad6c1 Merge "Fix AudioManager.forceVolumeControlStream()" into jb-dev 2012-04-26 10:22:13 -07:00