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

75581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ben Murdoch
3d8678f8b1 am c6911d47: Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev 
* commit 'c6911d47d193d76a40938f56854ca06c00edab68':
  Create WebViewDatabaseClassic from WebViewDatabase.
 2012-04-27 01:42:43 -07:00
Ben Murdoch
c6911d47d1 Merge "Create WebViewDatabaseClassic from WebViewDatabase." into jb-dev 2012-04-27 01:39:59 -07:00
Pannag Sanketi
014ad99997 am b33c34cc: Merge "Resolving the black screen / crash in effects" into jb-dev 
* commit 'b33c34cc25263647e0270ab92cb7fdb5af79416c':
  Resolving the black screen / crash in effects
 2012-04-26 22:35:41 -07:00
Pannag Sanketi
b33c34cc25 Merge "Resolving the black screen / crash in effects" into jb-dev 2012-04-26 22:34:03 -07:00
Dianne Hackborn
de5c3359a6 am 73214f61: Merge "Fix launcher icon size for tvdpi." into jb-dev 
* commit '73214f619a824cf724ab8f60d8fc992aed6a70a6':
  Fix launcher icon size for tvdpi.
 2012-04-26 19:35:09 -07:00
Dianne Hackborn
73214f619a Merge "Fix launcher icon size for tvdpi." into jb-dev 2012-04-26 19:33:37 -07:00
Dianne Hackborn
4883d755eb am 493f74e5: Merge "Add new Activity.finishAffinity() method." into jb-dev 
* commit '493f74e5a4ed948a72575d11840a8366b5e9f672':
  Add new Activity.finishAffinity() method.
 2012-04-26 19:27:49 -07:00
Dianne Hackborn
493f74e5a4 Merge "Add new Activity.finishAffinity() method." into jb-dev 2012-04-26 19:25:41 -07:00
Dianne Hackborn
d0356a19c1 Fix launcher icon size for tvdpi. 
We didn't have a case for tvdpi, so ended up in the default
scaling.  This resulting in us using 319 instead of 320.

Fixed the default case to round, and added explicit cases
for tvdpi since this is a standard density.

Change-Id: I752b924e1556af94682428c8c0ed7c75d15ac4a4
 2012-04-26 19:03:12 -07:00
Dianne Hackborn
ecc5a9cca0 Add new Activity.finishAffinity() method. 
It's cool!

Change-Id: I9fdcd9535b7f1ca2b311d3a1b23e5d058977b095
 2012-04-26 18:56:09 -07:00
Adam Cohen
ac856e75c6 am e6eb9291: Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev 
* commit 'e6eb9291423988e4f2e82367d760490397222fe3':
  Fix NPE in RemoteViews (issue 6408103)
 2012-04-26 18:46:51 -07:00
Adam Cohen
e6eb929142 Merge "Fix NPE in RemoteViews (issue 6408103)" into jb-dev 2012-04-26 18:45:18 -07:00
Adam Cohen
c431c156bb Fix NPE in RemoteViews (issue 6408103) 
Change-Id: I3e7ff2941b721c2c0c5c4e7d598df794b105c391
 2012-04-26 18:42:17 -07:00
Yu Shan Emily Lau
abb7bf4ff8 am f18222da: Merge "Fix the test cases which fail to launch the camera in the device which only has one camera." into jb-dev 
* commit 'f18222da3cdfd3b052361369b70a4d22396039c1':
  Fix the test cases which fail to launch the camera in the device which only has one camera.
 2012-04-26 17:31:11 -07:00
Yu Shan Emily Lau
f18222da3c Merge "Fix the test cases which fail to launch the camera in the device which only has one camera." into jb-dev 2012-04-26 17:29:15 -07:00
Yu Shan Emily Lau
e35b3e052d Fix the test cases which fail to launch the camera 
in the device which only has one camera.

Change-Id: Ia34087715e49f1aa3e86f3f85cb4e77168323321
 2012-04-26 17:10:29 -07:00
Makoto Onuki
8316e51c45 am ccdf0afb: Merge "Update streamitems javadoc" into jb-dev 
* commit 'ccdf0afbd7dbd4fe2111e94d9e4f14a939ed8882':
  Update streamitems javadoc
 2012-04-26 15:49:06 -07:00
Makoto Onuki
ccdf0afbd7 Merge "Update streamitems javadoc" into jb-dev 2012-04-26 15:47:35 -07:00
Pannag Sanketi
2f708ce9cc Resolving the black screen / crash in effects 
b:/6278826
The SurfaceTextureTarget Filter was not unregistering the surface
on closing leading to crashes and blank screens.

Change-Id: Ia9f6fc69b92d5a5e2e1e3803969152d11528aa3d
 2012-04-26 15:46:17 -07:00
Makoto Onuki
46891a8f1c Update streamitems javadoc 
ACCOUNT_TYPE and ACCOUNT_NAME query parameters were required in API level 15.
We've removed the check for JB, but in order to keep compatibility with HC
apps still need to add those parameters.

Bug 5135278

Change-Id: Ib9b9751c9017c53905047045816a44c5a279fa64
 2012-04-26 15:41:48 -07:00
Adam Cohen
db4a8fc619 am 2938ac3f: Merge "Enabling RemoteViews to have a landscape and portrait layout" into jb-dev 
* commit '2938ac3f9fa8d2a8031a6b4bac4d4beb97f99e06':
  Enabling RemoteViews to have a landscape and portrait layout
 2012-04-26 15:37:03 -07:00
Adam Cohen
2938ac3f9f Merge "Enabling RemoteViews to have a landscape and portrait layout" into jb-dev 2012-04-26 15:35:13 -07:00
Amith Yamasani
a5dd37cdb6 am 7a4be122: Merge "Add some missing getters for XML/Java API consistency." into jb-dev 
* commit '7a4be122cd0073240122b9f9badc78df677ea791':
  Add some missing getters for XML/Java API consistency.
 2012-04-26 15:32:20 -07:00
Amith Yamasani
7a4be122cd Merge "Add some missing getters for XML/Java API consistency." into jb-dev 2012-04-26 15:28:52 -07:00
Eric Fischer
d09fab85c4 am 16fb5d44: Merge "Import translations. DO NOT MERGE" into jb-dev 
* commit '16fb5d444cea1c978257807910b96d4e47b78dce':
  Import translations. DO NOT MERGE
 2012-04-26 15:28:48 -07:00
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
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
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
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
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