PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Settings: Set preference controller for all VideoPreference widget usages" am: 4e04e32679 am: b50fba15b3 am: 15c5be7deb am: 548a4201a8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1475616

Change-Id: Ie81fd135de3208b673aef4deaea93b7e983768e3
This commit is contained in:
Treehugger Robot
2020-10-28 07:48:59 +00:00
committed by Automerger Merge Worker
parent 1915699ddd 548a4201a8
commit f07862473b
10 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/assist_gesture_settings.xml
View File

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

3
res/xml/device_controls_settings.xml
View File

@@ -22,7 +22,8 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="device_controls_video" 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 <SwitchPreference
android:key="gesture_device_controls_switch" android:key="gesture_device_controls_switch"

3
res/xml/double_tap_power_settings.xml
View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="gesture_double_tap_power_video" android:key="gesture_double_tap_power_video"
app:animation="@raw/gesture_double_tap" 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 <SwitchPreference
android:key="gesture_double_tap_power" android:key="gesture_double_tap_power"

3
res/xml/double_tap_screen_settings.xml
View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="gesture_double_tap_screen_video" android:key="gesture_double_tap_screen_video"
app:animation="@raw/gesture_ambient_tap" 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 <SwitchPreference
android:key="gesture_double_tap_screen" android:key="gesture_double_tap_screen"

3
res/xml/double_twist_gesture_settings.xml
View File

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

3
res/xml/global_actions_panel_settings.xml
View File

@@ -22,7 +22,8 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="global_actions_panel_video" 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 <SwitchPreference
android:key="gesture_global_actions_panel_switch" android:key="gesture_global_actions_panel_switch"

3
res/xml/pick_up_gesture_settings.xml
View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="gesture_pick_up_video" android:key="gesture_pick_up_video"
app:animation="@raw/gesture_ambient_lift" 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 <SwitchPreference
android:key="gesture_pick_up" android:key="gesture_pick_up"

3
res/xml/prevent_ringing_gesture_settings.xml
View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="gesture_prevent_ringing_video" android:key="gesture_prevent_ringing_video"
app:animation="@raw/gesture_prevent_ringing" 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 <com.android.settingslib.widget.LayoutPreference
android:key="gesture_prevent_ringing_switch" android:key="gesture_prevent_ringing_switch"

3
res/xml/swipe_to_notification_settings.xml
View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="gesture_swipe_down_fingerprint_video" android:key="gesture_swipe_down_fingerprint_video"
app:animation="@raw/gesture_fingerprint_swipe" 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 <SwitchPreference
android:key="gesture_swipe_down_fingerprint" android:key="gesture_swipe_down_fingerprint"

3
res/xml/tap_screen_gesture_settings.xml
View File

@@ -23,7 +23,8 @@
<com.android.settings.widget.VideoPreference <com.android.settings.widget.VideoPreference
android:key="gesture_tap_screen_video" android:key="gesture_tap_screen_video"
app:animation="@raw/gesture_ambient_tap_screen" 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 <SwitchPreference
android:key="gesture_tap" android:key="gesture_tap"