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

Commit 12fd3126 authored by Stanley Wang's avatar Stanley Wang Committed by Automerger Merge Worker
Browse files

Merge "Update the illustrations of System navigation page." into sc-dev am:... 

Merge "Update the illustrations of System navigation page." into sc-dev am: c916876c am: c7459e9e

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

Change-Id: Ia7089bb61f85cbddd08f21da37f1f37cacb8904e
parents 5cdaaed0 c7459e9e

res/raw-night/lottie_system_nav_fully_gestural.json

0 → 100644
+0 −0

Empty file added.

res/raw/lottie_system_nav_2_button.json

0 → 100644
+0 −0

Empty file added.

res/raw/lottie_system_nav_3_button.json

0 → 100644
+0 −0

Empty file added.

res/raw/lottie_system_nav_fully_gestural.json

0 → 100644
+0 −0

Empty file added.

src/com/android/settings/gestures/SystemNavigationGestureSettings.java

+8 −12
Original line number Diff line number Diff line
@@ -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;

        }

    }