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

This commit is contained in:
Treehugger Robot
2020-10-28 06:05:41 +00:00
committed by Gerrit Code Review
10 changed files with 20 additions and 10 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -22,7 +22,8 @@
<com.android.settings.widget.VideoPreference
android:key="global_actions_panel_video"
app:animation="@raw/gesture_global_actions_panel" />
app:animation="@raw/gesture_global_actions_panel"
app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_global_actions_panel_switch"

View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_pick_up_video"
app:animation="@raw/gesture_ambient_lift"
app:preview="@drawable/gesture_ambient_lift" />
app:preview="@drawable/gesture_ambient_lift"
app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_pick_up"

View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_prevent_ringing_video"
app:animation="@raw/gesture_prevent_ringing"
app:preview="@drawable/gesture_prevent_ringing" />
app:preview="@drawable/gesture_prevent_ringing"
app:controller="com.android.settings.widget.VideoPreferenceController" />
<com.android.settingslib.widget.LayoutPreference
android:key="gesture_prevent_ringing_switch"

View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_swipe_down_fingerprint_video"
app:animation="@raw/gesture_fingerprint_swipe"
app:preview="@drawable/gesture_fingerprint_swipe" />
app:preview="@drawable/gesture_fingerprint_swipe"
app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_swipe_down_fingerprint"

View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference
android:key="gesture_tap_screen_video"
app:animation="@raw/gesture_ambient_tap_screen"
app:preview="@drawable/gesture_ambient_tap_screen" />
app:preview="@drawable/gesture_ambient_tap_screen"
app:controller="com.android.settings.widget.VideoPreferenceController" />
<SwitchPreference
android:key="gesture_tap"