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

Merge "Choose a pref key less likely to conflict"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-16 02:54:25 +00:00
committed by Android (Google) Code Review
parent bf04e65d39 99644e2098
commit 47e8fbbcee
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/xml/app_notification_settings.xml
View File

@@ -61,7 +61,7 @@
android:order="1001" android:order="1001"
settings:restrictedSwitchSummary="@string/enabled_by_admin" /> settings:restrictedSwitchSummary="@string/enabled_by_admin" />
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="bubble" android:key="bubble_pref"
android:title="@string/notification_bubbles_title" android:title="@string/notification_bubbles_title"
android:order="1002" android:order="1002"
settings:restrictedSwitchSummary="@string/enabled_by_admin" /> settings:restrictedSwitchSummary="@string/enabled_by_admin" />

2
res/xml/channel_notification_settings.xml
View File

@@ -95,7 +95,7 @@
settings:restrictedSwitchSummary="@string/enabled_by_admin"/> settings:restrictedSwitchSummary="@string/enabled_by_admin"/>
<com.android.settingslib.RestrictedSwitchPreference <com.android.settingslib.RestrictedSwitchPreference
android:key="bubble" android:key="bubble_pref"
android:title="@string/notification_bubbles_title" android:title="@string/notification_bubbles_title"
android:order="16" android:order="16"
settings:restrictedSwitchSummary="@string/enabled_by_admin" /> settings:restrictedSwitchSummary="@string/enabled_by_admin" />

2
src/com/android/settings/notification/BubblePreferenceController.java
View File

@@ -30,7 +30,7 @@ public class BubblePreferenceController extends NotificationPreferenceController
implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener { implements PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
private static final String TAG = "BubblePrefContr"; 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_ON = 1;
private static final int SYSTEM_WIDE_OFF = 0; private static final int SYSTEM_WIDE_OFF = 0;