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

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

Merge "Prepare gesture to be overlayed"

parents 1a15a361 e315963b
Loading
Loading
Loading
Loading
+0 −0

Empty file added.

+0 −0

Empty file added.

+4 −13
Original line number Diff line number Diff line
@@ -9581,19 +9581,10 @@
    <!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
    <string name="ambient_display_pickup_summary" product="device">To check time, notifications, and other info, pick up your device.</string>
    <!-- Preference and settings suggestion title text for reach gesture (phone) [CHAR LIMIT=60]-->
    <string name="ambient_display_reach_title" product="default">Reach to check phone</string>
    <!-- Preference and settings suggestion title text for reach gesture (tablet) [CHAR LIMIT=60]-->
    <string name="ambient_display_reach_title" product="tablet">Reach to check tablet</string>
    <!-- Preference and settings suggestion title text for reach gesture (device) [CHAR LIMIT=60]-->
    <string name="ambient_display_reach_title" product="device">Reach to check device</string>
    <!-- Summary text for ambient display (phone) [CHAR LIMIT=NONE]-->
    <string name="ambient_display_reach_summary" product="default">To check time, notifications, and other info, reach for your phone.</string>
    <!-- Summary text for ambient display (tablet) [CHAR LIMIT=NONE]-->
    <string name="ambient_display_reach_summary" product="tablet">To check time, notifications, and other info, reach for your tablet.</string>
    <!-- Summary text for ambient display (device) [CHAR LIMIT=NONE]-->
    <string name="ambient_display_reach_summary" product="device">To check time, notifications, and other info, reach for your device.</string>
    <!-- Preference and settings suggestion title text for reach gesture [CHAR LIMIT=60]-->
    <string name="ambient_display_reach_title">Reach gesture</string>
    <!-- Summary text for ambient display [CHAR LIMIT=NONE]-->
    <string name="ambient_display_reach_summary" product="default"></string>
    <!-- Title text for swiping downwards on fingerprint sensor for notifications [CHAR LIMIT=80]-->
    <string name="fingerprint_swipe_for_notifications_title">Swipe fingerprint for notifications</string>
+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_reach_summary"
        android:title="@string/ambient_display_reach_title"
        android:fragment="com.android.settings.gestures.ReachGestureSettings"
        settings:controller="com.android.settings.gestures.ReachGesturePreferenceController" />

    <Preference
        android:key="gesture_swipe_down_fingerprint_input_summary"
        android:title="@string/fingerprint_swipe_for_notifications_title"
+2 −2
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@

    <com.android.settings.widget.VideoPreference
        android:key="gesture_reach_video"
        app:animation="@raw/gesture_ambient_lift"
        app:preview="@drawable/gesture_ambient_lift" />
        app:animation="@raw/gesture_ambient_reach"
        app:preview="@drawable/gesture_ambient_reach" />

    <SwitchPreference
        android:key="gesture_reach"