Merge "Add animation to button navigation settings page" into tm-dev am: 77c4aab5d5

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17074572

Change-Id: I70681bf6cca0e8cdf3e4d164b72e6029a19d0d4e
This commit is contained in:
Jernej Virag
2022-03-08 20:09:08 +00:00
committed by Automerger Merge Worker
4 changed files with 21 additions and 17 deletions

View File

@@ -21,19 +21,20 @@
android:title="@string/button_navigation_settings_activity_title"
settings:keywords="@string/keywords_button_navigation_settings">
<PreferenceCategory
android:key="assistant_button_navigation_category"
android:persistent="false"
android:title="@string/assistant_gesture_category_title">
<!-- Animation uses embedded PNGs and lottie requires asset folder to be set despite
embedding. -->
<com.android.settingslib.widget.IllustrationPreference
android:key="gesture_power_menu_video"
settings:searchable="false"
settings:lottie_imageAssetsFolder="button_nav_menu"
settings:lottie_rawRes="@raw/lottie_button_nav_menu"/>
<SwitchPreference
android:key="assistant_long_press_home_gesture"
android:title="@string/assistant_long_press_home_gesture_title"
android:summary="@string/assistant_long_press_home_gesture_summary"
settings:controller="com.android.settings.gestures.ButtonNavigationSettingsAssistController"
/>
</PreferenceCategory>
<SwitchPreference
android:key="assistant_long_press_home_gesture"
android:title="@string/assistant_long_press_home_gesture_title"
android:summary="@string/assistant_long_press_home_gesture_summary"
settings:controller="com.android.settings.gestures.ButtonNavigationSettingsAssistController"
/>
</PreferenceScreen>