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

75654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dianne Hackborn
6fa7873193 am 8e6159b8: Merge "Add traces for window manager and activity manager." into jb-dev 
* commit '8e6159b821c0782776c030ab588c3e0d1d0143f6':
  Add traces for window manager and activity manager.
 2012-04-26 15:26:10 -07:00
Eric Fischer
09d667addd am 81694ea5: (-s ours) am 2be1523b: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '81694ea58dd9fb7ba393c2377ca5ae8b7277344b':
  Import translations. DO NOT MERGE
 2012-04-26 15:25:40 -07:00
Steve Block
ef16315080 Tweak JavaDoc for WebSettings.setAllowUniversalAccessFromFileURLs() and setAllowFileAccessFromFileURLs() 
Bug: 6212665
Change-Id: Ifc5c83cfee7cf63edbe2c65c55617eb01ea9eced
 2012-04-26 23:25:29 +01:00
Eric Fischer
16fb5d444c Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-26 15:25:17 -07:00
Dianne Hackborn
8e6159b821 Merge "Add traces for window manager and activity manager." into jb-dev 2012-04-26 15:24:18 -07:00
Eric Fischer
81694ea58d am 2be1523b: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '2be1523ba9ee102dc0a2f825f6512fed2929a232':
  Import translations. DO NOT MERGE
 2012-04-26 15:23:41 -07:00
Eric Fischer
2be1523ba9 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-04-26 15:20:58 -07:00
Brian Colonna
e26af8cc56 am 460fa3c3: am 6bc75916: Merge "Changes to biometric sensor interface in lockscreen" into jb-dev 
* commit '460fa3c31a6fd04784648911850640453020a358':
  Changes to biometric sensor interface in lockscreen
 2012-04-26 14:46:40 -07:00
Brian Colonna
460fa3c31a am 6bc75916: Merge "Changes to biometric sensor interface in lockscreen" into jb-dev 
* commit '6bc75916401ba85efd19a09a834f4c91cdd8c7f5':
  Changes to biometric sensor interface in lockscreen
 2012-04-26 14:44:05 -07:00
Brian Colonna
6bc7591640 Merge "Changes to biometric sensor interface in lockscreen" into jb-dev 2012-04-26 14:41:18 -07:00
Mike Lockwood
f2be4af90d am ded38270: am 9ad1b113: Merge "Make audio routing Intents protected" into jb-dev 
* commit 'ded3827092c8880cec82292dc12b0b6cf7f489ce':
  Make audio routing Intents protected
 2012-04-26 14:34:59 -07:00
Mike Lockwood
ded3827092 am 9ad1b113: Merge "Make audio routing Intents protected" into jb-dev 
* commit '9ad1b113260dfb1ac04a7c30e804e24e74dada4f':
  Make audio routing Intents protected
 2012-04-26 14:32:41 -07:00
Brian Colonna
ea8441e22a Changes to biometric sensor interface in lockscreen 
This cleans up the biometric sensor interface - the interface between
lockscreen and Face Unlock.  Not only does it document the interface,
but it also makes two noteworthy changes to the interface:

1) Instead of calling mBiometricUnlock.start() with a parameter to
tell it whether to suppress itself, lockscreen makes all of the
decisions about whether the biometric unlock should be started or not
and only calls start() if it should be started.  Passing a parmeter to
tell a function to not start itself was strange, but it was a
necessary intermediate step in the process of fixing this interface.

2) Instead of calling mBiometricUnlock.initializeView() with a top
view that the biometric unlock should attach to, lockscreen now
provides the biometric unlock with the actual view it is allowed to
work in.  This keeps lockscreen in control of where the biometric
sensor is allowed to display.

A few things were also cleaned up within the Face Unlock
implementation of the biometric interface:

1) Changes needed to match the requirements of the improved biometric
sensor interface, including moving the functions into an order that
makes more sense.

2) The bind() function was only being called from start(), which has
turned into only a couple of lines of code, so the bind() code has
been just put inline into the start() function, which mirrors the
stop() function which has the unbind() code in it.

3) The showArea() function was really just one line of code with a
check.  It was being called from two places.  The showArea() code is
now just written inline in those two places, which makes the code
much easier to follow.

4) Renamed occurrences of FaceLock to Face Unlock.

Change-Id: Ie95ce21dcc77170381af9ce320f2675dfe249741
 2012-04-26 17:31:29 -04:00
Mike Lockwood
9ad1b11326 Merge "Make audio routing Intents protected" into jb-dev 2012-04-26 14:30:31 -07:00
Irfan Sheriff
ef948f5bd9 am 706ebff3: am aeeee6a3: Merge "Fix flag on network state change broadcast" into jb-dev 
* commit '706ebff307f80943504e8196c58731c1777b2c88':
  Fix flag on network state change broadcast
 2012-04-26 14:27:02 -07:00
Eric Fischer
24fcab2823 Import translations. DO NOT MERGE 
Change-Id: Ie316b1380554b041ff1eb90a9a57bfae86f1aed8
 2012-04-26 14:25:13 -07:00
Dianne Hackborn
79d59491e2 am 530330c2: am a6517ae3: Merge "Update process importance documentation." into jb-dev 
* commit '530330c264867594f3293c6b310e8975ff45c9fa':
  Update process importance documentation.
 2012-04-26 14:24:34 -07:00
Irfan Sheriff
706ebff307 am aeeee6a3: Merge "Fix flag on network state change broadcast" into jb-dev 
* commit 'aeeee6a3642360c1659f3bf14b46b93e3250104a':
  Fix flag on network state change broadcast
 2012-04-26 14:24:26 -07:00
Eric Fischer
130f95b1e0 Import translations. DO NOT MERGE 
Change-Id: I8816757eeaf3b8b2b01964ec030ef3ca5f24ff7a
 2012-04-26 14:23:36 -07:00
Dianne Hackborn
530330c264 am a6517ae3: Merge "Update process importance documentation." into jb-dev 
* commit 'a6517ae3002ffe98afcdd45de0f2efbc2f97c871':
  Update process importance documentation.
 2012-04-26 14:21:56 -07:00
Irfan Sheriff
aeeee6a364 Merge "Fix flag on network state change broadcast" into jb-dev 2012-04-26 14:21:22 -07:00
Dianne Hackborn
a6517ae300 Merge "Update process importance documentation." into jb-dev 2012-04-26 14:19:12 -07:00
Dianne Hackborn
1ded0b1f6a Add traces for window manager and activity manager. 
Change-Id: I525d762db328e4c597da27b6b56d9a808e199756
 2012-04-26 14:14:50 -07:00
Irfan Sheriff
ea22ddd6bc Fix flag on network state change broadcast 
Using FLAG_RECEIVER_REPLACE_PENDING causes broadcasts
to be missed confusing the connectivity service

BUg: 6401167
Change-Id: Id69b2df18b9eb6b3e2195fbf399f36501a8d41df
 2012-04-26 14:13:23 -07:00
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
Eric Fischer
85a0c7c80c Import translations. DO NOT MERGE 
Change-Id: I61893c06aa4696d0349b0afe92940671feec1eb1
 2012-04-26 13:57:37 -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