Commit Graph

778 Commits

Author SHA1 Message Date
Jason Monk
3f7868cc8e Merge "Merge "Protect against weak pointer crash." into oc-mr1-dev am: 0480580696" into oc-mr1-dev-plus-aosp
am: 67d205c3ab

Change-Id: I7989438ced94e356ed355461d03192ef668cd9a8
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

Change-Id: I2321cc45dfbfc512658fe9906a3a65e67fd9c165
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
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
Jason Monk
931411e326 Merge "Fix race condition crash" into oc-mr1-dev am: 8170ea1b3c
am: f15a9b984a

Change-Id: I0720e0244e40db6fa42a6f885d21279a7eb90cd7
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

Change-Id: I42d0157d6d3d7371cb2b9fa5d18e1d3deacf2b6e
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

Change-Id: I7d319fa53fddc2f5386410cda6e8f25fc01f8d1b
2017-08-12 00:48:47 +00:00
Jason Monk
d86c4d3cee Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev am: 84626a4e3d am: 577e6bebd0
am: 6720da43f9

Change-Id: I93d70a5a32428912017f3643f1fe80dea48fafaa
2017-08-12 00:18:12 +00:00
Adrian Roos
63953ef041 Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev
am: 1cbfe74fc2

Change-Id: I6b5c4ce303455e592ecb0e6c6bfcd238fbd8a7ef
2017-08-11 23:54:50 +00:00
TreeHugger Robot
1cbfe74fc2 Merge "AOD: Fix navbar flicker when transitioning to AOD" into oc-dr1-dev 2017-08-11 23:43:11 +00:00
Jason Monk
577e6bebd0 Merge "Change default temp threshold to use shutdown temp" into oc-dr1-dev
am: 84626a4e3d

Change-Id: I4c3c5be04aaa1eee409ea706b387370cedf5b15b
2017-08-11 22:29:00 +00:00
Adrian Roos
8db9311cb6 AOD: Fix navbar flicker when transitioning to AOD
Under certain circumstances, the transition to AOD can happen before
the navigation bar gets a chance to hide itself, which happens in a
traversal. To work around this, post turning the screen on such that
it only happens after the next traversal.

Change-Id: I178b9394e7cc6baa8e9552c9819c3ce9b044defb
Fixes: 64599221
Test: Open Whatsapp / Gmail, turn off screen, verify navbar does not flicker.
2017-08-11 14:29:35 -07:00
Jason Monk
d819c31050 Change default temp threshold to use shutdown temp
Base the temp threshold to be based on the shutdown temp lowered
by some amount to ensure the warning can be seen before a shutdown.

Test: runtest systemui
Change-Id: I033a776e874d76018592954932ed5127e1b228ae
Fixes: 62845934
2017-08-11 14:44:51 -04:00
phweiss
ae76c77780 Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS
This fixes the bug where different dialogs can appear
over the ambient screen or the Recent Apps screen.

Bug: 63286397
Test: manual, runtest systemui
Change-Id: I86d0cdd3d30e0ea8cbdae2dc220e1f988cf6decb
(cherry picked from commit 679dc2492c)
2017-08-11 10:38:19 +00:00
Philipp Weiß
572a5618b0 Merge "Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS" 2017-08-11 10:21:51 +00:00
Beverly
b562da526e Merge "Low battery notification has unique sound." into oc-mr1-dev am: 9ac6be4a66
am: ec3481b55d

Change-Id: Ic6feb4f79f2d9a7fb3334333cf54b75e616ec548
2017-08-10 18:03:39 +00:00
phweiss
679dc2492c Dismiss SystemUIDialogs on ACTION_CLOSE_SYSTEM_DIALOGS
This fixes the bug where different dialogs can appear
over the ambient screen or the Recent Apps screen.

Bug: 63286397
Test: manual, runtest systemui
Change-Id: I86d0cdd3d30e0ea8cbdae2dc220e1f988cf6decb
2017-08-10 18:06:03 +02:00
Beverly
334bc5fc77 Low battery notification has unique sound.
Change-Id: I51c8e099da04d4bf1a55d081c9fce7fc8fb90bd1
Fixes: 63853037
Test: runtest systemui
2017-08-09 16:57:28 -04:00
Jason Monk
99bdda6384 Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev am: a083c8f83a am: 0a19be5607
am: 67cd788e92

Change-Id: Ic2c28cbda4e096ab4a67a6313ac96d90a329b31b
2017-08-04 18:04:35 +00:00
Jason Monk
0a19be5607 Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev
am: a083c8f83a

Change-Id: I472011ba027b2d6b363807cee098e6114c231d38
2017-08-04 17:38:34 +00:00
TreeHugger Robot
a083c8f83a Merge "Make NearestTouchFrameTest run on more device configurations" into oc-dr1-dev 2017-08-04 17:26:55 +00:00
Jason Monk
e57e9dcadf Make NearestTouchFrameTest run on more device configurations
Test: runtest systemui
Change-Id: Ied095c1e884d1ca95531e2f4e182f1d1bcaaeb35
Fixes: 64339927
2017-08-04 10:59:13 -04:00
Adrian Roos
2d2cc33d17 Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev am: 6583c37a1b am: 243edb8950
am: df4ca778d1

Change-Id: Ieb86a5d6b45462f60f05028246f205914215ea4e
2017-08-04 14:37:49 +00:00
Adrian Roos
243edb8950 Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev
am: 6583c37a1b

Change-Id: I6c5fd9d65202fd9b7f2c784d84e5b2dbbff7b6d2
2017-08-04 14:13:47 +00:00
Adrian Roos
6583c37a1b Merge "AsyncSensorManager: Fix unregistration bug" into oc-dr1-dev 2017-08-04 13:59:33 +00:00
Adrian Roos
4c29e72d23 Merge changes I901908d9,Iac9835ad into oc-dr1-dev am: 47aac56746 am: 7f5805d0aa
am: 49cd5e2caa

Change-Id: I67edc32cd5ef4bd194072fb2a3c4fd44b247083d
2017-08-04 13:55:14 +00:00
Adrian Roos
49cd5e2caa Merge changes I901908d9,Iac9835ad into oc-dr1-dev am: 47aac56746
am: 7f5805d0aa

Change-Id: Iba30c1811f16ed01194755cd59b8c78af156eb9c
2017-08-04 13:43:10 +00:00
Adrian Roos
e2038e5709 Merge changes I901908d9,Iac9835ad into oc-dr1-dev
am: 47aac56746

Change-Id: I6e90dd7720b41c22bd7f87114e3854d028be0346
2017-08-04 13:31:17 +00:00
Adrian Roos
47aac56746 Merge changes I901908d9,Iac9835ad into oc-dr1-dev
* changes:
  AOD: Fix RemoteInput from dozing
  AOD: Fix janky launch transition from AOD2
2017-08-04 13:20:02 +00:00
Adrian Roos
b1f77247c2 AsyncSensorManager: Fix unregistration bug
Fixes an issue where unregistering a listener without specifying a sensor did
not work correctly; when passing null as the sensor, SensorManager.unregisterListener
silently ignores the call; instead, we now call the proper variant if given a null
sensor.

Change-Id: Iac362d8d6ae966308578cb4f177bd37af10b81a2
Fixes: 64357270
Test: runtest -x $T/frameworks/base/packages/SystemUI/tests/src/com/android/systemui/util/AsyncSensorManagerTest.java
2017-08-04 13:17:44 +02:00
Adrian Roos
337ad8bf8b Merge "AOD: Add support for dimming in software" into oc-dr1-dev am: b2107c9b56 am: 5658d14b81
am: 53ac91d8ce

Change-Id: Id6b933cf846949be953eb46558f1792453e0bee7
2017-08-04 10:13:10 +00:00
Adrian Roos
53ac91d8ce Merge "AOD: Add support for dimming in software" into oc-dr1-dev am: b2107c9b56
am: 5658d14b81

Change-Id: If5d22e92e86acdd96f881048bfa25af1c4e3bbe5
2017-08-04 10:02:55 +00:00
Adrian Roos
33fa840298 Merge "AOD: Add support for dimming in software" into oc-dr1-dev
am: b2107c9b56

Change-Id: Ic3cf031a067ae6221ae9e8fb3acdcd1625dfa7bc
2017-08-04 09:52:31 +00:00
Adrian Roos
6d5ebb7b70 AOD: Fix janky launch transition from AOD2
Fixes the transition that happens when when a notification is launched
from AOD2 and the keyguard can be unlocked without going through the
bouncer.

Change-Id: Iac9835ade42be4ecf02ee7430cf76d05fc006361
Fixes: 64164248
Test: Disable lockscreen security, turn off phone, receive SMS, double tap; verify no jank
2017-08-04 11:45:58 +02:00
Adrian Roos
c8e29e7886 AOD: Add support for dimming in software
Some devices cannot dim low enough in hardware in low power states.
To work around that, keep the front scrim at higher opacity when needed
to simulate lower brightness.

Bug: 63995944
Test: Configure scrim in config.xml; use device in very dim light at night, observe AOD is sufficiently dim.
Change-Id: I92fffedeea89b9327d76dfb184c5c761364ead11
2017-08-03 20:14:31 +02:00
Beverly
26cb61cf7f Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev am: 6407874ae0 am: 7084e59bae
am: 1fcc58f4ea

Change-Id: I2673fda0411ca93b4ef0813addf102831d3be44e
2017-08-02 19:01:29 +00:00
Beverly
7084e59bae Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev
am: 6407874ae0

Change-Id: Ib0fcc0592a57be6bce184b729f1c25ee02595062
2017-08-02 18:39:02 +00:00
TreeHugger Robot
6407874ae0 Merge "Added null test to avoid regression for onRemoteVolumeChanged." into oc-dr1-dev 2017-08-02 18:22:03 +00:00
Beverly
4e9366183f Added null test to avoid regression for onRemoteVolumeChanged.
Change-Id: Iebcf30a381250c06055143528914632a00e474bc
Fixes: 63946353
Test: runtest systemui
2017-08-02 13:53:58 +00:00
Jason Monk
1630b874a3 Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d am: 29b1a86af3
am: 8a36711334

Change-Id: I78a1446dd91cf19db9a866e12d4dccebac7bf684
2017-08-01 20:21:48 +00:00
Jason Monk
8a36711334 Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev am: 7d08ca6e4d
am: 29b1a86af3

Change-Id: Ieace05c849161fefa9e911968c3306f93e65aea3
2017-08-01 20:07:56 +00:00
Jason Monk
d789b7b99f Merge "Make it easier to click on phone nav buttons" into oc-dr1-dev
am: 7d08ca6e4d

Change-Id: I8e2c578cb564b2bc2de7c793eb40dea2639fa04e
2017-08-01 19:52:08 +00:00
Jason Monk
9262c942b5 Make it easier to click on phone nav buttons
When touches fall through the normal click targets, redirect them
to the nearest view.

Test: runtest systemui
Change-Id: I48267d9b1e15bf8dbe8725b72326751b03196efa
Fixes: 64080938
2017-08-01 12:29:59 -04:00
Adrian Roos
d5cd03d730 Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev am: 3cace2a148 am: 13b17b2990
am: 1ad4226687

Change-Id: If263c7f52ccd293d0ce36a522492c4e1b0c4e337
2017-07-31 12:48:21 +00:00
Adrian Roos
13b17b2990 Merge "AOD: When prox covered disable touch during pulse instead of aborting" into oc-dr1-dev
am: 3cace2a148

Change-Id: I94e9f30fa3f56b56c140f834674d38b776c8ed21
2017-07-31 12:36:20 +00:00