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

Commit e8109117 authored by Fan Zhang's avatar Fan Zhang
Browse files

Default emergency gesture setting On. 

And a few drive-by fixes:
* Move all emergency gesture fragments and controllers to emergency
  package for better code colocation.
* Remove the placeholder video preference from emergency_gesture_settings.xml

Bug: 178009196
Test: reran robotests
Change-Id: Ifcb591e7ab8e5e5494c480cbbe9410c08c296f8e
parent a3479932

res/xml/emergency_gesture_settings.xml

+5 −9
Original line number Diff line number Diff line
@@ -22,15 +22,11 @@ 


    <com.android.settingslib.widget.MainSwitchPreference

        android:key="gesture_emergency_button_switch_bar"

        app:controller="com.android.settings.gestures.EmergencyGesturePreferenceController" />



    <com.android.settings.widget.VideoPreference

        android:key="emergency_gesture_screen_video"

        app:animation="@raw/gesture_double_tap"

        app:preview="@drawable/gesture_double_tap"/>

        app:controller="com.android.settings.emergency.EmergencyGesturePreferenceController" />



    <com.android.settingslib.widget.TopIntroPreference

        android:title="@string/emergency_gesture_screen_summary"

        app:allowDividerAbove="false"

        app:allowDividerBelow="true" />



    <SwitchPreference
@@ -39,10 +35,10 @@ 
        android:title="@string/emergency_gesture_sound_setting_title"

        android:summary="@string/emergency_gesture_sound_setting_summary"

        app:keywords="@string/keywords_gesture"

        app:controller="com.android.settings.gestures.EmergencyGestureSoundPreferenceController"

        app:controller="com.android.settings.emergency.EmergencyGestureSoundPreferenceController"

        app:allowDividerAbove="true"/>



    <com.android.settings.gestures.EmergencyGestureNumberOverridePreference

    <com.android.settings.emergency.EmergencyGestureNumberOverridePreference

        android:key="emregency_gesture_number_override"

        android:title="@string/emergency_gesture_call_for_help_title"

        android:summary="@string/summary_placeholder"
@@ -51,5 +47,5 @@ 
        android:dialogLayout="@layout/emergency_gesture_number_override_dialog"

        android:positiveButtonText="@string/save"

        app:allowDividerAbove="true"

        app:controller="com.android.settings.gestures.EmergencyGestureNumberOverridePreferenceController"/>

        app:controller="com.android.settings.emergency.EmergencyGestureNumberOverridePreferenceController"/>

</PreferenceScreen>

res/xml/emergency_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ 
        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" />

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

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

    <com.android.settingslib.RestrictedPreference

        android:key="app_and_notif_cell_broadcast_settings"

        android:title="@string/cell_broadcast_settings"

src/com/android/settings/gestures/EmergencyGestureEntrypointPreferenceController.java→src/com/android/settings/emergency/EmergencyGestureEntrypointPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.gestures;

package com.android.settings.emergency;



import android.content.Context;

import android.content.Intent;

src/com/android/settings/gestures/EmergencyGestureNumberOverridePreference.java→src/com/android/settings/emergency/EmergencyGestureNumberOverridePreference.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.gestures;

package com.android.settings.emergency;



import static android.content.DialogInterface.BUTTON_POSITIVE;

src/com/android/settings/gestures/EmergencyGestureNumberOverridePreferenceController.java→src/com/android/settings/emergency/EmergencyGestureNumberOverridePreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.settings.gestures;

package com.android.settings.emergency;



import static com.android.settingslib.emergencynumber.EmergencyNumberUtils.EMERGENCY_NUMBER_OVERRIDE_AUTHORITY;