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

Merge "Add separator to auto zen rule listing." into oc-dr1-dev am: afe4ce0927

Browse Source 
am: 92f2cd5055

Change-Id: Iafd82b051b0e2f83dc797338bb121cf72f29c52c
This commit is contained in:
Julia Reynolds
2017-07-19 16:50:55 +00:00
committed by android-build-merger
parent c0cc7feb6e 92f2cd5055
commit 33e8223fe2
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,6 +45,7 @@ import android.view.View;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.TwoTargetPreference;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.Arrays; import java.util.Arrays;
@@ -284,7 +285,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
return R.string.help_uri_interruptions; return R.string.help_uri_interruptions;
} }
private class ZenRulePreference extends Preference { private class ZenRulePreference extends TwoTargetPreference {
final CharSequence mName; final CharSequence mName;
final String mId; final String mId;
final boolean appExists; final boolean appExists;
@@ -320,8 +321,11 @@ public class ZenModeSettings extends ZenModeSettingsBase {
ComponentName settingsActivity = getSettingsActivity(si); ComponentName settingsActivity = getSettingsActivity(si);
setIntent(getRuleIntent(action, settingsActivity, mId)); setIntent(getRuleIntent(action, settingsActivity, mId));
setSelectable(settingsActivity != null || isSystemRule); setSelectable(settingsActivity != null || isSystemRule);
}
setWidgetLayoutResource(R.layout.zen_rule_widget); @Override
protected int getSecondTargetResId() {
return R.layout.zen_rule_widget;
} }
@Override @Override