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

75548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
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
85a0c7c80c Import translations. DO NOT MERGE 
Change-Id: I61893c06aa4696d0349b0afe92940671feec1eb1
 2012-04-26 13:57:37 -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
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
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
Mike Lockwood
8f014059d3 Make audio routing Intents protected 
These intents should only be sent by the system:

android.intent.action.HEADSET_PLUG
android.intent.action.ANALOG_AUDIO_DOCK_PLUG
android.intent.action.DIGITAL_AUDIO_DOCK_PLUG
android.intent.action.HDMI_AUDIO_PLUG
android.intent.action.USB_AUDIO_ACCESSORY_PLUG
android.intent.action.USB_AUDIO_DEVICE_PLUG

Change-Id: I7be41892a9c4e619ca3e1c892fad6f1f2714c74f
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2012-04-26 11:31:58 -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
Dianne Hackborn
c5bf758442 Update process importance documentation. 
Also be more direct about some of the wallpaper APIs.

Change-Id: I2112898c0cd4415d6c5fd47923de682d59b8291f
 2012-04-26 10:58:37 -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
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
Makoto Onuki
f307268cd5 Merge "Clearify javadoc on Phone.NORMALIZED_NUMBER." into jb-dev 2012-04-26 10:15:42 -07:00
satok
56502ac808 am 9b593a67: Merge "Fix the boundary of the sentence level spell check" into jb-dev 
* commit '9b593a67f1e93896af4ef1050e485fb84bd5dd4f':
  Fix the boundary of the sentence level spell check
 2012-04-26 08:14:37 -07:00