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

Update the illustrations of System navigation page.

Browse Source 
- Upate 3 types of navigation illustrations.

Fix: 189426848
Test: robotest and see the UI
Change-Id: Ie56057713d528398a2e3ddad5580c6de2f60bd3f
This commit is contained in:
Stanley Wang
2021-07-15 16:41:56 +08:00
parent bc7e4bcd46
commit 602f59ba42
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.support.actionbar.HelpResourceProvider;
import com.android.settings.utils.CandidateInfoExtra; import com.android.settings.utils.CandidateInfoExtra;
import com.android.settings.widget.RadioButtonPickerFragment; import com.android.settings.widget.RadioButtonPickerFragment;
import com.android.settings.widget.VideoPreference;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.CandidateInfo; import com.android.settingslib.widget.CandidateInfo;
import com.android.settingslib.widget.IllustrationPreference;
import com.android.settingslib.widget.RadioButtonPreference; import com.android.settingslib.widget.RadioButtonPreference;
import java.util.ArrayList; import java.util.ArrayList;
@@ -67,7 +67,7 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
private IOverlayManager mOverlayManager; private IOverlayManager mOverlayManager;
private VideoPreference mVideoPreference; private IllustrationPreference mVideoPreference;
@Override @Override
public void onAttach(Context context) { public void onAttach(Context context) {
@@ -81,11 +81,8 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
mOverlayManager = IOverlayManager.Stub.asInterface( mOverlayManager = IOverlayManager.Stub.asInterface(
ServiceManager.getService(Context.OVERLAY_SERVICE)); ServiceManager.getService(Context.OVERLAY_SERVICE));
mVideoPreference = new VideoPreference(context); mVideoPreference = new IllustrationPreference(context);
setIllustrationVideo(mVideoPreference, getDefaultKey()); setIllustrationVideo(mVideoPreference, getDefaultKey());
mVideoPreference.setHeight( /* Illustration height in dp */
getResources().getDimension(R.dimen.system_navigation_illustration_height)
/ getResources().getDisplayMetrics().density);
migrateOverlaySensitivityToSettings(context, mOverlayManager); migrateOverlaySensitivityToSettings(context, mOverlayManager);
} }
@@ -234,18 +231,17 @@ public class SystemNavigationGestureSettings extends RadioButtonPickerFragment i
} }
} }
private static void setIllustrationVideo(VideoPreference videoPref, String systemNavKey) { private static void setIllustrationVideo(IllustrationPreference videoPref,
videoPref.setVideo(0, 0); String systemNavKey) {
switch (systemNavKey) { switch (systemNavKey) {
case KEY_SYSTEM_NAV_GESTURAL: case KEY_SYSTEM_NAV_GESTURAL:
videoPref.setVideo(R.raw.system_nav_fully_gestural, videoPref.setLottieAnimationResId(R.raw.lottie_system_nav_fully_gestural);
R.drawable.system_nav_fully_gestural);
break; break;
case KEY_SYSTEM_NAV_2BUTTONS: 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; break;
case KEY_SYSTEM_NAV_3BUTTONS: 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; break;
} }
} }