Restore long press power setting back to gestures

The settings menu content will be reworked to be consistent with other gesture entries.

Bug: 191899039
Test: manual
Change-Id: Ia98fed5d9f04a66e22dae747e63e7d1a0bc37fa3
This commit is contained in:
Jernej Virag
2021-06-25 12:11:36 +00:00
parent 52b13e9795
commit 149fb3397c
3 changed files with 6 additions and 34 deletions

View File

@@ -1,26 +0,0 @@
<!--
Copyright (C) 2021 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?android:attr/colorControlNormal">
<path
android:pathData="M11,2h2v10h-2zM18.37,5.64l-1.41,1.41c2.73,2.73 2.72,7.16 -0.01,9.89 -2.73,2.73 -7.17,2.73 -9.89,0.01 -2.73,-2.73 -2.74,-7.18 -0.01,-9.91l-1.41,-1.4c-3.51,3.51 -3.51,9.21 0.01,12.73 3.51,3.51 9.21,3.51 12.72,-0.01 3.51,-3.51 3.51,-9.2 0,-12.72z"
android:fillColor="@android:color/white"/>
</vector>

View File

@@ -86,4 +86,10 @@
android:title="@string/gesture_prevent_ringing_screen_title" android:title="@string/gesture_prevent_ringing_screen_title"
android:fragment="com.android.settings.gestures.PreventRingingGestureSettings" android:fragment="com.android.settings.gestures.PreventRingingGestureSettings"
settings:controller="com.android.settings.gestures.PreventRingingParentPreferenceController" /> 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" />
</PreferenceScreen> </PreferenceScreen>

View File

@@ -43,14 +43,6 @@
android:fragment="com.android.settings.datetime.DateTimeSettings" android:fragment="com.android.settings.datetime.DateTimeSettings"
settings:controller="com.android.settings.datetime.DateTimePreferenceController"/> settings:controller="com.android.settings.datetime.DateTimePreferenceController"/>
<Preference
android:key="gesture_power_menu_summary"
android:title="@string/power_menu_setting_name"
android:icon="@drawable/ic_power_settings"
android:order="-220"
android:fragment="com.android.settings.gestures.PowerMenuSettings"
settings:controller="com.android.settings.gestures.PowerMenuPreferenceController" />
<!-- System updates --> <!-- System updates -->
<Preference <Preference
android:key="additional_system_update_settings" android:key="additional_system_update_settings"