Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Show alarm tile for the current user." into jb-mr1.1-dev

Browse Source
This commit is contained in:
Daniel Sandler
2012-12-03 10:21:15 -08:00
committed by Android (Google) Code Review
parent f688ee5dcc 0f92a8083d
commit f87488095e
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickSettingsModel.java
View File

@@ -121,7 +121,8 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
public void startObserving() {
final ContentResolver cr = mContext.getContentResolver();
cr.registerContentObserver(
Settings.System.getUriFor(Settings.System.NEXT_ALARM_FORMATTED), false, this);
Settings.System.getUriFor(Settings.System.NEXT_ALARM_FORMATTED), false, this,
UserHandle.USER_ALL);
}
}
@@ -311,8 +312,15 @@ class QuickSettingsModel implements BluetoothStateChangeCallback,
mAlarmCallback.refreshView(mAlarmTile, mAlarmState);
}
void onNextAlarmChanged() {
mAlarmState.label = Settings.System.getString(mContext.getContentResolver(),
Settings.System.NEXT_ALARM_FORMATTED);
final String alarmText = Settings.System.getStringForUser(mContext.getContentResolver(),
Settings.System.NEXT_ALARM_FORMATTED,
UserHandle.USER_CURRENT);
mAlarmState.label = alarmText;
// When switching users, this is the only clue we're going to get about whether the
// alarm is actually set, since we won't get the ACTION_ALARM_CHANGED broadcast
mAlarmState.enabled = ! TextUtils.isEmpty(alarmText);
mAlarmCallback.refreshView(mAlarmTile, mAlarmState);
}