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

Commit 3440b952 authored by Fan Zhang's avatar Fan Zhang
Browse files

Remove some emergency setting items scattered in settings 

All these items are displayed in the new Safety & emergency page.

Bug: 175158310
Test: manual
Change-Id: I3e323f2452db6d62aa98c79835c964c1c06a06cf
parent 6f74b9a5

res/xml/gestures.xml

+0 −6
Original line number Diff line number Diff line
@@ -20,12 +20,6 @@ 
    xmlns:settings="http://schemas.android.com/apk/res-auto"

    android:title="@string/gesture_preference_title">



    <Preference

        android:key="gesture_emergency_summary"

        android:title="@string/emergency_gesture_screen_title"

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

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



    <Preference

        android:key="gesture_assist_input_summary"

        android:title="@string/assist_gesture_title"

res/xml/my_device_info.xml

+0 −7
Original line number Diff line number Diff line
@@ -56,13 +56,6 @@ 
        settings:controller="com.android.settings.deviceinfo.PhoneNumberPreferenceController"

        settings:enableCopying="true"/>



    <Preference

        android:key="emergency_info"

        android:order="14"

        android:title="@string/emergency_info_title"

        android:summary="@string/summary_placeholder"

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



    <!-- Legal information -->

    <Preference

        android:key="legal_container"

res/xml/top_level_settings.xml

+6 −7
Original line number Diff line number Diff line
@@ -125,13 +125,12 @@ 
        android:fragment="com.android.settings.accessibility.AccessibilitySettings"

        settings:controller="com.android.settings.accessibility.TopLevelAccessibilityPreferenceController"/>



        <!--    TODO(b/175158310): Enable this tile when the setting content is more flushed out-->

        <!--    <Preference-->

        <!--        android:key="top_level_emergency"-->

        <!--        android:title="@string/emergency_settings_preference_title"-->

        <!--        android:icon="@drawable/ic_homepage_emergency"-->

        <!--        android:order="-10"-->

        <!--        android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>-->

    <Preference

        android:key="top_level_emergency"

        android:title="@string/emergency_settings_preference_title"

        android:icon="@drawable/ic_homepage_emergency"

        android:order="-10"

        android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>



    <Preference

        android:key="top_level_system"

res/xml/top_level_settings_grouped.xml

+8 −7
Original line number Diff line number Diff line
@@ -134,13 +134,14 @@ 
            android:order="-20"

            android:title="@string/security_settings_title"

            settings:controller="com.android.settings.security.TopLevelSecurityEntryPreferenceController"/>

        <!--    TODO(b/175158310): Enable this tile when the setting content is more flushed out-->

        <!--        <Preference-->

        <!--            android:key="top_level_emergency"-->

        <!--            android:title="@string/emergency_settings_preference_title"-->

        <!--            android:icon="@drawable/ic_homepage_emergency"-->

        <!--            android:order="-10"-->

        <!--            android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>-->



        <Preference

            android:key="top_level_emergency"

            android:title="@string/emergency_settings_preference_title"

            android:icon="@drawable/ic_homepage_emergency"

            android:order="-10"

            android:fragment="com.android.settings.emergency.EmergencyDashboardFragment"/>



    </PreferenceCategory>



    <PreferenceCategory