summaryrefslogtreecommitdiff
path: root/src_ui_overrides
diff options
context:
space:
mode:
authorAlex Chau <alexchau@google.com>2022-01-14 18:02:18 +0000
committerAlex Chau <alexchau@google.com>2022-01-19 18:57:34 +0000
commit27b39b9668c5eed4f33ae8495116c25af77c9d65 (patch)
tree64d4c30502e31016588a4343a3dd9c930402419b /src_ui_overrides
parent36e0fd91a068c2c50e34432fa4d8768bf9e9d02f (diff)
downloadLauncher3-27b39b9668c5eed4f33ae8495116c25af77c9d65.tar.gz
Put AllApps in bottom sheet for tablets
http://screen/7steQ7W8U2ga3Hs Bug: 208599118 Test: manual Change-Id: I36cbac3cb7cb214081e5a33a6e042ae83e745f23
Diffstat (limited to 'src_ui_overrides')
-rw-r--r--src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java21
1 files changed, 12 insertions, 9 deletions
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
index 978c321cb4..5543cc2696 100644
--- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -34,13 +34,6 @@ public class AllAppsState extends LauncherState {
private static final int STATE_FLAGS = FLAG_WORKSPACE_INACCESSIBLE;
- private static final PageAlphaProvider PAGE_ALPHA_PROVIDER = new PageAlphaProvider(DEACCEL_2) {
- @Override
- public float getPageAlpha(int pageIndex) {
- return 0;
- }
- };
-
public AllAppsState(int id) {
super(id, LAUNCHER_STATE_ALLAPPS, STATE_FLAGS);
}
@@ -68,7 +61,15 @@ public class AllAppsState extends LauncherState {
@Override
public PageAlphaProvider getWorkspacePageAlphaProvider(Launcher launcher) {
- return PAGE_ALPHA_PROVIDER;
+ PageAlphaProvider superPageAlphaProvider = super.getWorkspacePageAlphaProvider(launcher);
+ return new PageAlphaProvider(DEACCEL_2) {
+ @Override
+ public float getPageAlpha(int pageIndex) {
+ return launcher.getDeviceProfile().isTablet
+ ? superPageAlphaProvider.getPageAlpha(pageIndex)
+ : 0;
+ }
+ };
}
@Override
@@ -78,6 +79,8 @@ public class AllAppsState extends LauncherState {
@Override
public int getWorkspaceScrimColor(Launcher launcher) {
- return Themes.getAttrColor(launcher, R.attr.allAppsScrimColor);
+ return launcher.getDeviceProfile().isTablet
+ ? launcher.getResources().getColor(R.color.widgets_picker_scrim)
+ : Themes.getAttrColor(launcher, R.attr.allAppsScrimColor);
}
}