From fdd294ef4ce89368a1166244a354393c463d7db8 Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Mon, 17 Jul 2017 14:05:08 -0400 Subject: [PATCH] Add separator to auto zen rule listing. Test: manual Change-Id: I9c3549832693d483ec5f0cf72a50909c18483fbb Fixes: 63681398 --- .../android/settings/notification/ZenModeSettings.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index a23eff97518..5e815f83249 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -45,6 +45,7 @@ import android.view.View; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; +import com.android.settingslib.TwoTargetPreference; import java.lang.ref.WeakReference; import java.util.Arrays; @@ -286,7 +287,7 @@ public class ZenModeSettings extends ZenModeSettingsBase { return R.string.help_uri_interruptions; } - private class ZenRulePreference extends Preference { + private class ZenRulePreference extends TwoTargetPreference { final CharSequence mName; final String mId; final boolean appExists; @@ -322,8 +323,11 @@ public class ZenModeSettings extends ZenModeSettingsBase { ComponentName settingsActivity = getSettingsActivity(si); setIntent(getRuleIntent(action, settingsActivity, mId)); setSelectable(settingsActivity != null || isSystemRule); + } - setWidgetLayoutResource(R.layout.zen_rule_widget); + @Override + protected int getSecondTargetResId() { + return R.layout.zen_rule_widget; } @Override