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

Commit 476edca9 authored by Jernej Virag's avatar Jernej Virag Committed by Automerger Merge Worker
Browse files

Merge "Restore long press power setting back to gestures" into sc-dev am: 6b1b210b 

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

Change-Id: I39dd402b213a7fe096ec94c765c8cc381535331c
parents eda3ba01 6b1b210b

res/drawable/ic_power_settings.xml

deleted100644 → 0
+0 −26
Original line number Diff line number Diff line 
<!--

    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>
 
 No newline at end of file

res/xml/gestures.xml

+6 −0
Original line number Diff line number Diff line
@@ -86,4 +86,10 @@ 
        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" />

</PreferenceScreen>

res/xml/system_dashboard_fragment.xml

+0 −8
Original line number Diff line number Diff line
@@ -43,14 +43,6 @@ 
        android:fragment="com.android.settings.datetime.DateTimeSettings"

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

    <Preference

        android:key="additional_system_update_settings"