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

Commit 9b3000d8 authored by Doris Ling's avatar Doris Ling
Browse files

Revert change to move Display->Ambient Display to Moves->Quick screen 

check.

1. Add back original toggle for Display->Ambient Display and revert
summary text.
2. Remove Moves->Quick screen check preference and related scroll logic.
3. Remove ambient display related animation videos

Bug: 30686297
Change-Id: Ie01a201f0a8deb0a858bc2a7f9cc607b749ab6e4
parent b727e9ca

res/raw/gesture_ambient_move_lift.mp4

deleted100644 → 0
+0 −0

Empty file deleted.

res/raw/gesture_ambient_tap.mp4

deleted100644 → 0
+0 −0

Empty file deleted.

res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -2214,7 +2214,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 double-tap it or get new notifications. See how</string>

    <string name="doze_summary">Wake screen when you receive notifications</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

+3 −12
Original line number Diff line number Diff line
@@ -79,19 +79,10 @@ 
                android:key="lift_to_wake"

                android:title="@string/lift_to_wake_title" />



        <PreferenceScreen

        <SwitchPreference

                android:key="doze"

                android:title="@string/ambient_display_title"

                android:summary="@string/doze_summary" >

                <intent

                    android:targetPackage="com.android.settings"

                    android:targetClass="com.android.settings.Settings$GestureSettingsActivity" >

                    <extra android:name="show_drawer_menu"

                           android:value="true" />

                    <extra android:name="gesture_scroll_to_preference"

                           android:value="gesture_pick_up_and_nudge" />

                </intent>

        </PreferenceScreen>

                android:title="@string/doze_title"

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



        <SwitchPreference

                android:key="tap_to_wake"

res/xml/gesture_settings.xml

+0 −6
Original line number Diff line number Diff line
@@ -37,10 +37,4 @@ 
        android:summary="@string/double_twist_for_camera_mode_summary"

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



    <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"/>



</PreferenceScreen>
 
 No newline at end of file