Lucas Dupin
bd037eaedd
Merge "Conserve expansion after re-inflation" into pi-dev
...
am: 0eb2be3a67
2018-06-23 01:17:10 -07:00
TreeHugger Robot
0eb2be3a67
Merge "Conserve expansion after re-inflation" into pi-dev
2018-06-23 08:05:06 +00:00
Lucas Dupin
95951a341e
Conserve expansion after re-inflation
...
We were updating most of the PhoneStatusBarView state during
re-inflation but not the expansion and its fraction.
Test: Pull down shade, run: adb shell service call overlay 4 s16 "com.android.systemui.theme.dark" i32 1 i32 0
Test: Switch to guest user, switch back
Test: Reboot, look at status bar
Change-Id: I41669fb32419ad02a11586ba248a68b47d450413
Merged-In: I41669fb32419ad02a11586ba248a68b47d450413
Fixes: 110530608
Fixes: 110147405
Fixes: 79122419
2018-06-23 00:45:35 +00:00
Emilian Peev
8544a07eac
Merge "Camera: Update surface sharing format restrictions" into pi-dev
...
am: a749cd584e
2018-06-22 17:22:01 -07:00
TreeHugger Robot
a749cd584e
Merge "Camera: Update surface sharing format restrictions" into pi-dev
2018-06-23 00:11:04 +00:00
Kevin Hufnagle
b00ca4b456
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
...
am: d2aadbfd93
2018-06-22 15:50:04 -07:00
Kevin Hufnagle
d2aadbfd93
Merge "docs: Edited UNINSTALL_SHORTCUT permission desc." into pi-dev
2018-06-22 21:58:38 +00:00
Matthew Ng
1622ea15fe
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
...
am: 95b7c25a58
2018-06-22 12:36:26 -07:00
TreeHugger Robot
95b7c25a58
Merge "Allow quickscrub after deadzone consumes touch" into pi-dev
2018-06-22 19:24:08 +00:00
Andrii Kulian
e36941d4c5
Merge "Skip updating stack config if it is detached from a display" into pi-dev
...
am: 3a09ade4d1
2018-06-22 11:48:11 -07:00
Rebecca Silberstein
5f5f4788f1
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
...
am: cbf554b78b
2018-06-22 11:26:10 -07:00
Andrii Kulian
3a09ade4d1
Merge "Skip updating stack config if it is detached from a display" into pi-dev
2018-06-22 18:14:25 +00:00
TreeHugger Robot
cbf554b78b
Merge "SettingsBackupAgent: notify of apBand conversion" into pi-dev
2018-06-22 17:52:26 +00:00
Amin Shaikh
e6fb6d5ae6
Merge "Do not announce selected state for QS tiles." into pi-dev
...
am: bd62416618
2018-06-22 10:23:46 -07:00
TreeHugger Robot
bd62416618
Merge "Do not announce selected state for QS tiles." into pi-dev
2018-06-22 17:12:54 +00:00
Julia Reynolds
1424138d36
Merge "Remove managed profile toast" into pi-dev
...
am: 7f4e9739e4
2018-06-22 08:29:21 -07:00
TreeHugger Robot
7f4e9739e4
Merge "Remove managed profile toast" into pi-dev
2018-06-22 15:19:20 +00:00
Jack Yu
9fa40bd92d
Merge "Removed dead code in DcTracker" am: a0b9309ba2
...
am: 5ae46260e4
2018-06-21 20:39:13 -07:00
Jack Yu
5ae46260e4
Merge "Removed dead code in DcTracker"
...
am: a0b9309ba2
2018-06-21 20:28:45 -07:00
Treehugger Robot
a0b9309ba2
Merge "Removed dead code in DcTracker"
2018-06-22 00:21:43 +00:00
Neil Fuller
c7826490b4
[automerger skipped] Merge "Trim away some dead code" am: d6a1657466 -s ours
...
am: d85b36fde3
2018-06-21 16:20:34 -07:00
Neil Fuller
d85b36fde3
[automerger skipped] Merge "Trim away some dead code"
...
am: d6a1657466
2018-06-21 16:10:26 -07:00
Matthew Ng
472d3e4898
Allow quickscrub after deadzone consumes touch
...
Moved deadzone detection to QuickScrubController so that quick scrub can
still occur. If anything is consumed by deadzone, no other touches will
occur however quickscrub can be detected and function with launcher. No
other events except for touch down will be sent to launcher.
Test: scrub right above the home button
Change-Id: I4b4e7a8eacf8fe38d8644116a526c175adaba790
Fixes: 80536498
2018-06-21 15:09:21 -07:00
zhangkuili
4fe18f31d5
Merge "[Stability][hwui] check mmap return value" am: b352dcd153
...
am: 399ac24bdf
2018-06-21 15:04:48 -07:00
Evan Laird
2272f08724
Merge "Add config to disallow the battery % option" into pi-dev
...
am: a063da83f1
2018-06-21 14:56:57 -07:00
Jack Yu
2de4c6ca12
Removed dead code in DcTracker
...
This work is part of IWLAN refactoring
Test: Build
Bug: 73659459
Change-Id: I041bdda1e168dde0bf5bff08c8c235986d2d8d7d
2018-06-21 14:56:48 -07:00
zhangkuili
399ac24bdf
Merge "[Stability][hwui] check mmap return value"
...
am: b352dcd153
2018-06-21 14:53:15 -07:00
Julia Reynolds
1c76913f43
Merge "Catch unbinding errors" into oc-mr1-dev am: ebd047e92f
...
am: b2ad5f251c
2018-06-21 14:51:21 -07:00
TreeHugger Robot
a063da83f1
Merge "Add config to disallow the battery % option" into pi-dev
2018-06-21 21:18:36 +00:00
Julia Reynolds
b2ad5f251c
Merge "Catch unbinding errors" into oc-mr1-dev
...
am: ebd047e92f
2018-06-21 14:15:26 -07:00
TreeHugger Robot
ebd047e92f
Merge "Catch unbinding errors" into oc-mr1-dev
2018-06-21 21:00:27 +00:00
Selim Cinek
d3a10f5bfd
Merge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-dev
...
am: 43999195e9
2018-06-21 13:55:41 -07:00
Selim Cinek
43999195e9
Merge "Only enable setAntiBurnInOffsetX() in AOD(Ambient) condition" into pi-dev
2018-06-21 20:40:56 +00:00
Treehugger Robot
d6a1657466
Merge "Trim away some dead code"
2018-06-21 20:15:31 +00:00
Treehugger Robot
b352dcd153
Merge "[Stability][hwui] check mmap return value"
2018-06-21 20:13:36 +00:00
Julia Reynolds
3850aff60e
Merge "Always ignore summaries" into pi-dev
...
am: 1fa5751789
2018-06-21 12:12:57 -07:00
TreeHugger Robot
1fa5751789
Merge "Always ignore summaries" into pi-dev
2018-06-21 18:55:33 +00:00
Bill Yi
0502df2539
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: cba5f92768
2018-06-21 11:47:37 -07:00
Bill Yi
d24a2fd115
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 063ead3e1f
2018-06-21 11:46:05 -07:00
TreeHugger Robot
cba5f92768
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-06-21 18:35:27 +00:00
TreeHugger Robot
063ead3e1f
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-06-21 18:33:40 +00:00
Bill Yi
9e695b0fd4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: ebfd27503a
2018-06-21 11:29:30 -07:00
Tyler Gunn
d26a8a408e
Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers." into pi-dev
...
am: 766259698a
2018-06-21 11:26:49 -07:00
TreeHugger Robot
ebfd27503a
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-06-21 18:11:30 +00:00
Tyler Gunn
766259698a
Merge "Update docs and ensure PHONE_STATE is more predictable for unknown numbers." into pi-dev
2018-06-21 18:10:16 +00:00
Julia Reynolds
c9afb8ba06
Remove managed profile toast
...
Change-Id: I9f324a94d7fab35b0f00a1bd9c675708dac6f85a
Fixes: 110418889
Test: atest SystemUITests
2018-06-21 14:05:01 -04:00
Bill Yi
43b3e9731d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ia75664c86821774661b830e2fc6ed8ef0392f58c
2018-06-21 09:42:26 -07:00
Jorim Jaggi
926dd4739d
Merge "Fix issue with manual touch dispatch" into pi-dev
...
am: 0fb45603fe
2018-06-21 09:26:09 -07:00
TreeHugger Robot
0fb45603fe
Merge "Fix issue with manual touch dispatch" into pi-dev
2018-06-21 16:10:35 +00:00
Julia Reynolds
6b302d0afb
Always ignore summaries
...
Test: runtest systemui-notification
Bug: 78643290
Change-Id: Ia036e528666af336897431dd11efeffc92accdc7
(cherry picked from commit 760fa7613e
2018-06-21 16:09:55 +00:00
