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

Commit 22176641 authored by Doris Ling's avatar Doris Ling Committed by Android (Google) Code Review
Browse files

Merge "Update preference ordering in Gestures settings." into nyc-mr1-dev

parents 4410b6b6 1093b24c

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2207,7 +2207,7 @@ 
    <!-- [CHAR LIMIT=30] Display settings screen, setting option name to change whether the ambient display feature is enabled. -->

    <string name="doze_title">Ambient display</string>

    <!-- [CHAR LIMIT=NONE] Display settings screen, setting description for the ambient display feature. -->

    <string name="doze_summary">Wake screen when you pick up device or receive notifications</string>

    <string name="doze_summary">Wake screen when you double-tap it or get new notifications. See how</string>

    <!-- [CHAR LIMIT=30] Sound & display settings screen, setting option name to change font size -->

    <string name="title_font_size">Font size</string>

    <!-- Summary for Font size. Lets the user know that this will make text larger or smaller. Appears in the accessibility portion of setup wizard. [CHAR LIMIT=NONE] -->

res/xml/display_settings.xml

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

                android:key="doze"

                android:title="@string/doze_title"

                android:summary="@string/ambient_display_summary"

                android:summary="@string/doze_summary"

                android:fragment="com.android.settings.gestures.GestureSettings" >

                <extra android:name="gesture_scroll_to_preference"

                       android:value="gesture_pick_up_and_nudge" />

res/xml/gesture_settings.xml

+6 −6
Original line number Diff line number Diff line
@@ -31,16 +31,16 @@ 
        android:summary="@string/double_twist_for_camera_mode_summary"

        settings:animation="@raw/gesture_twist"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_swipe_down_fingerprint"

        android:title="@string/fingerprint_swipe_for_notifications_title"

        android:summary="@string/fingerprint_swipe_for_notifications_summary"

        settings:animation="@raw/gesture_fingerprint_swipe"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_pick_up_and_nudge"

        android:title="@string/ambient_display_title"

        android:summary="@string/ambient_display_summary"

        settings:animation="@raw/gesture_ambient_tap"/>



    <com.android.settings.gestures.GesturePreference

        android:key="gesture_swipe_down_fingerprint"

        android:title="@string/fingerprint_swipe_for_notifications_title"

        android:summary="@string/fingerprint_swipe_for_notifications_summary"

        settings:animation="@raw/gesture_fingerprint_swipe"/>



</PreferenceScreen>
 
 No newline at end of file