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

Commit 4e04e326 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Settings: Set preference controller for all VideoPreference widget usages"

parents c2a4d3ec c6b9c9fa

res/xml/assist_gesture_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
    <com.android.settings.widget.VideoPreference

        android:key="gesture_assist_video"

        app:animation="@raw/gesture_assist"

        app:preview="@drawable/gesture_assist" />

        app:preview="@drawable/gesture_assist"

        app:controller="com.android.settings.widget.VideoPreferenceController" />



    <SwitchPreference

        android:key="gesture_assist"

res/xml/device_controls_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -22,7 +22,8 @@ 


    <com.android.settings.widget.VideoPreference

        android:key="device_controls_video"

        app:animation="@raw/gesture_device_controls"/>

        app:animation="@raw/gesture_device_controls"

        app:controller="com.android.settings.widget.VideoPreferenceController"/>



    <SwitchPreference

        android:key="gesture_device_controls_switch"

res/xml/double_tap_power_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
    <com.android.settings.widget.VideoPreference

        android:key="gesture_double_tap_power_video"

        app:animation="@raw/gesture_double_tap"

        app:preview="@drawable/gesture_double_tap" />

        app:preview="@drawable/gesture_double_tap"

        app:controller="com.android.settings.widget.VideoPreferenceController" />



    <SwitchPreference

        android:key="gesture_double_tap_power"

res/xml/double_tap_screen_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
    <com.android.settings.widget.VideoPreference

        android:key="gesture_double_tap_screen_video"

        app:animation="@raw/gesture_ambient_tap"

        app:preview="@drawable/gesture_ambient_tap" />

        app:preview="@drawable/gesture_ambient_tap"

        app:controller="com.android.settings.widget.VideoPreferenceController" />



    <SwitchPreference

        android:key="gesture_double_tap_screen"

res/xml/double_twist_gesture_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -23,7 +23,8 @@ 
    <com.android.settings.widget.VideoPreference

        android:key="gesture_double_twist_video"

        app:animation="@raw/gesture_twist"

        app:preview="@drawable/gesture_twist" />

        app:preview="@drawable/gesture_twist"

        app:controller="com.android.settings.widget.VideoPreferenceController" />



    <SwitchPreference

        android:key="gesture_double_twist"