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

Commit 204ca743 authored by Doris Ling's avatar Doris Ling Committed by Fan Zhang
Browse files

Move Gesture settings up one level. 

Move System->Languages, input & gestures->Gestures to System->Gestures.

Change-Id: Ie81876208383f69ebf1a0465d76c760d7dd9d95d
Fix: 62276882
Test: make RunSettingsRoboTests
(cherry picked from commit 55ce7de7)
parent b49578e4

AndroidManifest.xml

+6 −6
Original line number Diff line number Diff line
@@ -557,7 +557,7 @@ 
        </activity>



        <activity android:name=".Settings$LanguageAndInputSettingsActivity"

            android:label="@string/language_input_gesture_title"

            android:label="@string/language_settings"

            android:icon="@drawable/ic_settings_language"

            android:taskAffinity="com.android.settings"

            android:parentActivityName="Settings$SystemDashboardActivity">
@@ -3211,7 +3211,7 @@ 
        <activity

            android:name=".Settings$DoubleTapPowerSuggestionActivity"

            android:label="@string/double_tap_power_for_camera_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3233,7 +3233,7 @@ 
        <activity

            android:name=".Settings$DoubleTwistSuggestionActivity"

            android:label="@string/double_twist_for_camera_mode_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3255,7 +3255,7 @@ 
        <activity

            android:name=".Settings$AmbientDisplaySuggestionActivity"

            android:label="@string/ambient_display_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3277,7 +3277,7 @@ 
        <activity

            android:name=".Settings$AmbientDisplayPickupSuggestionActivity"

            android:label="@string/ambient_display_pickup_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />
@@ -3299,7 +3299,7 @@ 
        <activity

            android:name=".Settings$SwipeToNotificationSuggestionActivity"

            android:label="@string/fingerprint_swipe_for_notifications_title"

            android:icon="@drawable/ic_suggestion_gesture">

            android:icon="@drawable/ic_settings_gestures">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="com.android.settings.suggested.category.GESTURE" />

res/drawable/ic_settings_gestures.xml

+6 −3
Original line number Diff line number Diff line
@@ -16,10 +16,13 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:viewportWidth="32.0"

        android:viewportHeight="32.0"

        android:tint="?android:attr/colorControlNormal">

    <path

        android:fillColor="#FF000000"

        android:pathData="M9,11.24L9,7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5c0,1.56 0.79,2.93 2,3.74zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11L13,13.5v-6c0,-0.83 -0.67,-1.5 -1.5,-1.5S10,6.67 10,7.5v10.74l-3.43,-0.72c-0.08,-0.01 -0.15,-0.03 -0.24,-0.03 -0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8 4.94,4.94c0.27,0.27 0.65,0.44 1.06,0.44h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2 0,-0.62 -0.38,-1.16 -0.91,-1.38z"/>

        android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>

    <path

        android:fillColor="#FF000000"

        android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_suggestion_gesture.xml

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

    Copyright (C) 2017 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="32.0"

    android:viewportHeight="32.0"

    android:autoMirrored="true">

    <path

        android:fillColor="@color/material_grey_600"

        android:pathData="M20,20.2V24H6V5.3h8.7l2.4,-4H7.6c-2.2,0 -4,1.8 -4,4v21.3c0,2.2 1.8,4 4,4h10.7c2.2,0 4,-1.8 4,-4V14.9L20,20.2zM15.6,28h-5.3v-1.3h5.3V28z"/>

    <path

        android:fillColor="@color/material_grey_600"

        android:pathData="M28.5,7l1.1,-2.4L32,3.5l-2.4,-1.1L28.5,0l-1.1,2.4L25,3.5l2.4,1.1L28.5,7zM21,7.4l-2.2,-4.8l-2.2,4.8l-4.8,2.2l4.8,2.2l2.2,4.8l2.2,-4.8l4.8,-2.2L21,7.4zM28.5,12.2l-1.1,2.4L25,15.6l2.4,1.1l1.1,2.4l1.1,-2.4l2.4,-1.1l-2.4,-1.1L28.5,12.2z"/>

</vector>

res/xml/gestures.xml

0 → 100644
+52 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2017 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.

  -->



<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:title="@string/gesture_preference_title" >



    <Preference

        android:key="gesture_assist_input_summary"

        android:title="@string/assist_gesture_title"

        android:fragment="com.android.settings.gestures.AssistGestureSettings" />



    <Preference

        android:key="gesture_swipe_down_fingerprint_input_summary"

        android:title="@string/fingerprint_swipe_for_notifications_title"

        android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />



    <Preference

        android:key="gesture_double_tap_power_input_summary"

        android:title="@string/double_tap_power_for_camera_title"

        android:fragment="com.android.settings.gestures.DoubleTapPowerSettings" />



    <Preference

        android:key="gesture_double_twist_input_summary"

        android:title="@string/double_twist_for_camera_mode_title"

        android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings" />



    <Preference

        android:key="gesture_double_tap_screen_input_summary"

        android:title="@string/ambient_display_title"

        android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />



    <Preference

        android:key="gesture_pick_up_input_summary"

        android:title="@string/ambient_display_pickup_title"

        android:fragment="com.android.settings.gestures.PickupGestureSettings" />



</PreferenceScreen>

res/xml/language_and_input.xml

+1 −38
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<PreferenceScreen

    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"

    android:title="@string/language_input_gesture_title" >

    android:title="@string/language_settings" >



    <Preference

        android:key="phone_language"
@@ -62,43 +62,6 @@ 
            android:title="@string/user_dict_settings_title"/>

    </PreferenceCategory>



    <PreferenceCategory

        android:key="gesture_settings_category"

        android:title="@string/gesture_preference_title"

        settings:keywords="@string/keywords_gesture">



        <Preference

            android:key="gesture_assist_input_summary"

            android:title="@string/assist_gesture_title"

            android:fragment="com.android.settings.gestures.AssistGestureSettings" />



        <Preference

            android:key="gesture_swipe_down_fingerprint_input_summary"

            android:title="@string/fingerprint_swipe_for_notifications_title"

            android:fragment="com.android.settings.gestures.SwipeToNotificationSettings" />



        <Preference

            android:key="gesture_double_tap_screen_input_summary"

            android:title="@string/ambient_display_title"

            android:fragment="com.android.settings.gestures.DoubleTapScreenSettings" />



        <Preference

            android:key="gesture_pick_up_input_summary"

            android:title="@string/ambient_display_pickup_title"

            android:fragment="com.android.settings.gestures.PickupGestureSettings" />



        <Preference

            android:key="gesture_double_tap_power_input_summary"

            android:title="@string/double_tap_power_for_camera_title"

            android:fragment="com.android.settings.gestures.DoubleTapPowerSettings" />



        <Preference

            android:key="gesture_double_twist_input_summary"

            android:title="@string/double_twist_for_camera_mode_title"

            android:fragment="com.android.settings.gestures.DoubleTwistGestureSettings" />



    </PreferenceCategory>



    <PreferenceCategory>



        <com.android.settings.PointerSpeedPreference