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

Merge "Add a divider line in safety settings" into sc-dev am: 08affe5365

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14114426

Change-Id: I604409b42e5f6097e142809076f925effb517296
This commit is contained in:
TreeHugger Robot
2021-04-08 00:10:46 +00:00
committed by Automerger Merge Worker
parent ffca3330d5 08affe5365
commit 72b65501f1
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/emergency_settings.xml
View File

@@ -25,7 +25,6 @@
android:layout="@layout/more_settings_button" android:layout="@layout/more_settings_button"
android:order="0" android:order="0"
android:selectable="false" android:selectable="false"
settings:allowDividerBelow="true"
settings:controller="com.android.settings.emergency.MoreSettingsPreferenceController" /> settings:controller="com.android.settings.emergency.MoreSettingsPreferenceController" />
<Preference <Preference
android:key="gesture_emergency_summary" android:key="gesture_emergency_summary"
@@ -34,6 +33,10 @@
android:order="100" android:order="100"
android:fragment="com.android.settings.emergency.EmergencyGestureSettings" android:fragment="com.android.settings.emergency.EmergencyGestureSettings"
settings:controller="com.android.settings.emergency.EmergencyGestureEntrypointPreferenceController" /> settings:controller="com.android.settings.emergency.EmergencyGestureEntrypointPreferenceController" />
<PreferenceCategory
android:order="170"
android:layout="@layout/preference_category_no_label"
settings:allowDividerAbove="true"/>
<com.android.settingslib.RestrictedPreference <com.android.settingslib.RestrictedPreference
android:key="app_and_notif_cell_broadcast_settings" android:key="app_and_notif_cell_broadcast_settings"
android:title="@string/cell_broadcast_settings" android:title="@string/cell_broadcast_settings"