Merge "Move Prevent Ringing gesture underneath power menu" into sc-dev
This commit is contained in:
@@ -81,15 +81,15 @@
|
|||||||
settings:searchable="false"
|
settings:searchable="false"
|
||||||
settings:controller="com.android.settings.gestures.PickupGesturePreferenceController" />
|
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
|
<Preference
|
||||||
android:key="gesture_power_menu_summary"
|
android:key="gesture_power_menu_summary"
|
||||||
android:title="@string/power_menu_setting_name"
|
android:title="@string/power_menu_setting_name"
|
||||||
android:fragment="com.android.settings.gestures.PowerMenuSettings"
|
android:fragment="com.android.settings.gestures.PowerMenuSettings"
|
||||||
settings:controller="com.android.settings.gestures.PowerMenuPreferenceController" />
|
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>
|
</PreferenceScreen>
|
||||||
|
Reference in New Issue
Block a user