Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit afe4ce09 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

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

parents f21bc100 fdd294ef

src/com/android/settings/notification/ZenModeSettings.java

+6 −2
Original line number Original line Diff line number Diff line
@@ -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;
@@ -286,7 +287,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;
@@ -322,8 +323,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