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

Commit 47e8fbbc authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Choose a pref key less likely to conflict"

parents bf04e65d 99644e20

res/xml/app_notification_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
            android:order="1001"

            settings:restrictedSwitchSummary="@string/enabled_by_admin" />

        <com.android.settingslib.RestrictedSwitchPreference

            android:key="bubble"

            android:key="bubble_pref"

            android:title="@string/notification_bubbles_title"

            android:order="1002"

            settings:restrictedSwitchSummary="@string/enabled_by_admin" />

res/xml/channel_notification_settings.xml

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
            settings:restrictedSwitchSummary="@string/enabled_by_admin"/>



        <com.android.settingslib.RestrictedSwitchPreference

            android:key="bubble"

            android:key="bubble_pref"

            android:title="@string/notification_bubbles_title"

            android:order="16"

            settings:restrictedSwitchSummary="@string/enabled_by_admin" />

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

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ public class BubblePreferenceController extends NotificationPreferenceController 
        implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {



    private static final String TAG = "BubblePrefContr";

    private static final String KEY = "bubble";

    private static final String KEY = "bubble_pref";

    private static final int SYSTEM_WIDE_ON = 1;

    private static final int SYSTEM_WIDE_OFF = 0;