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

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

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

Change-Id: I287a6788e9ff460ab58a1c61e019be0cf37480a6
This commit is contained in:
Stanley Wang
2021-07-16 11:54:13 +00:00
committed by Automerger Merge Worker
parent 97b8a6409d c916876cc7
commit 69a9d7aa11
5 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
res/raw-night/lottie_system_nav_fully_gestural.json Normal file
View File

0
res/raw/lottie_system_nav_2_button.json Normal file
View File

0
res/raw/lottie_system_nav_3_button.json Normal file
View File

0
res/raw/lottie_system_nav_fully_gestural.json Normal file
View File

20
src/com/android/settings/gestures/SystemNavigationGestureSettings.java
View File

@@ -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;
}
}