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

Commit 3e0ae4ed authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add settings for the assist gesture."

parents ad36812e a9831d40

res/drawable-nodpi/gesture_assist

0 → 100644
+0 −0

Empty file added.

res/raw/gesture_assist.mp4

0 → 100644
+0 −0

Empty file added.

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -8034,6 +8034,12 @@ 
    <!-- Summary text for fingerprint swipe for notifications (device) [CHAR LIMIT=160]-->

    <string name="fingerprint_swipe_for_notifications_summary" product="device">To check your notifications, swipe down on the fingerprint sensor on the back of your device.</string>









    <!-- Title text for the assist gesture [CHAR LIMIT=60]-->









    <string name="assist_gesture_title">Assist gesture</string>

















    <!-- Summary text for the assist gesture [CHAR LIMIT=160]-->









    <string name="assist_gesture_summary"></string>

















    <!-- Switch text for each gesture setting state -->









    <string name="gesture_setting_on">On</string>









    <string name="gesture_setting_off">Off</string>

























res/xml/assist_gesture_settings.xml
0 → 100644



+32
−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"









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









                  android:title="@string/assist_gesture_title">



















    <com.android.settings.widget.VideoPreference









        android:key="gesture_assist_video"









        app:animation="@raw/gesture_assist"









        app:preview="@drawable/gesture_assist" />



















    <SwitchPreference









        android:key="gesture_assist"









        android:title="@string/assist_gesture_title"









        android:summary="@string/assist_gesture_summary" />



















</PreferenceScreen>
























res/xml/gesture_settings.xml



+8
−1






























Original line number
Diff line number
Diff line







@@ -19,6 +19,13 @@







    android:title="@string/gesture_preference_title"









    settings:keywords="@string/keywords_gesture">



















    <com.android.settings.gestures.GesturePreference









        android:key="gesture_assist"









        android:title="@string/assist_gesture_title"









        android:summary="@string/assist_gesture_summary"









        settings:animation="@raw/gesture_assist"









        settings:preview="@drawable/gesture_assist"/>



















    <com.android.settings.gestures.GesturePreference









        android:key="gesture_swipe_down_fingerprint"









        android:title="@string/fingerprint_swipe_for_notifications_title"