Commit Graph

264 Commits

Author SHA1 Message Date
Jason Monk
0288de0e56 Fix data disabled icon from not showing in status bar
The NetworkController seemed to think the user wasn't set up since
the DeviceProvisionedController didn't send an initial callback
on add.

Also add some extra listening to data disabled state to avoid race
conditions there.

Change-Id: I17f759894a283da08eb0da7ceb5181355c8f4d55
Fixes: 35708363
Fixes: 35632846
Test: runtest systemui
2017-02-23 14:51:17 -05:00
Adrian Roos
26d8184d46 AOD: Don't use doze states when unsupported
Bug: 30876804
Test: runtest -x $ANDROID_BUILD_TOP/frameworks/base/packages/SystemUI/tests/src/com/android/systemui/doze/DozeScreenStatePreventingAdapterTest.java
Change-Id: Iff09aef0733e30f13723208ff4e7605d40449bb2
2017-02-21 21:39:50 +01:00
TreeHugger Robot
db53fb0816 Merge "resolve merge conflicts of e86b78a574 to master" 2017-02-18 01:15:08 +00:00
TreeHugger Robot
6e82080513 Merge "Move Badging from ScoredNetwork to NetworkingBadging." 2017-02-18 01:14:04 +00:00
Colin Cross
af736c9e99 resolve merge conflicts of e86b78a574 to master
Test: none
Change-Id: I8bf02f8198d003c4453cc59b7a3bccdff688ca15
2017-02-17 15:05:37 -08:00
Colin Cross
3c2c2764d4 Merge changes I82aa8140,Ib62a5dd6,I2c4d64e2
am: 313e645801

Change-Id: Ia10d20ea4ebabc2cc84524950dec7570104b185f
2017-02-17 22:25:53 +00:00
TreeHugger Robot
91e5d7fa99 Merge "Remove locked user tasks if starting overlay fails" 2017-02-17 13:40:43 +00:00
Robin Lee
1d996bd7fc Remove locked user tasks if starting overlay fails
This is a more graceful failure case than giving up and just letting
the task show unmodified on the screen if something goes wrong.

Test: runtest -x WorkLockActivityControllerTest.java
Bug: 31001762
Fix: 31064912
Change-Id: I505c00f411f41fb927c31d2280bdeda69e15b4d4
2017-02-17 10:48:43 +00:00
Colin Cross
254a418e97 Enable multidex for SystemUITests
Test: builds
Change-Id: I82aa81405f635165716c39191082836dae8ce819
2017-02-16 17:34:45 -08:00
TreeHugger Robot
2b71a6d54f Merge "SystemUI: Disable LeakReporterTest" 2017-02-16 17:45:29 +00:00
Adrian Roos
4fb1f51978 AOD: Refactor DozeMachine to allow waking up
Bug: 30876804
Test: runtest -x $ANDROID_BUILD_TOP/frameworks/base/packages/SystemUI/tests/src/com/android/systemui/doze/DozeMachineTest.java
Change-Id: I1d01ab5d8ba3c1bf7b11b0b4911b25f3416ca6e9
2017-02-16 01:19:38 +01:00
Adrian Roos
09ed8f6cfc SystemUI: Disable LeakReporterTest
Those tests are slow because they dump the
heap multiple times.

Disable until the code is refactored such that
it does not actually dump and write to disk
when under test.

Test: runtest systemui
Bug: 35398375
Change-Id: I7cf945687900424dc1460367fbef5f36ed75da82
2017-02-16 00:56:45 +01:00
Jason Monk
d7937b3488 Merge "New system for versioning sysui plugins" 2017-02-15 20:49:05 +00:00
Jason Monk
4cfd8c740d Fix test failures on treehugger?
Test: runtest systemui
Change-Id: I0660729aade05cd63b240eed13ed9d5c9ff8de91
2017-02-15 13:52:47 -05:00
Sundeep Ghuman
699deaf610 Move Badging from ScoredNetwork to NetworkingBadging.
This is a non-functional refactor. The old enums will be removed once
ag/35323372 is addressed.

Bug: 35114358
Test: Ran existing tests (see files touched).
Change-Id: I08fd8c7964463b5908ce361e61f8fe811d0ff6f3
2017-02-14 14:04:18 -08:00
TreeHugger Robot
291c9078e6 Merge "Percentage text now sits alongside the battery icon." 2017-02-14 21:55:38 +00:00
Dan Sandler
055bb61426 Percentage text now sits alongside the battery icon.
The old embedded percentage (introduced in change I6a3e7409) is hard
to read at status bar size, so we now draw it in a separate TextView to
the left (start) of the battery gauge. (The embedded code remains so
that it can be used by other places where the battery is drawn larger.)

The old system setting "status_bar_show_battery_percent" is still used
to control whether this percentage is shown, but note that it now
applies only to BatteryMeterView (i.e., the status bar) and not other
usages of BatteryMeterDrawable.

Bug: 32539932
Test: (manual) adb shell settings put system status_bar_show_battery_percent 1
Change-Id: Id298dba544f594b11269539284a2e8042fd4780b
2017-02-14 14:47:28 -05:00
Robin Lee
3cb867326a Merge "Theme work lock activity with the task primaryColor" 2017-02-14 18:38:14 +00:00
Robin Lee
3c82d3d5bf Theme work lock activity with the task primaryColor
This involves adding another system RPC, getTaskDescription(taskId)
gated on MANAGE_ACTIVITY_STACKS permission.

Bug: 31001762
Test: runtest -x frameworks/base/packages/SystemUI/tests/src/com/android/systemui/keyguard/WorkLockActivityTest.java
Change-Id: Ieb996f7fab5bc79737df570e35733551118118d3
2017-02-13 23:22:34 +00:00
Geoffrey Pitsch
7c4f39b856 Merge "Updated Inline Notification Controls" 2017-02-13 17:47:33 +00:00
TreeHugger Robot
f49f3482de Merge "Partial revert of "Disable StatusBarTests due to flakes."" 2017-02-13 16:34:51 +00:00
Adrian Roos
02de498b0e Partial revert of "Disable StatusBarTests due to flakes."
Only disable the flakey metrics tests. The other tests in
this class are fine. Also use @Ignore instead of commenting
out @Test.

This reverts commit 63b55435e8.

Change-Id: I023e63be18dba3659cabe4db9ae1245ccafe835c
2017-02-13 16:19:58 +00:00
Adrian Roos
4f2b3fe0a1 Merge "SysUiLeaks: Add GarbageMonitor" 2017-02-13 15:06:15 +00:00
Adrian Roos
9125068a99 SysUiLeaks: Add GarbageMonitor
Adds a service for monitoring the amount of tracked garbage.
If it exceeds reasonable levels, a notification with a leak
report is posted.

Test: runtest systemui
Change-Id: Ib55281f2aac557743b97c46bc616688261c72e9c
2017-02-11 21:57:10 +01:00
Jason Monk
a8e72d463c Merge "Move Keyguard to SystemUI" 2017-02-11 00:37:39 +00:00
Geoffrey Pitsch
63b55435e8 Disable StatusBarTests due to flakes.
Looks like it relies on some global state.

Test: runtest systemui
Change-Id: If4add9e551bbaef5580df2532f937345c9e69d32
2017-02-10 13:37:03 -05:00
Geoffrey Pitsch
df44b606f3 Updated Inline Notification Controls
Removed old xml resources, strings, dimens, etc
Different behavior when sent from the default channel.
Display how many notification categories are used by the app.
Group label when channel is associated with group.
Add package icon.
Fix tap-away-to-save behavior

Test: runtest systemui
Change-Id: Ib41a536a5c4e7c7747a2453eddc3b4b4b99ffa7a
2017-02-10 13:24:54 -05:00
Jason Monk
23f85ec14d Move Keyguard to SystemUI
Test: make
Change-Id: I3abb67e2b022737d2aa0226bb07f3966ad68fff7
2017-02-10 07:45:58 -08:00
Adrian Roos
3b172ba054 Merge "Dependency: Make non-class dependencies type-safe" 2017-02-09 22:29:02 +00:00
Adrian Roos
09c43c8743 Dependency: Make non-class dependencies type-safe
Introduces a new DependencyKey<V> type which allows
referring to non-class dependencies in a type-safe
way. This also improves performance because we no
longer need to perform string comparisons.

Test: runtest systemui
Change-Id: Idc948855a85a1899be41e7f0170c40e73e525024
2017-02-09 21:23:04 +01:00
Jason Monk
5bec68fbea New system for versioning sysui plugins
Use annotations to handle the multi-dimensionalness of interface
versions, but still maintain compile time inclusion of current
versions.

Test: runtest systemui
Change-Id: I0789a72112cf6630a6406f76020071c8a6d9e24c
2017-02-09 09:32:20 -08:00
Jason Monk
28d5d220cc Switch fragment tests to use TestableLooper
Test: runtest systemui
Change-Id: Iccbbaca2ef02cb3f5b08eef66c6c939e4ec2a5eb
2017-02-09 09:30:42 -08:00
TreeHugger Robot
df185d7502 Merge "avoid race condition on very fast tests" 2017-02-09 16:46:53 +00:00
Jason Monk
7898e87be2 Merge "Add better method test handlers/loopers in sysui" 2017-02-09 15:43:19 +00:00
Chris Wren
6f6c0cd4b8 avoid race condition on very fast tests
most of the use cases for this involve uiautomator tests,
which are slow anyway. In this case it may be possible for
the checkpoint to record the current time, and then the
test event arrive before the clock ticks over to the
next millisecond, which would cause them to be ignored.

If this fixes the flakiness we should consider a more gneeral fix.

Test: runtest --path frameworks/base/packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarTest.java
Bug: 35138327
Change-Id: Idc4aec50df1a75be710c5a69522af058f7e68ec1
2017-02-09 09:51:50 -05:00
TreeHugger Robot
5706614868 Merge "SysUiLeaks: Add LeakDetector" 2017-02-09 14:03:22 +00:00
Adrian Roos
e1e0b483be SysUiLeaks: Add LeakDetector
Bug: 34932615
Test: runtest -x $ANDROID_BUILD_TOP/frameworks/base/packages/SystemUI/tests/src/com/android/systemui/util/leak/
Change-Id: Id4a9cbdaddc83ca3e25923eec33d53b6761c54cb
2017-02-09 10:33:02 +01:00
Jason Monk
aa573e9e86 Work on separating out the status bar management
Lots of stuff:
 - Make StatusBarIconController be a permanent dependency
 - Break out dark stuff into DarkIconDispatcher
 - Create StatusBarFragment
   - This bit is a bit ugly for now, but will be better later
 - Other stuff probably

Test: runtest systemui
Change-Id: I4973bc9f944e66af92731bf1edd2b39657f1782f
2017-02-08 19:51:41 -05:00
TreeHugger Robot
ba89ed754f Merge "Move the logic of batteryMeterDrawable to settingslib" 2017-02-08 10:14:28 +00:00
jackqdyulei
597b10f6db Move the logic of batteryMeterDrawable to settingslib
In Settings, we also need a BatteryMeterDrawable to show battery meter,
that's why I move it to settingslib.

In this cl, what I have changed is listed below:
1. Create BatteryMeterDrawableLib that contains logic of battery
drawing.
2. Still Keep the battery control logic in systemui.
3. Remove hardcoded battery color by using the color state lists.
4. Move some tests to settingslib

Bug: 34771849
Test: make SettingsLibTests

Change-Id: I39c0f0e31ca5e1b958467298db1d0590d16c9f6d
2017-02-07 17:27:00 -08:00
Jason Monk
d8df1b083d Merge "QS: Fix brightness/edit disappearing with too few tiles" 2017-02-07 18:23:54 +00:00
Jason Monk
cedcb945f7 QS: Fix brightness/edit disappearing with too few tiles
- Make sure the tile layout doesn't have negative height

Test: runtest systemui
Fixes: 34593873
Change-Id: I392aa925cde1b2147a86cda63cd9e84cd3026a90
2017-02-06 15:06:01 -08:00
Selim Cinek
e373313bd5 Merge changes If0edccf8,I086b7bae,I043011c6,I4b05f340,I309097ef, ...
* changes:
  Disabling animations now when the screen is off
  Fixed a quick flash of the icon when adding a notification
  Fixed a bug where the notification icons wouldn't match
  Fixed weirdness about last icon in shelf
  Fixed a regression where custom notification where unreadable
  Fixed a wrong translation calculation on first pull down
2017-02-06 21:59:08 +00:00
TreeHugger Robot
cd1d343ffd Merge "StatusBar: Clean up buzzBeepBlinked and friends" 2017-02-06 21:17:03 +00:00
Selim Cinek
245090f060 Fixed a regression where custom notification where unreadable
Because custom notifications don't have their background
Color reapplied, we need to ensure that the color is saved.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/NotificationCustomViewWrapperTest.java
Change-Id: I309097ef8abe18706479d64c6048521f941a26f5
Fixes: 34861088
2017-02-03 17:14:46 -08:00
Adrian Roos
48a18ad206 Merge "StatusBar: Catch OOM caused by third-party icons" 2017-02-04 01:00:40 +00:00
Jason Monk
e750748404 Add better method test handlers/loopers in sysui
Test: runtest systemui
Change-Id: I94014afab12d385f38a9d1d4a8595bb37cfe0688
2017-02-03 19:42:10 -05:00
Adrian Roos
fb2d0cc090 StatusBar: Catch OOM caused by third-party icons
Bug: 31825355
Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/statusbar/StatusBarIconViewTest.java
Change-Id: I3e2a8c3da43a572a026ea0bbe1d39234035a4801
2017-02-03 14:23:50 -08:00
Jason Monk
7d6fa83a99 Fix the tests
Window types changed, need to use a different one

Test: runtest systemui
Change-Id: Iac2641feb49e54af98ac523363d387647552eb0a
2017-02-03 15:16:21 -05:00
Selim Cinek
2a12324268 Merge "Fixed the background for low-priority legacy notifications" 2017-02-03 19:03:06 +00:00