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

Commit 3b686f77 authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Wake screen gesture"

parents c3d1d336 8e57afb2

res/drawable-nodpi/gesture_ambient_wake_screen

0 → 100644
+0 −0

Empty file added.

res/raw/gesture_ambient_wake_screen.mp4

0 → 100644
+0 −0

Empty file added.

res/values/strings.xml

+5 −0
Original line number Diff line number Diff line
@@ -9576,6 +9576,11 @@ 
    <!-- Preference and settings suggestion title text for ambient display pick up (device) [CHAR LIMIT=60]-->

    <string name="ambient_display_pickup_title" product="device">Lift to check device</string>









    <!-- Preference and settings suggestion title text for display wake-up gesture [CHAR LIMIT=60]-->









    <string name="ambient_display_wake_screen_title">Wake up display</string>









    <!-- Summary text for ambient display wake-up gesture [CHAR LIMIT=NONE]-->









    <string name="ambient_display_wake_screen_summary"></string>

















    <!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->









    <string name="ambient_display_pickup_summary" product="default">To check time, notifications, and other info, pick up your phone.</string>









    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=NONE]-->

























res/xml/gestures.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -27,6 +27,12 @@







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









        settings:controller="com.android.settings.gestures.AssistGestureSettingsPreferenceController" />



















    <Preference









        android:key="gesture_wake_screen_input_summary"









        android:title="@string/ambient_display_wake_screen_title"









        android:fragment="com.android.settings.gestures.WakeScreenGestureSettings"









        settings:controller="com.android.settings.gestures.WakeScreenGesturePreferenceController" />



















    <Preference









        android:key="gesture_wake_lock_screen_summary"









        android:title="@string/ambient_display_wake_lock_screen_title"
































res/xml/security_lockscreen_settings.xml



+6
−0






























Original line number
Diff line number
Diff line







@@ -70,6 +70,12 @@







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









            settings:controller="com.android.settings.gestures.PickupGesturePreferenceController" />



















        <Preference









            android:key="ambient_display_wake_screen"









            android:title="@string/ambient_display_wake_screen_title"









            android:fragment="com.android.settings.gestures.WakeScreenGestureSettings"









            settings:controller="com.android.settings.gestures.WakeScreenGesturePreferenceController" />



















        <SwitchPreference









            android:key="ambient_display_notification"









            android:title="@string/doze_title"