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

Merge "DND string fixes"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-01-10 00:45:24 +00:00
committed by Android (Google) Code Review
parent c8a34adc18 02b81c137e
commit 2d1bdd8de4
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/zen_mode_behavior_settings.xml
View File

@@ -61,7 +61,7 @@
<!-- Repeat callers --> <!-- Repeat callers -->
<SwitchPreference <SwitchPreference
android:key="zen_mode_repeat_callers" android:key="zen_mode_repeat_callers"
android:title="@string/zen_mode_repeat_callers"/> android:title="@string/zen_mode_repeat_callers" />
</PreferenceCategory> </PreferenceCategory>

4
src/com/android/settings/notification/ZenModeBehaviorSettings.java
View File

@@ -45,7 +45,9 @@ public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Inde
controllers.add(new ZenModeRemindersPreferenceController(context, lifecycle)); controllers.add(new ZenModeRemindersPreferenceController(context, lifecycle));
controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle)); controllers.add(new ZenModeMessagesPreferenceController(context, lifecycle));
controllers.add(new ZenModeCallsPreferenceController(context, lifecycle)); controllers.add(new ZenModeCallsPreferenceController(context, lifecycle));
controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle)); controllers.add(new ZenModeRepeatCallersPreferenceController(context, lifecycle,
context.getResources().getInteger(com.android.internal.R.integer
.config_zen_repeat_callers_threshold)));
controllers.add(new ZenModeScreenOnPreferenceController(context, lifecycle)); controllers.add(new ZenModeScreenOnPreferenceController(context, lifecycle));
controllers.add(new ZenModeScreenOffPreferenceController(context, lifecycle)); controllers.add(new ZenModeScreenOffPreferenceController(context, lifecycle));
controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle)); controllers.add(new ZenModeBehaviorFooterPreferenceController(context, lifecycle));

23
src/com/android/settings/notification/ZenModeRepeatCallersPreferenceController.java
View File

@@ -21,9 +21,11 @@ import android.content.Context;
import android.provider.Settings; import android.provider.Settings;
import android.support.v14.preference.SwitchPreference; import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference; import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
import android.util.Log; import android.util.Log;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.core.lifecycle.Lifecycle;
public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePreferenceController
@@ -31,8 +33,15 @@ public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePre
protected static final String KEY = "zen_mode_repeat_callers"; protected static final String KEY = "zen_mode_repeat_callers";
public ZenModeRepeatCallersPreferenceController(Context context, Lifecycle lifecycle) { private final ZenModeBackend mBackend;
private final int mRepeatCallersThreshold;
public ZenModeRepeatCallersPreferenceController(Context context, Lifecycle lifecycle,
int repeatCallersThreshold) {
super(context, KEY, lifecycle); super(context, KEY, lifecycle);
mRepeatCallersThreshold = repeatCallersThreshold;
mBackend = ZenModeBackend.getInstance(context);
} }
@Override @Override
@@ -45,12 +54,17 @@ public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePre
return true; return true;
} }
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
setRepeatCallerSummary(screen.findPreference(KEY));
}
@Override @Override
public void updateState(Preference preference) { public void updateState(Preference preference) {
super.updateState(preference); super.updateState(preference);
SwitchPreference pref = (SwitchPreference) preference; SwitchPreference pref = (SwitchPreference) preference;
switch (getZenMode()) { switch (getZenMode()) {
case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS: case Settings.Global.ZEN_MODE_NO_INTERRUPTIONS:
case Settings.Global.ZEN_MODE_ALARMS: case Settings.Global.ZEN_MODE_ALARMS:
@@ -84,4 +98,9 @@ public class ZenModeRepeatCallersPreferenceController extends AbstractZenModePre
mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allowRepeatCallers); mBackend.saveSoundPolicy(Policy.PRIORITY_CATEGORY_REPEAT_CALLERS, allowRepeatCallers);
return true; return true;
} }
private void setRepeatCallerSummary(Preference preference) {
preference.setSummary(mContext.getString(R.string.zen_mode_repeat_callers_summary,
mRepeatCallersThreshold));
}
} }

3
tests/robotests/src/com/android/settings/notification/ZenModeRepeatCallersPreferenceControllerTest.java
View File

@@ -78,7 +78,8 @@ public class ZenModeRepeatCallersPreferenceControllerTest {
mContentResolver = RuntimeEnvironment.application.getContentResolver(); mContentResolver = RuntimeEnvironment.application.getContentResolver();
when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy); when(mNotificationManager.getNotificationPolicy()).thenReturn(mPolicy);
mController = new ZenModeRepeatCallersPreferenceController(mContext, mock(Lifecycle.class)); mController = new ZenModeRepeatCallersPreferenceController(mContext, mock(Lifecycle.class),
15);
ReflectionHelpers.setField(mController, "mBackend", mBackend); ReflectionHelpers.setField(mController, "mBackend", mBackend);
when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn( when(mPreferenceScreen.findPreference(mController.getPreferenceKey())).thenReturn(