PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Settings: Improve automatic rule summary when enabled.

Browse Source 
Bug: 20064962
Change-Id: I139679def84f0ba3ea859399499a5657fd85e763
This commit is contained in:
John Spurlock
2015-04-09 23:57:23 -04:00
parent 45fa140b8c
commit d333a7d9f1
4 changed files with 86 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/notification/ZenModeSettings.java
View File

@@ -126,21 +126,21 @@ public class ZenModeSettings extends ZenModeSettingsBase
updateControls();
}
private String computeZenModeCaption(int zenMode) {
public static String computeZenModeCaption(Resources res, int zenMode) {
switch (zenMode) {
case Global.ZEN_MODE_ALARMS:
return getString(R.string.zen_mode_option_alarms);
return res.getString(R.string.zen_mode_option_alarms);
case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
return getString(R.string.zen_mode_option_important_interruptions);
return res.getString(R.string.zen_mode_option_important_interruptions);
case Global.ZEN_MODE_NO_INTERRUPTIONS:
return getString(R.string.zen_mode_option_no_interruptions);
return res.getString(R.string.zen_mode_option_no_interruptions);
default:
return null;
}
}
private String computeZenModeSummaryLine() {
final String caption = computeZenModeCaption(mZenMode);
final String caption = computeZenModeCaption(getResources(), mZenMode);
if (caption == null) return null; // zen mode off
final String conditionText = ZenModeConfig.getConditionLine1(mContext, mConfig,
UserHandle.myUserId());
@@ -190,7 +190,7 @@ public class ZenModeSettings extends ZenModeSettingsBase
ScrollView scrollView = new ScrollView(mContext);
scrollView.addView(zenModeConditionSelection);
mDialog = new AlertDialog.Builder(getActivity())
.setTitle(computeZenModeCaption(zenMode))
.setTitle(computeZenModeCaption(getResources(), zenMode))
.setView(scrollView)
.setPositiveButton(R.string.okay, positiveListener)
.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {