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

Commit 7746cd94 authored by Antony Sargent's avatar Antony Sargent Committed by android-build-merger
Browse files

Merge "Layout changes for new animation assets" into pi-dev 

am: 10e91c7e

Change-Id: Iac67bda32c2e545480c8d3439f5659f8e1a30f65
parents 7d4a11e3 10e91c7e

res/drawable-nodpi/gesture_swipe_up.png

−5.13 KiB (19.6 KiB)
Loading image diff...

res/raw/gesture_swipe_up.mp4

−77.1 KiB (406 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

res/values/colors.xml

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ 
    <color name="usage_graph_dots">#B0BEC5</color>



    <!-- Gestures settings -->

    <color name="gestures_setting_background_color">#f4f4f4</color>

    <color name="gestures_setting_background_color">#ffffff</color>



    <color name="status_bar_color">#3c3c3c</color>

res/xml/assist_gesture_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
        android:key="gesture_assist"

        android:title="@string/assist_gesture_title"

        app:keywords="@string/keywords_assist_gesture_launch"

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

        app:controller="com.android.settings.gestures.AssistGestureSettingsPreferenceController"

        app:allowDividerAbove="true" />



</PreferenceScreen>

res/xml/auto_brightness_detail.xml

+2 −1
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ 
        settings:keywords="@string/keywords_display_auto_brightness"

        settings:controller="com.android.settings.display.AutoBrightnessPreferenceController"

        settings:useAdminDisabledSummary="true"

        settings:userRestriction="no_config_brightness" />

        settings:userRestriction="no_config_brightness"

        settings:allowDividerAbove="true" />



</PreferenceScreen>
 
 No newline at end of file