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

Commit 54a1f7b6 authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127a 

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

Change-Id: Id323fd7afeef2718283ca765265ad0e895967ca1
parents ada2302b 555d127a

res/xml/gestures.xml

+6 −6
Original line number Diff line number Diff line
@@ -81,15 +81,15 @@ 
        settings:searchable="false"

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



    <com.android.settings.widget.PrimarySwitchPreference

        android:key="gesture_prevent_ringing_summary"

        android:title="@string/gesture_prevent_ringing_screen_title"

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

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



    <Preference

        android:key="gesture_power_menu_summary"

        android:title="@string/power_menu_setting_name"

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

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



    <com.android.settings.widget.PrimarySwitchPreference

        android:key="gesture_prevent_ringing_summary"

        android:title="@string/gesture_prevent_ringing_screen_title"

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

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

</PreferenceScreen>