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

Merge "Add android:order to all emergency setting items"

Browse Source
This commit is contained in:
Fan Zhang
2021-01-11 16:52:11 +00:00
committed by Android (Google) Code Review
parent ed9df99790 78cbca8cbd
commit 1447ed1fa5
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/emergency_settings.xml
View File

@@ -23,15 +23,18 @@
android:key="emergency_info" android:key="emergency_info"
android:title="@string/emergency_info_title" android:title="@string/emergency_info_title"
android:summary="@string/summary_placeholder" android:summary="@string/summary_placeholder"
android:order="0"
settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/> settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/>
<Preference <Preference
android:key="gesture_emergency_summary" android:key="gesture_emergency_summary"
android:title="@string/emergency_gesture_screen_title" android:title="@string/emergency_gesture_screen_title"
android:order="100"
android:fragment="com.android.settings.gestures.EmergencyGestureSettings" android:fragment="com.android.settings.gestures.EmergencyGestureSettings"
settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" /> settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />
<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"
android:order="200"
settings:useAdminDisabledSummary="true"> settings:useAdminDisabledSummary="true">
<intent <intent
android:action="android.intent.action.MAIN" android:action="android.intent.action.MAIN"

2
src/com/android/settings/emergency/EmergencyDashboardFragment.java
View File

@@ -44,7 +44,7 @@ public class EmergencyDashboardFragment extends DashboardFragment {
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return SettingsEnums.EMERGENCY_SOS_GESTURE_SETTINGS; return SettingsEnums.EMERGENCY_SETTINGS;
} }
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER = public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =