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

Commit 4e561fb9 authored by Mehdi Alizadeh's avatar Mehdi Alizadeh Committed by Android (Google) Code Review
Browse files

Merge changes Id2732a94,Id8c01bf0 

* changes:
  Adds a new activity for Gesture Navigation settings
  Adds BackGestureIndicatorView to animate left and right insets
parents 08e1aaf3 03555961

AndroidManifest.xml

+18 −0
Original line number Diff line number Diff line
@@ -3244,6 +3244,24 @@ 
                android:value="com.android.settings.gestures.GlobalActionsPanelSettings" />

        </activity>



        <activity

            android:name="Settings$GestureNavigationSettingsActivity"

            android:label="@string/gesture_settings_activity_title"

            android:enabled="true">

            <intent-filter android:priority="32">

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

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

            </intent-filter>

            <intent-filter android:priority="1">

                <action android:name="com.android.settings.GESTURE_NAVIGATION_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.gestures.GestureNavigationSettingsFragment" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

res/layout/back_gesture_indicator_container.xml

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

<!--

  ~ Copyright (C) 2019 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

  -->



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

              android:orientation="horizontal"

              android:layout_width="match_parent"

              android:layout_height="match_parent">



    <ImageView

        android:layout_width="@dimen/back_gesture_indicator_width"

        android:layout_height="match_parent"

        android:id="@+id/indicator_left">

    </ImageView>



    <Space

        android:layout_width="0dp"

        android:layout_height="0dp"

        android:layout_weight="1" />



    <ImageView

        android:layout_width="@dimen/back_gesture_indicator_width"

        android:layout_height="match_parent"

        android:id="@+id/indicator_right">

    </ImageView>



</LinearLayout>

res/values/colors.xml

+2 −0
Original line number Diff line number Diff line
@@ -146,4 +146,6 @@ 
    <color name="dialog_background">@*android:color/background_device_default_light</color>



    <color name="face_intro_outline">#ffdadce0</color>



    <color name="back_gesture_indicator">#4182ef</color>

</resources>
 
 No newline at end of file

res/values/dimens.xml

+2 −0
Original line number Diff line number Diff line
@@ -403,6 +403,8 @@ 
    <!-- System navigation settings illustration height -->

    <dimen name="system_navigation_illustration_height">320dp</dimen>



    <dimen name="back_gesture_indicator_width">60dp</dimen>



    <!-- Header title size of advanced bluetooth device -->

    <dimen name="advanced_bluetooth_header_title_text_size">16sp</dimen>

res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -10252,6 +10252,9 @@ 
    <!-- Title for the screen to show all the gesture navigation settings [CHAR LIMIT=80] -->

    <string name="gesture_settings_activity_title">Gesture Settings</string>









    <!-- Keywords for the gesture navigation settings. [CHAR LIMIT=NONE] -->









    <string name="keywords_gesture_navigation_settings">gesture navigation, back sensitivity, back gesture</string>

















    <!-- Preference and settings suggestion title text for ambient display double tap (phone) [CHAR LIMIT=60]-->









    <string name="ambient_display_title" product="default">Double-tap to check phone</string>









    <!-- Preference and settings suggestion title text for ambient display double tap (tablet) [CHAR LIMIT=60]-->