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

179068 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
a609028451 Merge "Make DisplayListRenderer inherit from Canvas, merge JNI" 2015-01-05 23:31:30 +00:00
Tom Hudson
8dfaa49042 Make DisplayListRenderer inherit from Canvas, merge JNI 
Incrementally unify the upper layers for Skia and HWUI.
Remove redundant code from GLES20Canvas.java; instead
use inherited mNativeCanvasWrapper and superclass method
definitions.

Moves some unrelated SkPaint utility functions from Renderer
to new utils/PaintUtils.

bug: 15672762
Change-Id: I4ddd4214b8e9eeb95289d054ef423f2542bb5fa5
 2015-01-05 15:25:41 -08:00
Dianne Hackborn
5f86b66c9b am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
automerge: d17218e

* commit 'd17218e7df24da8a2bcf6e7714dc0151155c3286':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:16:42 +00:00
Dianne Hackborn
d17218e7df am 24bc8d76: am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
* commit '24bc8d761ae525f82dcaeee576ae238ab3a2de03':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:15:10 +00:00
Dianne Hackborn
24bc8d761a am 29807195: Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 
* commit '298071951210ae23c8023c4dc8f82da5d1760211':
  Fix issue #18901214: APR: Frequent crash in android
 2015-01-05 23:09:07 +00:00
Dianne Hackborn
2980719512 Merge "Fix issue #18901214: APR: Frequent crash in android" into lmp-mr1-dev 2015-01-05 23:03:48 +00:00
Filip Gruszczynski
2b37034c57 am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 
automerge: 62ab1ca

* commit '62ab1caa384fb17329891fbc24c959c7850e16c3':
  Add system api for disabling touch events in wallpaper behind the window.
 2015-01-05 22:59:09 +00:00
Filip Gruszczynski
62ab1caa38 am 8117eda6: am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 
* commit '8117eda6f18a4d388a12ab0af318c95b86280084':
  Add system api for disabling touch events in wallpaper behind the window.
 2015-01-05 22:56:09 +00:00
Filip Gruszczynski
8117eda6f1 am 8c6b59f4: Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 
* commit '8c6b59f46da3e65ce157fe40a08f1c1fbba3e1c2':
  Add system api for disabling touch events in wallpaper behind the window.
 2015-01-05 22:50:29 +00:00
Filip Gruszczynski
8c6b59f46d Merge "Add system api for disabling touch events in wallpaper behind the window." into lmp-mr1-dev 2015-01-05 22:46:14 +00:00
Dianne Hackborn
b182955a1e Fix issue #18901214: APR: Frequent crash in android 
The ShutdownActivity was implemented in the system server
code, which is no longer part of the boot class path.  This would
work fine when requesting a shutdown from the primary user, since
in that case the activity would be loaded in to the main system
process which also has the system service code loaded.

However, when executed from a secondary user, we need to spin up
a new system process for it; that system process is just a regular
app process, without the system service code, so *boom*.

To fix this, move ShutdownActivity to the framework jar.

Change-Id: Icb831cd6ed619da5feede5605c45ef177a892fbc
 2015-01-05 14:40:24 -08:00
Alan Viverette
8a3323adc8 am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev 
automerge: 4d41e49

* commit '4d41e49f39322ae5ceee375e515636e29ed2dfbc':
  Avoid double-translating View background
 2015-01-05 22:40:24 +00:00
Alan Viverette
4d41e49f39 am bde76419: am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev 
* commit 'bde76419c1c30aa574f8bc7b3f09f2029e080b83':
  Avoid double-translating View background
 2015-01-05 22:38:57 +00:00
Alan Viverette
bde76419c1 am 1f3f47b3: Merge "Avoid double-translating View background" into lmp-mr1-dev 
* commit '1f3f47b3680547dbb764db173e02d833e12d65a2':
  Avoid double-translating View background
 2015-01-05 22:32:10 +00:00
Alan Viverette
1f3f47b368 Merge "Avoid double-translating View background" into lmp-mr1-dev 2015-01-05 22:26:54 +00:00
Hui Shu
5895867801 am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 
automerge: 9bd1382

* commit '9bd1382f210732f406e497883dc8f4039f8d33d9':
  pm path needs to return 0 when it succeeds.
 2015-01-05 22:21:51 +00:00
Alan Viverette
b15703c9b4 Avoid double-translating View background 
Reverse-translate the canvas before passing to Drawable.draw() so that
we don't double-apply the drawable's translation.

BUG: 18904688
Change-Id: I8450de9b240ddeae887b4e1003c0608da814a001
 2015-01-05 14:20:42 -08:00
Hui Shu
9bd1382f21 am e5cb6a25: am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 
* commit 'e5cb6a253afa8faffb85c73779a78c74aead23ae':
  pm path needs to return 0 when it succeeds.
 2015-01-05 22:20:28 +00:00
Wale Ogunwale
62fbd4feb1 am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
automerge: b8e5139

* commit 'b8e51390af6015c1eaff7679546a5a7d2dfa701d':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:14:47 +00:00
Hui Shu
e5cb6a253a am bb845152: Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 
* commit 'bb8451521196ce493e8827fd50ab84f3c776931d':
  pm path needs to return 0 when it succeeds.
 2015-01-05 22:14:40 +00:00
Wale Ogunwale
b8e51390af am 170a678c: am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
* commit '170a678cd2b7073edd061765dabd4a754f562e60':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:12:28 +00:00
Hui Shu
bb84515211 Merge "pm path needs to return 0 when it succeeds." into lmp-mr1-dev 2015-01-05 22:07:16 +00:00
Wale Ogunwale
170a678cd2 am 1d893785: Merge "Don\'t restore persistent task to a stack until needed." into lmp-mr1-dev 
* commit '1d893785bdd8af210eab861653e3e7664c728897':
  Don't restore persistent task to a stack until needed.
 2015-01-05 22:06:43 +00:00
Wale Ogunwale
1d893785bd Merge "Don't restore persistent task to a stack until needed." into lmp-mr1-dev 2015-01-05 22:03:21 +00:00
Alan Viverette
7768fd2f8e am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 
automerge: 74882cb

* commit '74882cb0e3810ab1d77bc85a9ed1fa2b024a0159':
  Don't override dialog icon drawable unless valid resource ID was set
 2015-01-05 21:50:18 +00:00
Alan Viverette
74882cb0e3 am bf80d273: am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 
* commit 'bf80d2737fc59e8ae04875edddf1534c6a7739bc':
  Don't override dialog icon drawable unless valid resource ID was set
 2015-01-05 21:48:58 +00:00
Alan Viverette
bf80d2737f am 74890242: Merge "Don\'t override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 
* commit '748902420d26b2868296303be7df89d0c25b7f2b':
  Don't override dialog icon drawable unless valid resource ID was set
 2015-01-05 21:43:27 +00:00
Alan Viverette
748902420d Merge "Don't override dialog icon drawable unless valid resource ID was set" into lmp-mr1-dev 2015-01-05 21:39:13 +00:00
Jason Monk
afeb044afc resolved conflicts for merge of 336c4666 to master 
Change-Id: I350b3ecadce490b62c92c0e7b1d555825d035f87
 2015-01-05 16:37:46 -05:00
Jason Monk
1c1e115975 am 7662f6ea: am b142b755: Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 
automerge: 9ce34fd

* commit '9ce34fd0a8335a18873d345eec675c177adbdd06':
  QS WiFi panel trigger settings on correct user
 2015-01-05 21:21:58 +00:00
Jason Monk
336c46668d am ad7cf95c: am ee2e13e7: Merge "Don\'t unregister MobileSignalControllers still used" into lmp-mr1-dev 
* commit 'ad7cf95c604732b36cd4b0da394b48cfd3dba878':
  Don't unregister MobileSignalControllers still used
 2015-01-05 21:20:21 +00:00
Jason Monk
9ce34fd0a8 am 7662f6ea: am b142b755: Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 
* commit '7662f6ea8f7be5f090c6e7a4b7b686a6e5018426':
  QS WiFi panel trigger settings on correct user
 2015-01-05 21:20:16 +00:00
Jason Monk
ad7cf95c60 am ee2e13e7: Merge "Don\'t unregister MobileSignalControllers still used" into lmp-mr1-dev 
* commit 'ee2e13e75356fbef806dfb69ccf995d7f616f027':
  Don't unregister MobileSignalControllers still used
 2015-01-05 21:15:51 +00:00
Jason Monk
7662f6ea8f am b142b755: Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 
* commit 'b142b7552a6245606d93c43ce56ce81c700b3c09':
  QS WiFi panel trigger settings on correct user
 2015-01-05 21:15:46 +00:00
Jason Monk
ee2e13e753 Merge "Don't unregister MobileSignalControllers still used" into lmp-mr1-dev 2015-01-05 21:09:23 +00:00
Jason Monk
b142b7552a Merge "QS WiFi panel trigger settings on correct user" into lmp-mr1-dev 2015-01-05 21:09:05 +00:00
Filip Gruszczynski
fe56835934 Add system api for disabling touch events in wallpaper behind the window. 
Bug: 18721756
Change-Id: I40b749a9916536d52042e5dd49a23575bedad754
 2015-01-05 12:57:19 -08:00
Alan Viverette
5c2d8f7d51 Don't override dialog icon drawable unless valid resource ID was set 
Fixes a regression where Builder.setIcon(Drawable) would get overridden
even when Builder.setIcon(int) had never been called and was still 0.
Fixes attribute id to respect all valid resource IDs (e.g. non-zero).
Updates documentation to reflect the long-standing override behavior.

BUG: 18904762
Change-Id: I905703993a59910555d5a858e0aaecab63221a02
 2015-01-05 12:56:45 -08:00
Jason Monk
c014decc74 Don't unregister MobileSignalControllers still used 
Also add some more testing for this section of code that manages
when MobileSignalControllers are added/removed to make sure we
are all good.

Bug: 18728593
Change-Id: I9902854c54d2e1deb58b38b7bd97dac1617831c0
 2015-01-05 15:53:00 -05:00
Alan Viverette
a1d11273d3 am 154d251e: am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev 
automerge: 3f5f13d

* commit '3f5f13d7efb2756d5b9a2cc34c30ac23ced3947f':
  Fix selector bug
 2015-01-05 20:36:30 +00:00
Alan Viverette
3f5f13d7ef am 154d251e: am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev 
* commit '154d251ee61ad9c3d64b5c6db2d74806f4fd5782':
  Fix selector bug
 2015-01-05 20:34:08 +00:00
Alan Viverette
154d251ee6 am 22a3163f: Merge "Fix selector bug" into lmp-mr1-dev 
* commit '22a3163f1da8387e42c68c459f5667ac10744a3c':
  Fix selector bug
 2015-01-05 20:28:06 +00:00
Alan Viverette
22a3163f1d Merge "Fix selector bug" into lmp-mr1-dev 2015-01-05 20:23:47 +00:00
Alan Viverette
f35d2a0cb4 am db7eefbb: am dd508581: Use min when comparing AM and PM text lengths 
automerge: 97b2d18

* commit '97b2d185b655186664ce5402fbce37faaafddf1d':
  Use min when comparing AM and PM text lengths
 2015-01-05 20:14:32 +00:00
Alan Viverette
97b2d185b6 am db7eefbb: am dd508581: Use min when comparing AM and PM text lengths 
* commit 'db7eefbbfdc8c77c03b43fd58bcd461b8e52b20e':
  Use min when comparing AM and PM text lengths
 2015-01-05 20:11:57 +00:00
Alan Viverette
db7eefbbfd am dd508581: Use min when comparing AM and PM text lengths 
* commit 'dd508581216ef3ef47bd474316232f269db43f03':
  Use min when comparing AM and PM text lengths
 2015-01-05 20:06:32 +00:00
Jason Monk
cc538e0527 Merge "Show saved networks in QS sub-panel." 2015-01-05 19:56:52 +00:00
Jason Monk
e6fc4911e2 Show saved networks in QS sub-panel. 
Bug: 18365695
Change-Id: If32ea2e69c2100c706632ab1f90e2e99bbf230f6
 2015-01-05 14:33:26 -05:00
Alan Viverette
dd50858121 Use min when comparing AM and PM text lengths 
Also cleans up code a little to prevent unnecessary re-computation
of lower-cased strings and use final where possible.

BUG: 18874813
Change-Id: I852eb7a281aed64ac36e95f32f5fa410f50abfa4
 2015-01-05 11:28:12 -08:00
Alan Viverette
a850300fd5 Merge "Remove null entries from constant state cache" 2015-01-05 19:12:03 +00:00