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

Commit 6167aef9 authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev... 

Merge "Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev am: 555d127a am: 54a1f7b6" into sc-v2-dev-plus-aosp
parents 4972f090 e51c86ba

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>