Merge "Choose a pref key less likely to conflict"
This commit is contained in:
committed by
Android (Google) Code Review
commit
47e8fbbcee
@@ -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" />
|
||||
|
||||
@@ -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" />
|
||||
|
||||
Reference in New Issue
Block a user