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

Merge "Zen Condition text and primary click changes"

Browse Source
This commit is contained in:
Beverly Tai
2018-02-02 15:27:04 +00:00
committed by Android (Google) Code Review
parent bdcd50328f c5ae162768
commit 7142be5630
2 changed files with 9 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -8429,7 +8429,7 @@
<string name="condition_airplane_summary">Wi-Fi, Bluetooth, and mobile network are turned off. You can\'t make phone calls or connect to the internet.</string>
<!-- Title of condition that do not disturb is on [CHAR LIMIT=30] -->
<string name="condition_zen_title">Do not disturb is on (<xliff:g name="zen_mode_type" example="Alarms only">%1$s</xliff:g>)</string>
<string name="condition_zen_title">Do Not Disturb is on</string>
<!-- Title of condition that battery saver is on [CHAR LIMIT=30] -->
<string name="condition_battery_title">Battery Saver is on</string>

32
src/com/android/settings/dashboard/conditional/DndCondition.java
View File

@@ -15,9 +15,7 @@
*/
package com.android.settings.dashboard.conditional;
import android.app.ActivityManager;
import android.app.NotificationManager;
import android.app.StatusBarManager;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
@@ -31,6 +29,8 @@ import android.support.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.notification.ZenModeSettings;
public class DndCondition extends Condition {
@@ -80,19 +80,6 @@ public class DndCondition extends Condition {
mZen = bundle.getInt(KEY_STATE, Global.ZEN_MODE_OFF);
}
private CharSequence getZenState() {
switch (mZen) {
case Settings.Global.ZEN_MODE_ALARMS:
return mManager.getContext().getString(R.string.zen_mode_option_alarms);
case Settings.Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:
return mManager.getContext().getString(
R.string.zen_mode_option_important_interruptions);
case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
return mManager.getContext().getString(R.string.zen_mode_option_no_interruptions);
}
return null;
}
@Override
public Icon getIcon() {
return Icon.createWithResource(mManager.getContext(), R.drawable.ic_zen);
@@ -100,17 +87,13 @@ public class DndCondition extends Condition {
@Override
public CharSequence getTitle() {
return mManager.getContext().getString(R.string.condition_zen_title, getZenState());
return mManager.getContext().getString(R.string.condition_zen_title);
}
@Override
public CharSequence getSummary() {
final boolean isForever = mConfig != null && mConfig.manualRule != null
&& mConfig.manualRule.conditionId == null;
return isForever ? mManager.getContext().getString(com.android.internal.R.string.zen_mode_forever_dnd)
: ZenModeConfig.getConditionSummary(mManager.getContext(), mConfig,
ActivityManager.getCurrentUser(),
false);
return ZenModeConfig.getDescription(mManager.getContext(), mZen != Global.ZEN_MODE_OFF,
mConfig);
}
@Override
@@ -120,8 +103,9 @@ public class DndCondition extends Condition {
@Override
public void onPrimaryClick() {
StatusBarManager statusBar = mManager.getContext().getSystemService(StatusBarManager.class);
statusBar.expandSettingsPanel("dnd");
Utils.startWithFragment(mManager.getContext(), ZenModeSettings.class.getName(), null,
null, 0, R.string.zen_mode_settings_title, null,
MetricsEvent.NOTIFICATION_ZEN_MODE);
}
@Override