Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
245,038 Commits 3 Branches 0 Tags
7564159f75c3a17bf2cf75abd03804531579110a
Commit Graph

14842 Commits

Author SHA1 Message Date
Julia Reynolds
c3777caa71 Merge "Align radio buttons with app icon, change text color." into nyc-dev am: 1ff2412 
am: 87ea43b

* commit '87ea43b890ee6e207460763b6bf104048bf58ad3':
  Align radio buttons with app icon, change text color.

Change-Id: Ibfbab9183aa1cbffa6addb0a1c2b6b8807c4299f
 2016-04-20 21:16:18 +00:00
Julia Reynolds
515aa1def2 Merge "Animate volume dialog expansion/contraction." into nyc-dev am: e86ac2f 
am: f825573

* commit 'f825573e014cd4ed493410d97b6d6294dd669ad3':
  Animate volume dialog expansion/contraction.

Change-Id: I723d5f05b08519e2abb51b915ea638731ae42820
 2016-04-20 21:16:06 +00:00
Jason Monk
2ea96bcdd7 Merge "Daydream -> screen saver" into nyc-dev am: eeaaf26 
am: dbc5727

* commit 'dbc5727bcdfec0df685095a992edeb6895901129':
  Daydream -> screen saver

Change-Id: I447185a7319f9f2568ca5ee31ee624bd6450b2b9
 2016-04-20 21:12:10 +00:00
TreeHugger Robot
9acf1516eb Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev am: 9724fba 
am: 0627850

* commit '0627850430ba3dad041891de570e0d08e22c13d2':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: I278f8b4f8e29ea69b15e7bef9556c0ed0a81c82b
 2016-04-20 21:11:50 +00:00
Jason Monk
d25aa0697f Merge "Allow QS details to scroll when the screen is really small" into nyc-dev am: 10ea519 
am: 96282fb

* commit '96282fb962313f7b10d2811903d5a9e50a9549c5':
  Allow QS details to scroll when the screen is really small

Change-Id: Ia4c8a2f21b8cdd6e49bae06229bbaf1851261379
 2016-04-20 21:11:30 +00:00
Jason Monk
d34b7779a0 Merge "QS tile lifecycle management" into nyc-dev am: e59bbb0 
am: 518eb44

* commit '518eb44104efa360d7d7a8718d0eaaa3b8a07514':
  QS tile lifecycle management

Change-Id: If72193fd330be19438de969248e045c00be40ddc
 2016-04-20 21:09:54 +00:00
Julia Reynolds
87ea43b890 Merge "Align radio buttons with app icon, change text color." into nyc-dev 
am: 1ff2412

* commit '1ff2412cc49424ffe9594538618d063c1e0a6951':
  Align radio buttons with app icon, change text color.

Change-Id: I6b3cdbd36ee669a5fa32417cee14837258f7f6b8
 2016-04-20 19:14:36 +00:00
Julia Reynolds
f825573e01 Merge "Animate volume dialog expansion/contraction." into nyc-dev 
am: e86ac2f

* commit 'e86ac2f0da9ec71e9d990291053eec8f352af52d':
  Animate volume dialog expansion/contraction.

Change-Id: I7c08343c0400ca34031b5908adfee71f80adf5c9
 2016-04-20 19:14:35 +00:00
Julia Reynolds
1ff2412cc4 Merge "Align radio buttons with app icon, change text color." into nyc-dev 2016-04-20 19:10:12 +00:00
Julia Reynolds
e86ac2f0da Merge "Animate volume dialog expansion/contraction." into nyc-dev 2016-04-20 19:07:13 +00:00
Julia Reynolds
682d73fb3a Align radio buttons with app icon, change text color. 
Bug: 27597108
Change-Id: Id821b46b6f2898295ae711ec33f56fed1b529584
 2016-04-20 15:04:49 -04:00
Julia Reynolds
e80f67545d Animate volume dialog expansion/contraction. 
Bug: 28275874
Change-Id: I751addeb73e7354d3a2018be1ba08bf9b8378b95
 2016-04-20 14:58:47 -04:00
Jason Monk
dbc5727bcd Merge "Daydream -> screen saver" into nyc-dev 
am: eeaaf26

* commit 'eeaaf26805091cad0404bc6030dde38dd4b1edcc':
  Daydream -> screen saver

Change-Id: I090caed428e1137a4ecfe628abb1c2974c99c225
 2016-04-20 17:52:58 +00:00
Felipe Leme
0627850430 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev 
am: 9724fba

* commit '9724fba83545fd075cbda62bb13cdc7820c7291a':
  Added onRestrictBackgroundWhitelistChanged callback.

Change-Id: Ic8fdb634babafd5625be2a7c684334cca1cf0a3a
 2016-04-20 17:52:57 +00:00
Jason Monk
eeaaf26805 Merge "Daydream -> screen saver" into nyc-dev 2016-04-20 17:48:48 +00:00
TreeHugger Robot
9724fba835 Merge "Added onRestrictBackgroundWhitelistChanged callback." into nyc-dev 2016-04-20 17:44:56 +00:00
Jason Monk
427aa24be2 Daydream -> screen saver 
Change-Id: I604530a721797e6d4b28df3782303a79fabcdac7
Fixes: 28268243
 2016-04-20 13:44:05 -04:00
Jason Monk
96282fb962 Merge "Allow QS details to scroll when the screen is really small" into nyc-dev 
am: 10ea519

* commit '10ea519fa9dc31721dcf5974f423797cbbf8c80d':
  Allow QS details to scroll when the screen is really small

Change-Id: Ic4b2d01b78ede96bf0bee394c61670953d8403ba
 2016-04-20 17:38:50 +00:00
Jason Monk
10ea519fa9 Merge "Allow QS details to scroll when the screen is really small" into nyc-dev 2016-04-20 17:34:19 +00:00
Jason Monk
c4f80d217e Allow QS details to scroll when the screen is really small 
Change-Id: Ib28b6e9d888e864741c3ac472d30ef7cae06fe67
Fixes: 27276984
 2016-04-20 13:30:11 -04:00
Jason Monk
518eb44104 Merge "QS tile lifecycle management" into nyc-dev 
am: e59bbb0

* commit 'e59bbb0899e17710e9380b704141b100ddc2faa0':
  QS tile lifecycle management

Change-Id: I739df683b36689dbc58c784c6aa9447e28139ef5
 2016-04-20 17:16:10 +00:00
Jason Monk
e59bbb0899 Merge "QS tile lifecycle management" into nyc-dev 2016-04-20 17:09:01 +00:00
Jason Monk
29c93ce05d QS tile lifecycle management 
Ensure we send out the current QSService and Tile to the TileService
before we write to mWrapper allowing other commands to come through.

Change-Id: Ia3f470083d97d85fa726b1add3706db6278c7d1e
Fixes: 27871492
 2016-04-20 11:41:36 -04:00
Jason Monk
72053fd284 Merge "QS custom tiles - better handling of invalid icons" into nyc-dev 
am: e6be9c5

* commit 'e6be9c58cca6a523960553faf164398b0297089c':
  QS custom tiles - better handling of invalid icons

Change-Id: I6b976e5f3377012881b4eb4419c24f0bd6af9842
 2016-04-20 15:31:52 +00:00
Jason Monk
11939b159d Merge "QS custom tiles - better handling of invalid icons" into nyc-dev 
am: e6be9c5

* commit 'e6be9c58cca6a523960553faf164398b0297089c':
  QS custom tiles - better handling of invalid icons

Change-Id: Ic7438463e3e1d9961e511a8c5b810e6ab975ee50
 2016-04-20 15:31:51 +00:00
Jason Monk
e6be9c58cc Merge "QS custom tiles - better handling of invalid icons" into nyc-dev 2016-04-20 15:25:43 +00:00
Jason Monk
97b6ce8f73 Merge "Fix QS edit accessibility" into nyc-dev 
am: 01dbf41

* commit '01dbf41311ad24e8c6bcdddfd6720a12d6b30a74':
  Fix QS edit accessibility

Change-Id: Ic5beb92ee07c826c6cab66d099e9765a2f6cfcdd
 2016-04-20 15:22:32 +00:00
Jason Monk
67790d99ae Merge "Fix QS edit accessibility" into nyc-dev 
am: 01dbf41

* commit '01dbf41311ad24e8c6bcdddfd6720a12d6b30a74':
  Fix QS edit accessibility

Change-Id: I6a0006bb9f85a87282cc0aefc40759a56d8fae7b
 2016-04-20 15:22:30 +00:00
Jason Monk
4a906f9da6 QS custom tiles - better handling of invalid icons 
Change-Id: I7b174a078a9df840eb73def101d865a8d630db19
Fixes: 27871180
 2016-04-20 11:21:32 -04:00
Jason Monk
01dbf41311 Merge "Fix QS edit accessibility" into nyc-dev 2016-04-20 15:14:52 +00:00
Jason Monk
5665030500 Fix QS edit accessibility 
Change-Id: Ibce7bdf480751994b318cba3a9954365f0ed8786
Fixes: 28194074
 2016-04-20 11:10:23 -04:00
Jason Monk
410a288b12 Merge "Collapse QS panel after details if we expanded it before" into nyc-dev 
am: 6dde42f

* commit '6dde42f0ee2efe09a0021a6172f61d84800ad1c7':
  Collapse QS panel after details if we expanded it before

Change-Id: Id21c4d906b99e8602997ca9c9623c3ab2c3a22e8
 2016-04-20 14:30:30 +00:00
Jason Monk
10b21ec243 Merge "Collapse QS panel after details if we expanded it before" into nyc-dev 
am: 6dde42f

* commit '6dde42f0ee2efe09a0021a6172f61d84800ad1c7':
  Collapse QS panel after details if we expanded it before

Change-Id: I38d3445a9a53cee3edb21ccd218462ec9ec2b44c
 2016-04-20 14:30:30 +00:00
Jason Monk
9d675236b4 Merge "Update QS header to handle 320dp without overlapping" into nyc-dev 
am: d637903

* commit 'd637903fe683bd4cf7403ee69e3d59e55e382c29':
  Update QS header to handle 320dp without overlapping

Change-Id: I3620fc9aa411f499c704f684c4b40844e13ff486
 2016-04-20 14:30:27 +00:00
Jason Monk
f784dc4003 Merge "Update QS header to handle 320dp without overlapping" into nyc-dev 
am: d637903

* commit 'd637903fe683bd4cf7403ee69e3d59e55e382c29':
  Update QS header to handle 320dp without overlapping

Change-Id: I1fe29681d00767a60e017ba5fc0993b981718a7a
 2016-04-20 14:30:23 +00:00
Jason Monk
6dde42f0ee Merge "Collapse QS panel after details if we expanded it before" into nyc-dev 2016-04-20 14:25:24 +00:00
Jason Monk
85b866d5e4 Update QS header to handle 320dp without overlapping 
Change-Id: I7f52ed8aac14bea6c2cdc9a6ef8087ff6ef1b802
Fixes: 28181221
 2016-04-20 10:08:55 -04:00
Adrian Roos
6feefdab94 Merge "Don\'t do anti-falsing on locked shade" into nyc-dev 
am: c75e08d

* commit 'c75e08d114650dc4c81bc8ffb03eab701bc39509':
  Don't do anti-falsing on locked shade

Change-Id: I5092c5834e9faa4d022ed53f2acf0eda33829ac2
 2016-04-20 03:06:14 +00:00
Adrian Roos
a0ac7a13be Merge "Don\'t do anti-falsing on locked shade" into nyc-dev 
am: c75e08d

* commit 'c75e08d114650dc4c81bc8ffb03eab701bc39509':
  Don't do anti-falsing on locked shade

Change-Id: I9ebf97744dd18fda33fa1dcced6993bb93424c0a
 2016-04-20 03:06:14 +00:00
TreeHugger Robot
c75e08d114 Merge "Don't do anti-falsing on locked shade" into nyc-dev 2016-04-20 03:00:30 +00:00
Jorim Jaggi
52f3cea81e Merge "Fix wrong transition when recents is growing when entering" into nyc-dev 
am: 50c410c

* commit '50c410c1c91922e91fb8d1b873f6a541d1e2fd6c':
  Fix wrong transition when recents is growing when entering

Change-Id: I5583e72244d8997c6cdeec8d142bd1e69a7428e5
 2016-04-20 02:56:29 +00:00
Jorim Jaggi
6739100107 Merge "Fix wrong transition when recents is growing when entering" into nyc-dev 
am: 50c410c

* commit '50c410c1c91922e91fb8d1b873f6a541d1e2fd6c':
  Fix wrong transition when recents is growing when entering

Change-Id: I632e84aa2e35e33b8d4520525fb8885612706ac2
 2016-04-20 01:56:12 +00:00
TreeHugger Robot
50c410c1c9 Merge "Fix wrong transition when recents is growing when entering" into nyc-dev 2016-04-20 01:48:39 +00:00
Adrian Roos
c5d25509cb Merge "Fix NPE in WallpaperDrawable" into nyc-dev 
am: 75db039

* commit '75db0392b89a7f83650f087227bcccda32833cfa':
  Fix NPE in WallpaperDrawable

Change-Id: I2ab5f237ec31fd81ce0b3ff544b481d604bb9f97
 2016-04-20 01:31:49 +00:00
Adrian Roos
9068f1b117 Merge "Fix NPE in WallpaperDrawable" into nyc-dev 
am: 75db039

* commit '75db0392b89a7f83650f087227bcccda32833cfa':
  Fix NPE in WallpaperDrawable

Change-Id: I9bfca4c47e2f067e516f8b595a34ace9805fd469
 2016-04-20 01:31:09 +00:00
TreeHugger Robot
75db0392b8 Merge "Fix NPE in WallpaperDrawable" into nyc-dev 2016-04-20 01:27:35 +00:00
Adrian Roos
2f445c40f4 Merge "Disable anti-falsing logic with touch exploration" into nyc-dev 
am: ecdc5c4448

* commit 'ecdc5c44488cef2f1599b3759277c219cfd28da3':
  Disable anti-falsing logic with touch exploration

Change-Id: Ie106da3e66c0eb0d3f02318df1dbbc7e6c7775f7
 2016-04-20 00:41:34 +00:00
Adrian Roos
18cb744cb7 Merge "Disable anti-falsing logic with touch exploration" into nyc-dev 
am: ecdc5c4448

* commit 'ecdc5c44488cef2f1599b3759277c219cfd28da3':
  Disable anti-falsing logic with touch exploration

Change-Id: I28a04dfa863019a31398a18f9873bb81172bbbed
 2016-04-20 00:41:34 +00:00
Adrian Roos
ecdc5c4448 Merge "Disable anti-falsing logic with touch exploration" into nyc-dev 2016-04-20 00:38:06 +00:00
Adrian Roos
6a70b884df Don't do anti-falsing on locked shade 
The user has already passed the keyguard test by
dragging down. We're not doing anti falsing at this
point and doing it on the affordance was triggering
a crash on debuggable builds (and not working at all
on regular builds).

Change-Id: Icaf81e8e2a38503851c7b5699a0f5a3d363dac19
Fixes: 28154836
 2016-04-20 00:32:21 +00:00