OSDN Git Service

Zen: Return of the alarm warning.
authorJohn Spurlock <jspurlock@google.com>
Thu, 17 Jul 2014 01:03:15 +0000 (21:03 -0400)
committerJohn Spurlock <jspurlock@google.com>
Thu, 17 Jul 2014 15:41:18 +0000 (11:41 -0400)
commit89f060a1e0fa48c497855d061b5c9ec44bb576c8
tree8f179d97fc8d326be7abfdcce3ab29e7631e9318
parent9d32507a8608f82d430fcaf1de0eb81de93dcdea
Zen: Return of the alarm warning.

- Remove the term timers from subtitle, the term "alarms"
  is now inclusive of timers.
- Resurrect the alarm warning, give it a more prominent
  appearance if we can detect an overlap in a time-based
  exit condition and the next alarm time.

Change-Id: I5d6d67694c7acc9e2a5a7c63e647069744a22cec
packages/SystemUI/res/layout/zen_mode_panel.xml
packages/SystemUI/res/values/colors.xml
packages/SystemUI/res/values/strings.xml
packages/SystemUI/res/values/styles.xml
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java
packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java
packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java