Commit Graph

374 Commits

Author SHA1 Message Date
Adrian Roos
8bb1757531 Merge "AOD: Fix broken triggers after failed prox check" into oc-dev am: 017f5df1e7
am: 06c68a68ef

Change-Id: Ifbcaaf8d580e5c55016040e9bdc5afd27ebcefd6
2017-04-20 16:12:50 +00:00
phweiss
0330f88144 Redesign QSSecurityFooter dialog
The dialog consists now of up to four sections: Device management,
CA certificates, Network Logging and VPN.

Also, small tweaks to the footer's coloring after the theme change of QS.

Bug: 34369166
Bug: 37492743
Test: in class QSSecurityFooterTest, which is part of "runtest systemui"

Change-Id: Ibf07a26fb6c5485a152f9d447f10c0f73acb94ba
2017-04-20 09:42:04 +00:00
TreeHugger Robot
017f5df1e7 Merge "AOD: Fix broken triggers after failed prox check" into oc-dev 2017-04-20 07:34:13 +00:00
Adrian Roos
d35d4ca69f AOD: Fix broken triggers after failed prox check
Fixes an issue where after a failed prox check
we would not correctly reset mPulsePending and
thus never trigger a pulse again until the
DozeService restarts.

Also adds logging for dropped and canceled pulses
to aid diagnosing similar or different bugs
in the future.

Also adds a regression test.

Fixes: 37477968
Test: runtest -x /frameworks/base/packages/SystemUI/tests/src/com/android/systemui/doze/DozeTriggersTest.java
Change-Id: Ic465b7686ae1937a29d07a66fe44cf7ad18419ef
2017-04-20 05:25:29 +00:00
Philipp Weiß
a017e573b5 Merge "Redesign of QSSecurityFooter" into oc-dev 2017-04-19 09:25:43 +00:00
phweiss
4f70f105d5 Redesign of QSSecurityFooter
QSSecurityFooter is redesigned to display the new strings related to
Device Management, Network Logging, VPNs and CA Certificates. The dialog
will be changed in a separate CL.

As part of this CL, the network logging icon and the WiFi-Assist branding
is removed.

Details of the design can be found in the bug.

Bug: 34369166
Test: in class QSSecurityFooterTest, which is part of "runtest systemui"

(cherry-picked from 774c6542cd)

Change-Id: I71cd57ff607fe00d3ee0aba2312143f728655c76
2017-04-18 12:02:40 +00:00
Jason Monk
13bc237dcf Merge "Status bar updates" into oc-dev am: c5e04dbfd4
am: 5efe531874

Change-Id: If91d9bd5aa69ba752cafaafbea9330754492ebe8
2017-04-18 00:01:40 +00:00
Jason Monk
d1ba5fbb54 Status bar updates
- Wifi moves to right of cell
 - Cell data and roaming indicator swap places
 - Data disabled and no internet on cell look the same
 - Don't show wifi in QS signal cluster, it has its status
   right below.

Test: visual && runtest systemui
Fixes: 36717491
Change-Id: I16ebe6fb6dd519526a1e174753c8ce08c713d405
2017-04-17 15:14:15 -04:00
Jason Monk
77857df729 Merge "Convert signal icon to be custom drawable" into oc-dev am: 06426bf652
am: 389755704e

Change-Id: Idce35feb4c53e68970a289b4e811b2a2e9b09d01
2017-04-14 21:08:45 +00:00
Jason Monk
48edc0c628 Convert signal icon to be custom drawable
This will make it really easy to change the number of bars it
displays.

Test: runtest systemui
Change-Id: If0b8a606f56430ea08fa0887af85aa0e90de1d40
Fixes: 35902355
2017-04-14 15:04:09 -04:00
Selim Cinek
58c5d5abca Merge changes Icc9c36f7,I723474e2 into oc-dev am: 07525d4f25
am: f1f29ca50b

Change-Id: Iff0c951c0a1e27f6285f994df3a6f40c9a3bd8e3
2017-04-14 16:19:57 +00:00
Lei Yu
f69156ff95 Merge "Refine BatteryInfo and battery drawable" into oc-dev am: 57af565fb7
am: 24638307c2

Change-Id: Ifae38f01a454fe9dcea1fbde0ea1a57a15087d8a
2017-04-14 16:18:02 +00:00
Jason Monk
e30503f485 Merge "Fix location status bar icon" into oc-dev am: d2b368a68d
am: 2e55245f98

Change-Id: I2dabf81060d98a2dcbec6487900c7148fc4daa07
2017-04-14 16:08:42 +00:00
Jason Monk
108b8ec82a Merge "Fix leak in nav bar" into oc-dev am: 0b67d53ba9
am: cea904333e

Change-Id: I51b2753f46f5b18e791af39020aab2c8547981df
2017-04-14 16:01:02 +00:00
Selim Cinek
07525d4f25 Merge changes Icc9c36f7,I723474e2 into oc-dev
* changes:
  Fixed a crash when expanding
  Fixed the visual appearance on heads-up notifications
2017-04-13 22:52:16 +00:00
Lei Yu
57af565fb7 Merge "Refine BatteryInfo and battery drawable" into oc-dev 2017-04-13 21:43:37 +00:00
TreeHugger Robot
d2b368a68d Merge "Fix location status bar icon" into oc-dev 2017-04-13 20:26:16 +00:00
Jason Monk
359bb74a54 Fix location status bar icon
It should have been in PhoneStatusBarPolicy, since it wasn't it
wouldn't listen until something else touched the LocationController
like QS.

Test: Open app that uses location
Change-Id: I70d1aff2a1c9bf7be53aeb72ba285b49d98c5362
Fixes: 36747248
2017-04-13 14:09:32 -04:00
Jason Monk
91e587ebbc Fix leak in nav bar
Test: runtest systemui
Change-Id: Ib082ef216f1541911acbed84942ddfd5dd065a7f
Fixes: 37220220
2017-04-13 13:41:23 -04:00
Selim Cinek
3acdc8e7fc Fixed a crash when expanding
When expanding another notification while one was finishing
the animation, the system would crash.

Test: runtest -x packages/SystemUI/tests/src/com/android/systemui/ExpandHelperTest.java
Change-Id: Icc9c36f7e3bc93ff80f974d400efd3194fa8ed09
Fixes: 36531729
2017-04-13 10:12:36 -07:00
Philipp Weiß
8801fb8232 Merge "Redesign of QSSecurityFooter" 2017-04-13 16:25:32 +00:00
phweiss
774c6542cd Redesign of QSSecurityFooter
QSSecurityFooter is redesigned to display the new strings related to
Device Management, Network Logging, VPNs and CA Certificates. The dialog
will be changed in a separate CL.

As part of this CL, the network logging icon and the WiFi-Assist branding
is removed.

Details of the design can be found in the bug.

Bug: 34369166
Test: in class QSSecurityFooterTest, which is part of "runtest systemui"

Change-Id: I71cd57ff607fe00d3ee0aba2312143f728655c76
2017-04-13 16:24:40 +02:00
jackqdyulei
ff5bd948b0 Refine BatteryInfo and battery drawable
1. Remove "m" prefix for all public field
2. Change logic about field "discharging", now it only controlled
   by whether it is plugged in.
3. Change Paint in drawable to protected
Bug: 36862496
Test: RunSettingsLibTests
Change-Id: I2908ae6868dc877d3ce6a8a63ec17826a6dcca1d
2017-04-12 12:57:55 -07:00
Mady Mellor
e5c8b231eb Merge "Don't offer snooze for foreground service notifications" into oc-dev am: 8f395a16fb
am: cb5b58d990

Change-Id: If20d6cef28c3b79fe4577b0ea82fb6479a8dc163
2017-04-12 18:46:59 +00:00
Mady Mellor
8f395a16fb Merge "Don't offer snooze for foreground service notifications" into oc-dev 2017-04-12 18:27:29 +00:00
Julia Reynolds
c735ac04d3 Merge "Changing importance should record user locked field." into oc-dev am: f61985f02e
am: cc6836cf64

Change-Id: I8f0b3c1aaa7a7f764c8ce815feb6fc3005710bda
2017-04-12 01:56:06 +00:00
Julia Reynolds
8ceb579ec7 Changing importance should record user locked field.
Test: runtest systemui
Change-Id: Ia200acb2e2a2b2163fd4a728a2bfc5430070c580
2017-04-11 13:25:47 -04:00
Mady Mellor
4c19760b91 Don't offer snooze for foreground service notifications
Also updates NotificationMenuRow tests to actually check if menu
was created.

Test: Manual, have foreground service, check if snooze is visible
Bug: 37152715
Change-Id: I09cf60598c3e8991f2da731da1ef7e0a718c3435
2017-04-10 18:30:27 -07:00
Adrian Roos
f80d150fb9 Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev am: 2d691791e7
am: df8508de66

Change-Id: I648fcad9860b469003406c8892cf834a00b4b63d
2017-04-07 17:49:32 +00:00
Adrian Roos
2d691791e7 Merge "Revert "Ignore a broken test until it can be fixed."" into oc-dev 2017-04-07 17:35:48 +00:00
Jason Monk
c8be34c647 Merge "Tuner plugin settings updates" into oc-dev am: eaf6b3b193
am: 574642fef7

Change-Id: I628944551c44c4b54edd04aa963d5f399160dd13
2017-04-07 01:54:38 +00:00
Jason Monk
eaf6b3b193 Merge "Tuner plugin settings updates" into oc-dev 2017-04-07 01:39:28 +00:00
TreeHugger Robot
809b79da2f Merge "Add metrics for nav buttons through KeyButtonView" into oc-dev 2017-04-07 00:39:31 +00:00
TreeHugger Robot
ad27aa11b1 Merge "NotiViewWrapper: Fix test that breaks on master" into oc-dev 2017-04-07 00:26:34 +00:00
Adrian Roos
2f6bef2c17 Revert "Ignore a broken test until it can be fixed."
This reverts commit 1ee48434ef.

Change-Id: Ie51d2931a6bafb187902c6ac845066ca70937f2c
2017-04-06 23:06:24 +00:00
Adrian Roos
4c720d2c13 NotiViewWrapper: Fix test that breaks on master
oc-dev allows constructing views with a null context, but
that doesn't work any longer on master.

Bug: 36430936
Change-Id: If069f81d54e3e3b9145ca5187b87888cd6173c0f
Merged-In: If069f81d54e3e3b9145ca5187b87888cd6173c0f
2017-04-06 22:41:50 +00:00
TreeHugger Robot
ce5b2875eb Merge "Add metrics for nav buttons through KeyButtonView" 2017-04-06 22:41:22 +00:00
Jason Monk
1b77565a6f Add metrics for nav buttons through KeyButtonView
Doesn't cover home-long-press or overview, but those appear to be
covered by other events.

Test: runtest systemui
Merged-In: I590b52765aaef3c2bf573ce8ab980aa992b1d5b0
Change-Id: I630356245e223a3fb8d4d2fe11be5d498227c0e3
Fixes: 25931698
2017-04-06 15:19:14 -07:00
Jason Monk
cbf591bb91 Add metrics for nav buttons through KeyButtonView
Doesn't cover home-long-press or overview, but those appear to be
covered by other events.

Test: runtest systemui
Change-Id: I590b52765aaef3c2bf573ce8ab980aa992b1d5b0
Fixes: 25931698
2017-04-06 16:46:17 -04:00
Jason Monk
edfa656e25 Merge "Ignore a broken test until it can be fixed." into oc-dev am: eb93670383
am: ab98962251

Change-Id: I7cd09bdaa2813f61918bae1c8f12d748e29b3ba5
2017-04-06 20:15:05 +00:00
TreeHugger Robot
eb93670383 Merge "Ignore a broken test until it can be fixed." into oc-dev 2017-04-06 18:05:00 +00:00
Julia Reynolds
0ac1b6167b Fix build
Test: runtest systemui
Change-Id: I94663b45c8f745c9485cdeb898de5a6bc4f85f0b
(cherry picked from commit 4740b61553)
2017-04-06 17:28:00 +00:00
Julia Reynolds
4740b61553 Fix build
Test: runtest systemui
Change-Id: I94663b45c8f745c9485cdeb898de5a6bc4f85f0b
2017-04-06 16:41:45 +00:00
Julia Reynolds
bb23c9b80b Merge "Show a link to app settings in notification guts." into oc-dev am: 0ff1b458ac
am: fafcda882b

Change-Id: I397e37d0cbff42be9bc41e42eef094a8237e9c9a
2017-04-06 16:18:01 +00:00
Jason Monk
1ee48434ef Ignore a broken test until it can be fixed.
Test: runtest systemui
Bug: 37074875
Change-Id: Id5561a3ded2242c711c2edccefb1647437d6f963
2017-04-06 11:31:19 -04:00
Jason Monk
d2e75262cc Tuner plugin settings updates
Test: manual
Fixes: 33446852
Change-Id: I05c046bb70dff66ea25531503216f121e6618a62
2017-04-06 11:24:20 -04:00
Julia Reynolds
3aeddedc17 Show a link to app settings in notification guts.
Test: runtest systemui, cts
Change-Id: I7204102d5c83d589af5d3da57f72068491c12daa
2017-04-05 22:40:37 +00:00
Adrian Roos
2d05fe4241 NotiViewWrapper: Fix test that breaks on master
oc-dev allows constructing views with a null context, but
that doesn't work any longer on master.

Bug: 36430936
Change-Id: If069f81d54e3e3b9145ca5187b87888cd6173c0f
2017-04-05 14:50:35 -07:00
Adrian Roos
b58ce251e3 resolve merge conflicts of 3a1776794a to master
Test: runtest systemui
Change-Id: I711fe627beb95c6e8a089a2118a842f951754abe
2017-04-05 13:52:27 -07:00
TreeHugger Robot
debabde073 Merge changes Ibdf9cf90,I3a6dd476,Id4008fc7,Iede88d1e into oc-dev
* changes:
  NotificationViewWrapper: Fix crash for custom views
  Revert "Revert "AOD: Use color filter to invert icons for AOD""
  Revert "Revert "NotificationWrappers: Factor out doze treatment""
  AOD: prevent clicking shelf when dark
2017-04-05 20:30:20 +00:00