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

179202 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alan Viverette
d6ebb3a75e Remove null entries from constant state cache 
We insert null entries on cache miss, which can cause NPE on prune, but
we ought to remove these entries during prune.

BUG: 18842826
Change-Id: I9c0bca04f34575d1403de943abd8d12b18c9c032
 2015-01-05 11:09:29 -08:00
Geoff Mendal
3197c5da90 Merge "Import translations. DO NOT MERGE" 2015-01-05 18:57:14 +00:00
Brian Attwell
74f89e78b0 Unhid ChangeScroll 
ChangeScroll is already publicly usable via transition
xml files. This directly unhides the java class.

Bug: 18777272
Change-Id: I3b9982dc4ff3f4e8752b39ee6eb67b617073e2ff
 2015-01-05 18:48:49 +00:00
Geoff Mendal
17f49b2965 Import translations. DO NOT MERGE 
Change-Id: I59e489f098cbcce382f65632f3002a293e33b315
Auto-generated-cl: translation import
 2015-01-05 10:44:48 -08:00
Narayan Kamath
c82be5f27f am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release" 
automerge: b7974bd

* commit 'b7974bd31d06d439cb75f8a3a0ad032fa689c729':
  Race-condition in SoundPool during release
 2015-01-05 18:10:33 +00:00
Narayan Kamath
b7974bd31d am dd65a4f7: am ea4cdd44: Merge "Race-condition in SoundPool during release" 
* commit 'dd65a4f735a311fe60c065449e394974807ff297':
  Race-condition in SoundPool during release
 2015-01-05 18:08:06 +00:00
Narayan Kamath
dd65a4f735 am ea4cdd44: Merge "Race-condition in SoundPool during release" 
* commit 'ea4cdd44541d76adea9b0b185740796d6cf6ac64':
  Race-condition in SoundPool during release
 2015-01-05 18:02:32 +00:00
Narayan Kamath
ea4cdd4454 Merge "Race-condition in SoundPool during release" 2015-01-05 17:57:27 +00:00
Jason Monk
85eec267dd QS WiFi panel trigger settings on correct user 
Bug: 18900000
Change-Id: I67e234eb6300dd05f950f174107b6a28867af7a2
 2015-01-05 12:05:24 -05:00
Jason Monk
a199880a01 am cf28f9b8: am 4ae97d36: Post broadcasts to bg and cache bt state info 
automerge: 2858ca9

* commit '2858ca9e282b10afd67da73885e3a25e82e510a6':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:37:46 +00:00
Jason Monk
2858ca9e28 am cf28f9b8: am 4ae97d36: Post broadcasts to bg and cache bt state info 
* commit 'cf28f9b8830503605ff254a5ca8edd368e065a93':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:34:35 +00:00
Jason Monk
cf28f9b883 am 4ae97d36: Post broadcasts to bg and cache bt state info 
* commit '4ae97d3632edf4fd00fe23b9a2304e4e0f2348b7':
  Post broadcasts to bg and cache bt state info
 2015-01-05 16:29:20 +00:00
Jason Monk
4ae97d3632 Post broadcasts to bg and cache bt state info 
Add a background thread to post bt broadcasts to for processing.

Try to cache all bluetooth connection state info possible and pull
from broadcasts because requesting it too often may be locking up
devices.

Bug: 18771211
Change-Id: I2cf4852c935b2f471e735d953370e5d9e996c6f7
 2015-01-05 11:09:48 -05:00
Geoff Mendal
87439cb601 Merge "Import translations. DO NOT MERGE" 2015-01-05 14:47:58 +00:00
Geoff Mendal
d9c51a77db Merge "Import translations. DO NOT MERGE" 2015-01-05 14:47:03 +00:00
Geoff Mendal
5e1370cd62 Import translations. DO NOT MERGE 
Change-Id: I92a69ec4b6384998d842369bda0531a8c5ce7825
Auto-generated-cl: translation import
 2015-01-05 06:44:53 -08:00
Geoff Mendal
269cbab0cd Import translations. DO NOT MERGE 
Change-Id: I71ee9b0879e33e6fe00883877ee712a93f451357
Auto-generated-cl: translation import
 2015-01-05 06:43:14 -08:00
Geoff Mendal
0b07a8756c Merge "Import translations. DO NOT MERGE" 2015-01-05 14:34:12 +00:00