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

18369 Commits

Author SHA1 Message Date
Jason Monk
3e946a212f am 17127a3c: am 184044e4: am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev 
* commit '17127a3cb603876223949f4475bdc94a2a782b85':
  Fix emergency only when no sims
 2015-07-24 05:15:15 +00:00
Julia Reynolds
a91a49bde2 am cf533d1c: am 969bc9f7: am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev 
* commit 'cf533d1cf75de224652e236546b4c78c89a7e1ae':
  Set 'the' media notification to the notification actually playing.
 2015-07-24 05:15:07 +00:00
Jorim Jaggi
b91f0febca am 48692f6e: am dd0b42d4: am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS 
* commit '48692f6e196ea0f39335509f84e43f3f414247d4':
  Make sure expandingFinished gets called when going into QS
 2015-07-24 05:15:00 +00:00
Adrian Roos
3a90f73fb1 am 9e80d470: am 6b32c53b: am 06913a53: am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev 
* commit '9e80d4703968efc47fb12fbbaadabd4df3a9b90b':
  Fix cut off charging indication in certain scripts
 2015-07-24 05:12:52 +00:00
Adrian Roos
155fe990a7 am b6527cd6: am 32e8de05: am 81c6a311: am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev 
* commit 'b6527cd6e85282f5fe93b0d898cc691437845e1d':
  Protect demo mode commands with permission
 2015-07-24 05:12:10 +00:00
Chris Wren
26ed7e6dfa am 3a66153f: am 99547e49: am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit '3a66153f2a8185d0a4ca0de23c70cd81178e0eea':
  Don't crash sysui when advisory calls fail.
 2015-07-24 05:11:16 +00:00
Jason Monk
180dff0bae am bb8b0368: am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'bb8b0368c5b4ddf5cbf3cb5c0c9bbe9027bc617b':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 05:10:01 +00:00
Jason Monk
17127a3cb6 am 184044e4: am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev 
* commit '184044e499a36297e01ce6d3bd55b7c9026be178':
  Fix emergency only when no sims
 2015-07-24 04:05:42 +00:00
Julia Reynolds
cf533d1cf7 am 969bc9f7: am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev 
* commit '969bc9f7da19cb429ca850fe6205a9a9b48e1c6d':
  Set 'the' media notification to the notification actually playing.
 2015-07-24 04:05:35 +00:00
Jorim Jaggi
48692f6e19 am dd0b42d4: am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS 
* commit 'dd0b42d42dab9b0f48719d56d69f47a2e7a3f8cd':
  Make sure expandingFinished gets called when going into QS
 2015-07-24 04:05:29 +00:00
Adrian Roos
9e80d47039 am 6b32c53b: am 06913a53: am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev 
* commit '6b32c53bcf45239dd5c81d2e48b50e1379294897':
  Fix cut off charging indication in certain scripts
 2015-07-24 04:03:40 +00:00
Adrian Roos
b6527cd6e8 am 32e8de05: am 81c6a311: am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev 
* commit '32e8de05fc6b891f99f6e7d893c506fdaeab9dbc':
  Protect demo mode commands with permission
 2015-07-24 04:02:56 +00:00
Chris Wren
3a66153f2a am 99547e49: am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit '99547e494a832d2b9d87ce13573150495e6ba3f8':
  Don't crash sysui when advisory calls fail.
 2015-07-24 04:02:17 +00:00
Jason Monk
bb8b0368c5 am dea13a96: am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'dea13a962356e54881c3924fc07c1aed97a97f46':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 04:01:38 +00:00
Jason Monk
184044e499 am 42caf399: am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev 
* commit '42caf39947e9f90834deb1aba251ee45c85d6045':
  Fix emergency only when no sims
 2015-07-24 03:38:09 +00:00
Julia Reynolds
969bc9f7da am 0aea721d: am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev 
* commit '0aea721db2663e658b074a8374d8e17f29deb38c':
  Set 'the' media notification to the notification actually playing.
 2015-07-24 03:38:03 +00:00
Jorim Jaggi
dd0b42d42d am c7dea8b3: am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS 
* commit 'c7dea8b38fd35779776156dd59b1631aca4e02fe':
  Make sure expandingFinished gets called when going into QS
 2015-07-24 03:37:54 +00:00
Adrian Roos
6b32c53bcf am 06913a53: am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev 
* commit '06913a539b80b0a93b34dc4befad9ea30eb82cdb':
  Fix cut off charging indication in certain scripts
 2015-07-24 03:36:23 +00:00
Adrian Roos
32e8de05fc am 81c6a311: am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev 
* commit '81c6a311fd2e6c5326a85deb638af7f861e7605c':
  Protect demo mode commands with permission
 2015-07-24 03:35:51 +00:00
Chris Wren
99547e494a am b86df334: am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit 'b86df334f778eecbf4beaaa9127e7e523e55fb6c':
  Don't crash sysui when advisory calls fail.
 2015-07-24 03:35:13 +00:00
Jason Monk
dea13a9623 am c063146f: am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit 'c063146fb2de35908183a52b2ff50934ad40c653':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 03:34:32 +00:00
Jason Monk
42caf39947 am e648ccbb: am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev 
* commit 'e648ccbbf79924316cbf1da328e83cf23cd1de72':
  Fix emergency only when no sims
 2015-07-24 03:10:23 +00:00
Julia Reynolds
0aea721db2 am 9bef274c: am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev 
* commit '9bef274ce9a00bcbc693c933dc3806b5ea36f44b':
  Set 'the' media notification to the notification actually playing.
 2015-07-24 03:10:00 +00:00
Jorim Jaggi
c7dea8b38f am 9c956384: am 1d071ce9: Make sure expandingFinished gets called when going into QS 
* commit '9c95638495ce1f3600b6c8a3169433b99d7f2575':
  Make sure expandingFinished gets called when going into QS
 2015-07-24 03:08:48 +00:00
Adrian Roos
06913a539b am a9777e47: am f2170644: Merge "Fix cut off charging indication in certain scripts" into mnc-dev 
* commit 'a9777e47848c7664472719086eb2696b7fbab8a9':
  Fix cut off charging indication in certain scripts
 2015-07-24 03:07:16 +00:00
Adrian Roos
81c6a311fd am 6857305f: am 7748ea5f: Merge "Protect demo mode commands with permission" into mnc-dev 
* commit '6857305f9112b62527f1432f88812f9149492a62':
  Protect demo mode commands with permission
 2015-07-24 03:06:45 +00:00
Chris Wren
b86df334f7 am e6deaca6: am db2b4ba6: Merge "Don\'t crash sysui when advisory calls fail." into mnc-dev 
* commit 'e6deaca693c530f7cc3298efc2c53849b9e6cd01':
  Don't crash sysui when advisory calls fail.
 2015-07-24 03:06:09 +00:00
Jason Monk
c063146fb2 am 72548325: am 4fc1b707: Merge changes from topic \'TunerLoc\' into mnc-dev 
* commit '72548325019cc168a5d98fe7de93dc9ee679a4b7':
  Add metrics to tuner
  Move tuner enable point to QS
 2015-07-24 03:05:33 +00:00
Steve McKay
d13f3c9742 Grid item fixups. 
Use margin instead of padding (so clicks on empty space don't do unexpected things).
Make background of items white.

Change-Id: I98996c90276911535b7addad1aad4a3c9ca47156
 2015-07-23 18:39:54 -07:00
Steve McKay
1dfc482cc0 Allow Files app to be enabled via overlay. 
Actual changes to Andromeda overlay are in: http://ag/733602/

Change-Id: Iad5a4cb2d087d574613ba6e9c9c9c69bd8611e8c
 2015-07-23 16:41:31 -07:00
Benjamin Franz
c36f6c4249 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-07-23 22:11:45 +00:00
Adrian Roos
3ad8a7840b am a1d61552: am 2f1220c4: am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit 'a1d61552f99bfa4720bf3f51d10adfe2b16c5dc6':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 22:07:58 +00:00
Jason Monk
383749d97b am 85ce138d: am 1a2f8f7c: am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '85ce138d5e7555df0aa95541f09f776c28fd3860':
  Fix blank tiles on QS rotate
 2015-07-23 22:07:11 +00:00
Jason Monk
b734e4a84b am d621727d: am 76d79fb0: am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'd621727d0b785a69dda64ff6f87f52b3aea6014e':
  Fix crash in NetworkControllerImpl
 2015-07-23 22:07:04 +00:00
Jorim Jaggi
ffbc117229 am f30c5f56: am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'f30c5f56187fed6452d557a44df8b63d8eb130a2':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 22:06:29 +00:00
Adrian Roos
a1d61552f9 am 2f1220c4: am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '2f1220c419492825fd0d1b47f77b36d10afea6a7':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 21:50:01 +00:00
Jason Monk
85ce138d5e am 1a2f8f7c: am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '1a2f8f7c117c9b2377827a73043928b9d86eb550':
  Fix blank tiles on QS rotate
 2015-07-23 21:49:22 +00:00
Jason Monk
d621727d0b am 76d79fb0: am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit '76d79fb097c2cb0731c67457f3f0cd72237c01e8':
  Fix crash in NetworkControllerImpl
 2015-07-23 21:49:13 +00:00
Jorim Jaggi
f30c5f5618 am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 21:48:48 +00:00
Steve McKay
73610b37de Include padding in calculation of column count. 
Also rename background color and don't sepcify background in grid items.

Change-Id: I4b565604156864384626e75f0bfd41c98623f90a
 2015-07-23 14:47:58 -07:00
Jason Monk
e648ccbbf7 am 157ad64d: Merge "Fix emergency only when no sims" into mnc-dev 
* commit '157ad64dbeedd43a444d3eb1cc538ee975ed2d59':
  Fix emergency only when no sims
 2015-07-23 20:36:16 +00:00
Jason Monk
157ad64dbe Merge "Fix emergency only when no sims" into mnc-dev 2015-07-23 20:24:32 +00:00
Julia Reynolds
9bef274ce9 am c2df1ab4: Merge "Set \'the\' media notification to the notification actually playing." into mnc-dev 
* commit 'c2df1ab48d4d12fc0e1f68fe6b5cc505e681b9f4':
  Set 'the' media notification to the notification actually playing.
 2015-07-23 20:19:59 +00:00
Julia Reynolds
c2df1ab48d Merge "Set 'the' media notification to the notification actually playing." into mnc-dev 2015-07-23 20:08:33 +00:00
Adrian Roos
2f1220c419 am 2237c32f: am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '2237c32fe1dfcd13056970ff987ee92326aee5c1':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:48:51 +00:00
Jason Monk
1a2f8f7c11 am 3260194f: am 1df7e135: am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '3260194f206e90508b01d2fc0187516c940fbd0c':
  Fix blank tiles on QS rotate
 2015-07-23 19:48:13 +00:00
Jason Monk
76d79fb097 am f91bc870: am 67091f46: am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'f91bc8709f95d8a69d9b95fadf9066eff6223a7d':
  Fix crash in NetworkControllerImpl
 2015-07-23 19:48:06 +00:00
Jorim Jaggi
93a25f77bb am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit 'fba926118ed7d5465cb6e7b64d29153212f7cbee':
  Add callback to voice interaction session for lockscreen shown
 2015-07-23 19:47:40 +00:00
Jorim Jaggi
9c95638495 am 1d071ce9: Make sure expandingFinished gets called when going into QS 
* commit '1d071ce9b1810fbcf231fd17c4cb5621e68ff419':
  Make sure expandingFinished gets called when going into QS
 2015-07-23 19:32:37 +00:00
Adrian Roos
2237c32fe1 am 58adc7ad: Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 
* commit '58adc7ad48990f2ffa0d4858bd6910dd9eb6aabc':
  Send BATTERY_CHANGED if maxChargingCurrent changes
 2015-07-23 19:21:24 +00:00