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

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

Change-Id: I297a6b96c6b5360223e7c2fef8ce752a2e9a3404
This commit is contained in:
Jernej Virag
2021-07-02 09:08:05 +00:00
committed by Automerger Merge Worker

View File

@@ -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>