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
diff --git a/packages/SystemUI/res/layout/zen_mode_panel.xml b/packages/SystemUI/res/layout/zen_mode_panel.xml
index 11f50ee..8b1c2b7 100644
--- a/packages/SystemUI/res/layout/zen_mode_panel.xml
+++ b/packages/SystemUI/res/layout/zen_mode_panel.xml
@@ -78,4 +78,11 @@
android:orientation="vertical"
android:paddingTop="3dp" />
+ <TextView
+ android:id="@+id/zen_alarm_warning"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/qs_panel_padding"
+ android:gravity="center"
+ android:textAppearance="@style/TextAppearance.QS.DetailItemPrimary" />
</com.android.systemui.volume.ZenModePanel>
\ No newline at end of file
diff --git a/packages/SystemUI/res/values/colors.xml b/packages/SystemUI/res/values/colors.xml
index a7f894c..a1064fd 100644
--- a/packages/SystemUI/res/values/colors.xml
+++ b/packages/SystemUI/res/values/colors.xml
@@ -38,6 +38,7 @@
<color name="system_secondary_color">#ff384248</color>
<color name="system_accent_color">#ff80CBC4</color><!-- deep teal 200 -->
<color name="system_warning_color">#fff4511e</color><!-- deep orange 600 -->
+ <color name="qs_text">#FFFFFFFF</color>
<color name="qs_tile_divider">#29ffffff</color><!-- 16% white -->
<color name="qs_tile_text">#B3FFFFFF</color><!-- 70% white -->
<color name="qs_subhead">#66FFFFFF</color><!-- 40% white -->
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index 28b0853..c8c8e9a 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -617,8 +617,8 @@
<!-- Description of the left direction in which one can to slide the handle in the Slide unlock screen. [CHAR LIMIT=NONE] -->
<string name="description_direction_left">"Slide left for <xliff:g id="target_description" example="Unlock">%s</xliff:g>.</string>
- <!-- Zen mode: No interruptions title, with a warning about alarms and timers. [CHAR LIMIT=60] -->
- <string name="zen_no_interruptions_with_warning">No interruptions, including alarms and timers</string>
+ <!-- Zen mode: No interruptions title, with a warning about alarms. [CHAR LIMIT=60] -->
+ <string name="zen_no_interruptions_with_warning">No interruptions, including alarms</string>
<!-- Zen mode: No interruptions. [CHAR LIMIT=40] -->
<string name="zen_no_interruptions">No interruptions</string>
@@ -626,6 +626,15 @@
<!-- Zen mode: Only important interruptions. [CHAR LIMIT=40] -->
<string name="zen_important_interruptions">Priority interruptions only</string>
+ <!-- Zen mode: Next alarm information - just a time. [CHAR LIMIT=40] -->
+ <string name="zen_alarm_information_time">Your next alarm is at <xliff:g id="alarm_time" example="5:00 PM">%s</xliff:g></string>
+
+ <!-- Zen mode: Next alarm information - day and time. [CHAR LIMIT=40] -->
+ <string name="zen_alarm_information_day_time">Your next alarm is <xliff:g id="alarm_day_and_time" example="Fri 5:00 PM">%s</xliff:g></string>
+
+ <!-- Zen mode: Next alarm warning. [CHAR LIMIT=40] -->
+ <string name="zen_alarm_warning">You won\'t hear your alarm at <xliff:g id="alarm_time" example="5:00 PM">%s</xliff:g></string>
+
<!-- Text for overflow card on Keyguard when there is not enough space for all notifications on Keyguard. [CHAR LIMIT=1] -->
<string name="keyguard_more_overflow_text">+<xliff:g id="number_of_notifications" example="5">%d</xliff:g></string>
diff --git a/packages/SystemUI/res/values/styles.xml b/packages/SystemUI/res/values/styles.xml
index 708d3e8..5cc987a 100644
--- a/packages/SystemUI/res/values/styles.xml
+++ b/packages/SystemUI/res/values/styles.xml
@@ -154,7 +154,7 @@
<style name="TextAppearance.QS">
<item name="android:textStyle">normal</item>
- <item name="android:textColor">#ffffff</item>
+ <item name="android:textColor">@color/qs_text</item>
<item name="android:fontFamily">sans-serif</item>
</style>
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 8564409..72c12d6 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -549,6 +549,8 @@
mDozeServiceHost = new DozeServiceHost();
putComponent(DozeService.Host.class, mDozeServiceHost);
+
+ setControllerUsers();
}
// ================================================================================
@@ -2797,6 +2799,13 @@
animateCollapsePanels();
updateNotifications();
resetUserSetupObserver();
+ setControllerUsers();
+ }
+
+ private void setControllerUsers() {
+ if (mZenModeController != null) {
+ mZenModeController.setUserId(mCurrentUserId);
+ }
}
private void resetUserSetupObserver() {
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java
index 61902a2..2e97d18 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeController.java
@@ -27,11 +27,13 @@
void requestConditions(boolean request);
void setExitConditionId(Uri exitConditionId);
Uri getExitConditionId();
- boolean hasNextAlarm();
+ long getNextAlarm();
+ void setUserId(int userId);
public static class Callback {
public void onZenChanged(int zen) {}
public void onExitConditionChanged(Uri exitConditionId) {}
public void onConditionsChanged(Condition[] conditions) {}
+ public void onNextAlarmChanged() {}
}
}
\ No newline at end of file
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java
index 7703966..ae037f9 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/ZenModeControllerImpl.java
@@ -16,19 +16,25 @@
package com.android.systemui.statusbar.policy;
+import android.app.AlarmClockInfo;
+import android.app.AlarmManager;
import android.app.INotificationManager;
+import android.content.BroadcastReceiver;
import android.content.Context;
+import android.content.Intent;
+import android.content.IntentFilter;
import android.net.Uri;
import android.os.Handler;
import android.os.RemoteException;
import android.os.ServiceManager;
+import android.os.UserHandle;
import android.provider.Settings.Global;
import android.service.notification.Condition;
import android.service.notification.IConditionListener;
import android.service.notification.ZenModeConfig;
+import android.util.Log;
import android.util.Slog;
-import com.android.internal.widget.LockPatternUtils;
import com.android.systemui.qs.GlobalSetting;
import java.util.ArrayList;
@@ -36,8 +42,8 @@
/** Platform implementation of the zen mode controller. **/
public class ZenModeControllerImpl implements ZenModeController {
- private static final String TAG = "ZenModeControllerImpl";
- private static final boolean DEBUG = false;
+ private static final String TAG = "ZenModeController";
+ private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
private final ArrayList<Callback> mCallbacks = new ArrayList<Callback>();
private final Context mContext;
@@ -45,13 +51,13 @@
private final GlobalSetting mConfigSetting;
private final INotificationManager mNoMan;
private final LinkedHashMap<Uri, Condition> mConditions = new LinkedHashMap<Uri, Condition>();
- private final LockPatternUtils mUtils;
+ private final AlarmManager mAlarmManager;
+ private int mUserId;
private boolean mRequesting;
public ZenModeControllerImpl(Context context, Handler handler) {
mContext = context;
- mUtils = new LockPatternUtils(mContext);
mModeSetting = new GlobalSetting(mContext, handler, Global.ZEN_MODE) {
@Override
protected void handleValueChanged(int value) {
@@ -68,6 +74,7 @@
mConfigSetting.setListening(true);
mNoMan = INotificationManager.Stub.asInterface(
ServiceManager.getService(Context.NOTIFICATION_SERVICE));
+ mAlarmManager = (AlarmManager) context.getSystemService(Context.ALARM_SERVICE);
}
@Override
@@ -126,8 +133,22 @@
}
@Override
- public boolean hasNextAlarm() {
- return mUtils.getNextAlarm() != null;
+ public long getNextAlarm() {
+ final AlarmClockInfo info = mAlarmManager.getNextAlarmClock(mUserId);
+ return info != null ? info.getTriggerTime() : 0;
+ }
+
+ @Override
+ public void setUserId(int userId) {
+ mUserId = userId;
+ mContext.registerReceiverAsUser(mReceiver, new UserHandle(mUserId),
+ new IntentFilter(AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED), null, null);
+ }
+
+ private void fireNextAlarmChanged() {
+ for (Callback cb : mCallbacks) {
+ cb.onNextAlarmChanged();
+ }
}
private void fireZenChanged(int zen) {
@@ -169,4 +190,13 @@
updateConditions(conditions);
}
};
+
+ private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
+ @Override
+ public void onReceive(Context context, Intent intent) {
+ if (AlarmManager.ACTION_NEXT_ALARM_CLOCK_CHANGED.equals(intent.getAction())) {
+ fireNextAlarmChanged();
+ }
+ }
+ };
}
diff --git a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
index cf04219..d7aa3d6 100644
--- a/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
+++ b/packages/SystemUI/src/com/android/systemui/volume/ZenModePanel.java
@@ -30,6 +30,8 @@
import android.provider.Settings.Global;
import android.service.notification.Condition;
import android.service.notification.ZenModeConfig;
+import android.text.format.DateFormat;
+import android.text.format.Time;
import android.util.AttributeSet;
import android.util.Log;
import android.view.LayoutInflater;
@@ -46,7 +48,10 @@
import com.android.systemui.R;
import com.android.systemui.statusbar.policy.ZenModeController;
+import java.text.SimpleDateFormat;
import java.util.Arrays;
+import java.util.Date;
+import java.util.Locale;
import java.util.Objects;
public class ZenModePanel extends LinearLayout {
@@ -75,6 +80,8 @@
private final H mHandler = new H();
private final Favorites mFavorites;
private final Interpolator mFastOutSlowInInterpolator;
+ private final int mTextColor;
+ private final int mAccentColor;
private char mLogTag = '?';
private String mTag;
@@ -85,6 +92,7 @@
private TextView mZenSubheadExpanded;
private View mMoreSettings;
private LinearLayout mZenConditions;
+ private TextView mAlarmWarning;
private Callback mCallback;
private ZenModeController mController;
@@ -94,6 +102,7 @@
private boolean mExpanded;
private int mAttachedZen;
private String mExitConditionText;
+ private long mNextAlarm;
public ZenModePanel(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -102,6 +111,8 @@
mInflater = LayoutInflater.from(mContext.getApplicationContext());
mFastOutSlowInInterpolator = AnimationUtils.loadInterpolator(mContext,
android.R.interpolator.fast_out_slow_in);
+ mTextColor = mContext.getResources().getColor(R.color.qs_text);
+ mAccentColor = mContext.getResources().getColor(R.color.system_accent_color);
updateTag();
if (DEBUG) Log.d(mTag, "new ZenModePanel");
}
@@ -144,6 +155,7 @@
});
mZenConditions = (LinearLayout) findViewById(R.id.zen_conditions);
+ mAlarmWarning = (TextView) findViewById(R.id.zen_alarm_warning);
}
@Override
@@ -152,6 +164,7 @@
if (DEBUG) Log.d(mTag, "onAttachedToWindow");
mAttachedZen = getSelectedZen(-1);
refreshExitConditionText();
+ refreshNextAlarm();
updateWidgets();
}
@@ -213,6 +226,7 @@
if (Objects.equals(mExitConditionId, exitConditionId)) return;
mExitConditionId = exitConditionId;
refreshExitConditionText();
+ updateWidgets();
}
private void refreshExitConditionText() {
@@ -267,12 +281,34 @@
final boolean zenImportant = zen == Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS;
final boolean zenNone = zen == Global.ZEN_MODE_NO_INTERRUPTIONS;
final boolean foreverSelected = mExitConditionId == null;
+ final boolean hasNextAlarm = mNextAlarm != 0;
mZenSubhead.setVisibility(!zenOff && (mExpanded || !foreverSelected) ? VISIBLE : GONE);
mZenSubheadExpanded.setVisibility(mExpanded ? VISIBLE : GONE);
mZenSubheadCollapsed.setVisibility(!mExpanded ? VISIBLE : GONE);
mMoreSettings.setVisibility(zenImportant && mExpanded ? VISIBLE : GONE);
mZenConditions.setVisibility(!zenOff && mExpanded ? VISIBLE : GONE);
+ mAlarmWarning.setVisibility(zenNone && mExpanded && hasNextAlarm ? VISIBLE : GONE);
+
+ if (zenNone && mExpanded && hasNextAlarm) {
+ final long exitTime = ZenModeConfig.tryParseCountdownConditionId(mExitConditionId);
+ final long now = System.currentTimeMillis();
+ final boolean alarmToday = time(mNextAlarm).yearDay == time(now).yearDay;
+ final String skeleton = (alarmToday ? "" : "E")
+ + (DateFormat.is24HourFormat(mContext) ? "Hm" : "hma");
+ final String pattern = DateFormat.getBestDateTimePattern(Locale.getDefault(), skeleton);
+ final String alarm = new SimpleDateFormat(pattern).format(new Date(mNextAlarm));
+ final boolean isWarning = exitTime > 0 && mNextAlarm > now && mNextAlarm < exitTime;
+ if (isWarning) {
+ mAlarmWarning.setText(mContext.getString(R.string.zen_alarm_warning, alarm));
+ mAlarmWarning.setTextColor(mAccentColor);
+ } else {
+ mAlarmWarning.setText(mContext.getString(alarmToday
+ ? R.string.zen_alarm_information_time
+ : R.string.zen_alarm_information_day_time, alarm));
+ mAlarmWarning.setTextColor(mTextColor);
+ }
+ }
if (zenNone) {
mZenSubheadExpanded.setText(R.string.zen_no_interruptions_with_warning);
@@ -283,6 +319,12 @@
}
}
+ private static Time time(long millis) {
+ final Time t = new Time();
+ t.set(millis);
+ return t;
+ }
+
private Condition parseExistingTimeCondition(Uri conditionId) {
final long time = ZenModeConfig.tryParseCountdownConditionId(conditionId);
if (time == 0) return null;
@@ -308,6 +350,15 @@
Condition.FLAG_RELEVANT_NOW);
}
+ private void refreshNextAlarm() {
+ mNextAlarm = mController.getNextAlarm();
+ }
+
+ private void handleNextAlarmChanged() {
+ refreshNextAlarm();
+ updateWidgets();
+ }
+
private void handleUpdateConditions(Condition[] conditions) {
final int newCount = conditions == null ? 0 : conditions.length;
if (DEBUG) Log.d(mTag, "handleUpdateConditions newCount=" + newCount);
@@ -518,12 +569,18 @@
public void onExitConditionChanged(Uri exitConditionId) {
mHandler.obtainMessage(H.EXIT_CONDITION_CHANGED, exitConditionId).sendToTarget();
}
+
+ @Override
+ public void onNextAlarmChanged() {
+ mHandler.sendEmptyMessage(H.NEXT_ALARM_CHANGED);
+ }
};
private final class H extends Handler {
private static final int UPDATE_CONDITIONS = 1;
private static final int EXIT_CONDITION_CHANGED = 2;
private static final int UPDATE_ZEN = 3;
+ private static final int NEXT_ALARM_CHANGED = 4;
private H() {
super(Looper.getMainLooper());
@@ -532,12 +589,14 @@
@Override
public void handleMessage(Message msg) {
if (msg.what == UPDATE_CONDITIONS) {
- handleUpdateConditions((Condition[])msg.obj);
+ handleUpdateConditions((Condition[]) msg.obj);
checkForDefault();
} else if (msg.what == EXIT_CONDITION_CHANGED) {
- handleExitConditionChanged((Uri)msg.obj);
+ handleExitConditionChanged((Uri) msg.obj);
} else if (msg.what == UPDATE_ZEN) {
handleUpdateZen(msg.arg1);
+ } else if (msg.what == NEXT_ALARM_CHANGED) {
+ handleNextAlarmChanged();
}
}
}