diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2020-04-23 19:00:36 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2020-04-30 01:01:51 -0700 |
commit | 8f96546e79c79b1f1f26939c5df6f66b72aff2d0 (patch) | |
tree | da6f4332e85e33e0f74434dad898a4ddaeced771 /src_ui_overrides | |
parent | d75c1da9c7b2a3c98be0be9c9f06cbf1af772e10 (diff) | |
download | Launcher3-8f96546e79c79b1f1f26939c5df6f66b72aff2d0.tar.gz |
Generalizing LauncherState definition so that it can be used in RecentsActivity
> Removing 'Launcher' as parameter from state methods called by StateManager
> Converting state properties to methods for easier abstraction
> Moving state handling drom state definition to activity class
Change-Id: I997627df606a7e0bb3bf32688d045a942a47fc94
Diffstat (limited to 'src_ui_overrides')
-rw-r--r-- | src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java | 18 | ||||
-rw-r--r-- | src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java | 5 |
2 files changed, 7 insertions, 16 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 313ea05a1f..ec3f93ff1b 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -16,9 +16,9 @@ package com.android.launcher3.uioverrides.states; import static com.android.launcher3.anim.Interpolators.DEACCEL_2; -import static com.android.launcher3.util.OnboardingPrefs.HOME_BOUNCE_SEEN; -import com.android.launcher3.AbstractFloatingView; +import android.content.Context; + import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.R; @@ -31,7 +31,7 @@ public class AllAppsState extends LauncherState { private static final float PARALLAX_COEFFICIENT = .125f; - private static final int STATE_FLAGS = FLAG_DISABLE_ACCESSIBILITY; + private static final int STATE_FLAGS = FLAG_WORKSPACE_INACCESSIBLE; private static final PageAlphaProvider PAGE_ALPHA_PROVIDER = new PageAlphaProvider(DEACCEL_2) { @Override @@ -45,21 +45,11 @@ public class AllAppsState extends LauncherState { } @Override - public int getTransitionDuration(Launcher context) { + public int getTransitionDuration(Context context) { return 320; } @Override - public void onStateEnabled(Launcher launcher) { - if (!launcher.getSharedPrefs().getBoolean(HOME_BOUNCE_SEEN, false)) { - launcher.getSharedPrefs().edit().putBoolean(HOME_BOUNCE_SEEN, true).apply(); - } - - AbstractFloatingView.closeAllOpenViews(launcher); - dispatchWindowStateChanged(launcher); - } - - @Override public String getDescription(Launcher launcher) { return launcher.getString(R.string.all_apps_button_label); } diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java index 507ff59b31..7a6332ce00 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java @@ -15,7 +15,8 @@ */ package com.android.launcher3.uioverrides.states; -import com.android.launcher3.Launcher; +import android.content.Context; + import com.android.launcher3.LauncherState; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; @@ -29,7 +30,7 @@ public class OverviewState extends LauncherState { } @Override - public int getTransitionDuration(Launcher context) { + public int getTransitionDuration(Context context) { return 250; } |