Jason Monk
ae3288229a
resolve merge conflicts of bfe2580b24 to master
...
Test: I solemnly swear I tested this conflict resolution.
Change-Id: I26ac9227556280df5fdc73a59265370fe859ecb1
2017-09-05 14:56:30 -04:00
Jason Monk
88aa3d0f3e
Merge "Don't crash from null ServiceState in cdma" into oc-mr1-dev
2017-09-05 18:29:55 +00:00
Adrian Roos
27631fabde
Merge "AOD Policy: Fix pausing timeout to use minutes instead of seconds" into oc-mr1-dev am: 14506c8806
...
am: 69ce71a11c
2017-09-05 16:17:05 +00:00
Jason Monk
e153198367
Don't crash from null ServiceState in cdma
...
Test: runtest systemui
Change-Id: Ib9813af4896d90878df970ef798f3f09e6522f3a
Fixes: 65224543
2017-09-05 11:20:30 -04:00
Adrian Roos
c21891284b
AOD Policy: Fix pausing timeout to use minutes instead of seconds
...
Bug: 65010918
Change-Id: I2a5f3a2109a38d7093fd0ea84fbb1026eb6c1215
Test: On AOD cover prox for 10s. Verify screen turns off.
2017-09-05 09:15:27 +00:00
Adrian Roos
9c60823279
Merge "AOD: Keep brightness sensor registered while covered" into oc-mr1-dev am: 10070c6356
...
am: cd625c696a
2017-09-04 16:08:28 +00:00
Adrian Roos
a79ad59d49
AOD: Keep brightness sensor registered while covered
...
Keeps the brightness sensor registered even if proximity is near.
This allows the brightness sensor to react faster after coming out
of a pocket.
Also wait with unpausing AOD until the brightness sensor reports
a valid brightness again.
Bug: 65010918
Test: Cover prox sensor for 10s, verify with 'adb shell dumpsys sensorservice' that the binned brightness sensor is still registered.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenBrightnessTest.java
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
Change-Id: Ife1bb7399a7ad8a15b1f4d210bb38044cbe9d3ae
2017-09-01 15:53:42 +00:00
Lei Yu
b868891671
Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev am: 67594c6f54
...
am: 04e7d1fa20
2017-09-01 01:24:17 +00:00
Lei Yu
67594c6f54
Merge "Hook up AOD knobs to Settings.Global" into oc-mr1-dev
2017-09-01 00:54:01 +00:00
jackqdyulei
8443dd0e76
Hook up AOD knobs to Settings.Global
...
This cl creates AlwaysOnDisplayPolicy, which get values for the
following knobs(go/aod-experiments) from Settings.Global:
1. screen_brightness_array
2. dimming_scrim_array
3. prox_screen_off_delay
4. prox_cooldown_trigger
5. prox_cooldown_period
Also update code to make sure AlwaysOnDisplayPolicy is used
everywhere.
Bug: 64899561
Test: runtest -x AlwaysOnDisplayPolicyTest
Change-Id: I2e83ff980771e67177e4964bd83aa68b2bdca65f
2017-08-31 13:20:04 -07:00
Jason Monk
381855b8a5
Merge "Wrap all exceptions/crashes while plugins are active" into oc-mr1-dev am: 6bf3564040
...
am: c6af997d24
2017-08-31 19:32:00 +00:00
Jason Monk
6bf3564040
Merge "Wrap all exceptions/crashes while plugins are active" into oc-mr1-dev
2017-08-31 18:50:13 +00:00
Jason Monk
edb08277f0
Merge "Add bt battery level to QS icons" into oc-mr1-dev am: 984b76f62e
...
am: 1064389310
2017-08-31 17:28:44 +00:00
Jason Monk
1c3196398b
Wrap all exceptions/crashes while plugins are active
...
To help differentiate them from real crashes.
Test: install crashing plugin
Change-Id: I88d991ab8d86f71bcc7042012d4d84d8a9af19f3
Fixes: 64527191
2017-08-31 12:46:15 -04:00
TreeHugger Robot
984b76f62e
Merge "Add bt battery level to QS icons" into oc-mr1-dev
2017-08-31 16:36:57 +00:00
Jason Monk
3fd0b14fe6
Add bt battery level to QS icons
...
Test: visual
Change-Id: I690e496e3e88fd734d43ea2f25396772e922940c
Fixes: 63393322
2017-08-30 18:12:10 -04:00
Jason Monk
09c6caf028
Merge "Auto dim the nav bar to help prevent diff aging" into oc-mr1-dev am: b7e5a9da43
...
am: d141f306d2
2017-08-30 02:46:25 +00:00
Jason Monk
c2beef5130
Auto dim the nav bar to help prevent diff aging
...
Test: runtest systemui
Bug: 63630024
Change-Id: If2a6c0934f8751f82c027dbb3b5f103a34dc78d4
2017-08-29 18:58:00 -04:00
Selim Cinek
4f0a847a0d
Merge "Fixed a bug where notifications could be dimmable" into oc-mr1-dev am: 510cdad67b
...
am: a815dfb0fe
2017-08-25 02:36:12 +00:00
TreeHugger Robot
510cdad67b
Merge "Fixed a bug where notifications could be dimmable" into oc-mr1-dev
2017-08-25 02:07:15 +00:00
Lujiang Xue
82765d5f29
Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev am: 130d850614
...
am: ccc4e327be
2017-08-24 20:22:31 +00:00
Selim Cinek
8a9308d33c
Fixed a bug where notifications could be dimmable
...
Because of a delayed call, notifications could become
dimmed again after the unlock.
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayoutTest.java
Change-Id: I76e847cf6d3c8a34ca4b6dd16b1c8e13ddfe4993
Fixes: 64868746
2017-08-24 12:35:17 -07:00
TreeHugger Robot
130d850614
Merge "Add extensionController based on PackageManager FEATURE" into oc-mr1-dev
2017-08-24 19:33:53 +00:00
Lujiang Xue
bac4b7d1b1
Add extensionController based on PackageManager FEATURE
...
Bug: 64818339
Test: make and flash on 6P and headunit, verified in car mode the phone keep phone status bar, and on headunit, it use car status bar all the time
Change-Id: I6b3de99f4c21a50eb8521bf61f640f12cd6c3f02
2017-08-24 10:15:50 -07:00
Adrian Roos
b2fb182085
Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev am: 07168bf44b
...
am: b32f14c2e9
2017-08-23 17:49:15 +00:00
TreeHugger Robot
07168bf44b
Merge "AOD: Fix crash when AOD is stopped immediately after starting" into oc-mr1-dev
2017-08-23 17:12:27 +00:00
Adrian Roos
5502b8942f
AOD: Fix crash when AOD is stopped immediately after starting
...
Fixes an issue where the screen state was set after DozeService was already
destroyed, causing a crash.
Change-Id: I13ff590b62f905330ccb438692410e118b76c242
Fixes: 64907936
Test: runtest -x $ANDROID_BUILD_TOP/frameworks/base/packages/SystemUI/src/com/android/systemui/doze/DozeScreenState.java
2017-08-23 15:41:54 +02:00
Selim Cinek
ef89f578f2
Merge "Fixed a bug with decorated custom views" into oc-mr1-dev am: 9d41e8cd47
...
am: a7ea41c7d7
2017-08-23 00:06:29 +00:00
TreeHugger Robot
9d41e8cd47
Merge "Fixed a bug with decorated custom views" into oc-mr1-dev
2017-08-22 22:48:14 +00:00
Selim Cinek
fc8073c4b6
Fixed a bug with decorated custom views
...
Even if their layout still maches, the content was unrecoverably
destroyed, so we can't just reapply it anymore.
Fixes: 62911941
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/NotificationInflaterTest.java
Change-Id: I3a50c96484686958570ac5e4949df3ad4b8a421a
2017-08-22 14:58:59 -07:00
Bryan Eyler
980d88d9a7
Merge "Revert "Toggle user switcher in car QS footer.""
2017-08-17 18:41:30 +00:00
Winston Man
e602645d96
Merge "Hide subtitle for dialog from QS when applicable" into oc-mr1-dev am: 70b438cadf
...
am: 2a09f526d3
2017-08-17 18:27:07 +00:00
TreeHugger Robot
70b438cadf
Merge "Hide subtitle for dialog from QS when applicable" into oc-mr1-dev
2017-08-17 18:00:03 +00:00
Daniel Sandler
1b5b4a9b38
Merge changes from topic "revert-injectors" into oc-mr1-dev am: d33fe05c66
...
am: bb143bafe2
2017-08-17 14:50:53 +00:00
Daniel Sandler
d33fe05c66
Merge changes from topic "revert-injectors" into oc-mr1-dev
...
* changes:
Revert "Add API to allow apps more control over instantiation"
Revert "Add plugin to swap out recents"
2017-08-17 14:32:40 +00:00
Bryan Eyler
c55c29a2b8
Revert "Toggle user switcher in car QS footer."
...
This reverts commit df63d97e1a
2017-08-16 23:23:34 +00:00
Jason Monk
3f7868cc8e
Merge "Merge "Protect against weak pointer crash." into oc-mr1-dev am: 0480580696" into oc-mr1-dev-plus-aosp
...
am: 67d205c3ab
2017-08-16 20:40:40 +00:00
TreeHugger Robot
0480580696
Merge "Protect against weak pointer crash." into oc-mr1-dev
2017-08-16 16:29:03 +00:00
Lucas Dupin
450dd5baf3
Merge "Merge "Fix broken test" into oc-mr1-dev am: d8e7cb4b47" into oc-mr1-dev-plus-aosp
...
am: 7d19cf933d
2017-08-15 22:57:25 +00:00
TreeHugger Robot
d8e7cb4b47
Merge "Fix broken test" into oc-mr1-dev
2017-08-15 22:04:58 +00:00
Dan Sandler
f6e33b1b33
Revert "Add plugin to swap out recents"
...
This reverts commit 0ea67d82e3
2017-08-15 16:45:07 -04:00
Jason Monk
0f5d402c1e
Protect against weak pointer crash.
...
Because assuming GC won't run within any period of time is not a
valid testing strategy.
Test: runtest systemui
Change-Id: Id29ab777a70ca27b6ca33bd2a44cfb4c38f0fd09
Fixes: 64581449
2017-08-15 14:29:49 -04:00
Lucas Dupin
143c678bb5
Fix broken test
...
Change-Id: Iee80b8ec552f960dac08bfa062c128337eb22eff
Fixes: 64715967
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/colorextraction/SysuiColorExtractorTests.java
2017-08-15 11:28:23 -07:00
Winston Man
9aaa8cfc91
Hide subtitle for dialog from QS when applicable
...
- Always show device management subtitle
- Hide subtitle for others (vpn/network monitor/ca) if there is only 1
message
- Show subtitles if there are multiple messages
screen shots of a few combinations of conditions
device management + vpn
https://hsv.googleplex.com/5171127252942848
device management
https://hsv.googleplex.com/5156831890505728
vpn
https://hsv.googleplex.com/4788656657137664
ca + vpn
https://hsv.googleplex.com/6238262343499776
ca
https://hsv.googleplex.com/5725008114483200
ca + network log
https://hsv.googleplex.com/5145599846383616
network log
https://hsv.googleplex.com/5124533736439808
Bug: 64555046
Test: hard coded valued for each condition
Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/qs/QSSecurityFooterTest.java
Change-Id: Id9fcd8f0727eb2d40338c8c0d6530ab576f7b310
2017-08-15 19:18:32 +01:00
Jason Monk
931411e326
Merge "Fix race condition crash" into oc-mr1-dev am: 8170ea1b3c
...
am: f15a9b984a
2017-08-15 17:32:20 +00:00
TreeHugger Robot
8170ea1b3c
Merge "Fix race condition crash" into oc-mr1-dev
2017-08-15 16:43:24 +00:00
Jason Monk
9c4faa85f1
Fix race condition crash
...
1 line fix
Lots of lines for test
Test: runtest systemui
Change-Id: I90b006b5d9c02025ecc600c2f10014a96cbf33f8
Fixes: 62573587
2017-08-15 09:32:27 -04:00
Jason Monk
eb5600a2a0
Merge "Make sure network tests pass with airplane mode on" into oc-mr1-dev am: d35b6a7c26
...
am: 61d0fd0e70
2017-08-14 18:18:31 +00:00
Jason Monk
a3c3d850fb
Make sure network tests pass with airplane mode on
...
Test: runtest systemui
Change-Id: I0cc619d28b6802c0791c5880651ce1f91ea83f35
Fixes: 38023097
2017-08-14 11:04:42 -04:00
Adrian Roos
d727ae0aec
Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev am: 1cbfe74fc2 am: 63953ef041
...
am: 4b559a3b69
2017-08-12 00:48:47 +00:00
