From 602f59ba4282c2745dc28373d54dd79921b20ba8 Mon Sep 17 00:00:00 2001 From: Stanley Wang Date: Thu, 15 Jul 2021 16:41:56 +0800 Subject: [PATCH] Update the illustrations of System navigation page. - Upate 3 types of navigation illustrations. Fix: 189426848 Test: robotest and see the UI Change-Id: Ie56057713d528398a2e3ddad5580c6de2f60bd3f --- .../lottie_system_nav_fully_gestural.json | 0 res/raw/lottie_system_nav_2_button.json | 0 res/raw/lottie_system_nav_3_button.json | 0 res/raw/lottie_system_nav_fully_gestural.json | 0 .../SystemNavigationGestureSettings.java | 20 ++++++++----------- 5 files changed, 8 insertions(+), 12 deletions(-) create mode 100644 res/raw-night/lottie_system_nav_fully_gestural.json create mode 100644 res/raw/lottie_system_nav_2_button.json create mode 100644 res/raw/lottie_system_nav_3_button.json create mode 100644 res/raw/lottie_system_nav_fully_gestural.json diff --git a/res/raw-night/lottie_system_nav_fully_gestural.json b/res/raw-night/lottie_system_nav_fully_gestural.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/res/raw/lottie_system_nav_2_button.json b/res/raw/lottie_system_nav_2_button.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/res/raw/lottie_system_nav_3_button.json b/res/raw/lottie_system_nav_3_button.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/res/raw/lottie_system_nav_fully_gestural.json b/res/raw/lottie_system_nav_fully_gestural.json new file mode 100644 index 00000000000..e69de29bb2d diff --git a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java index 854efa05531..4e783c96407 100644 --- a/src/com/android/settings/gestures/SystemNavigationGestureSettings.java +++ b/src/com/android/settings/gestures/SystemNavigationGestureSettings.java @@ -41,9 +41,9 @@ import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.support.actionbar.HelpResourceProvider; import com.android.settings.utils.CandidateInfoExtra; import com.android.settings.widget.RadioButtonPickerFragment; -import com.android.settings.widget.VideoPreference; import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.widget.CandidateInfo; +import com.android.settingslib.widget.IllustrationPreference; import com.android.settingslib.widget.RadioButtonPreference; import java.util.ArrayList; @@ -67,7 +67,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i private IOverlayManager mOverlayManager; - private VideoPreference mVideoPreference; + private IllustrationPreference mVideoPreference; @Override public void onAttach(Context context) { @@ -81,11 +81,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i mOverlayManager = IOverlayManager.Stub.asInterface( ServiceManager.getService(Context.OVERLAY_SERVICE)); - mVideoPreference = new VideoPreference(context); + mVideoPreference = new IllustrationPreference(context); setIllustrationVideo(mVideoPreference, getDefaultKey()); - mVideoPreference.setHeight( /* Illustration height in dp */ - getResources().getDimension(R.dimen.system_navigation_illustration_height) - / getResources().getDisplayMetrics().density); migrateOverlaySensitivityToSettings(context, mOverlayManager); } @@ -234,18 +231,17 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i } } - private static void setIllustrationVideo(VideoPreference videoPref, String systemNavKey) { - videoPref.setVideo(0, 0); + private static void setIllustrationVideo(IllustrationPreference videoPref, + String systemNavKey) { switch (systemNavKey) { case KEY_SYSTEM_NAV_GESTURAL: - videoPref.setVideo(R.raw.system_nav_fully_gestural, - R.drawable.system_nav_fully_gestural); + videoPref.setLottieAnimationResId(R.raw.lottie_system_nav_fully_gestural); break; case KEY_SYSTEM_NAV_2BUTTONS: - videoPref.setVideo(R.raw.system_nav_2_button, R.drawable.system_nav_2_button); + videoPref.setLottieAnimationResId(R.raw.lottie_system_nav_2_button); break; case KEY_SYSTEM_NAV_3BUTTONS: - videoPref.setVideo(R.raw.system_nav_3_button, R.drawable.system_nav_3_button); + videoPref.setLottieAnimationResId(R.raw.lottie_system_nav_3_button); break; } }