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

Commit 78cbca8c authored by Fan Zhang's avatar Fan Zhang
Browse files

Add android:order to all emergency setting items 

Each item has a gap of 100 to allow external setting injection choose
where to display.

Bug: 175158310
Test: manual
Change-Id: Icf150ad8fc956c3db391251382b08b5155034a8b
parent fa19722c

res/xml/emergency_settings.xml

+3 −0
Original line number Diff line number Diff line
@@ -23,15 +23,18 @@ 
        android:key="emergency_info"

        android:title="@string/emergency_info_title"

        android:summary="@string/summary_placeholder"

        android:order="0"

        settings:controller="com.android.settings.accounts.EmergencyInfoPreferenceController"/>

    <Preference

        android:key="gesture_emergency_summary"

        android:title="@string/emergency_gesture_screen_title"

        android:order="100"

        android:fragment="com.android.settings.gestures.EmergencyGestureSettings"

        settings:controller="com.android.settings.gestures.EmergencyGestureEntrypointPreferenceController" />

    <com.android.settingslib.RestrictedPreference

        android:key="app_and_notif_cell_broadcast_settings"

        android:title="@string/cell_broadcast_settings"

        android:order="200"

        settings:useAdminDisabledSummary="true">

        <intent

            android:action="android.intent.action.MAIN"

src/com/android/settings/emergency/EmergencyDashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ public class EmergencyDashboardFragment extends DashboardFragment { 


    @Override

    public int getMetricsCategory() {

        return SettingsEnums.EMERGENCY_SOS_GESTURE_SETTINGS;

        return SettingsEnums.EMERGENCY_SETTINGS;

    }



    public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =