diff options
| author | Winson Chung <winsonc@google.com> | 2020-10-23 09:26:44 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2020-10-23 09:27:48 -0700 |
| commit | f99351888c3e5a128559678304fefd647472bc7f (patch) | |
| tree | a647726cf255a3eab5f53b40a474f2f36f1a08a7 /src_ui_overrides/com/android/launcher3/uioverrides/states | |
| parent | fd2dac816be12fd3cabbe5bfd0d0f9202078f7de (diff) | |
| download | Launcher3-f99351888c3e5a128559678304fefd647472bc7f.tar.gz | |
Revert "Revert "Merge commit '8d14dbe041199d611839140f1c9285fd4174e9f4' ...""
This reverts commit 087a9e39b663dade90d8dfd74300e42575649b87.
Change-Id: I05b17a6e4aaaef6de3c2fa26aad45a39eb2833f9
Diffstat (limited to 'src_ui_overrides/com/android/launcher3/uioverrides/states')
| -rw-r--r-- | src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java | 4 | ||||
| -rw-r--r-- | src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java | 5 |
2 files changed, 5 insertions, 4 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 ec3f93ff1b..a4e53a1cc0 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -16,13 +16,13 @@ package com.android.launcher3.uioverrides.states; import static com.android.launcher3.anim.Interpolators.DEACCEL_2; +import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_ALLAPPS; import android.content.Context; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherState; import com.android.launcher3.R; -import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; /** * Definition for AllApps state @@ -41,7 +41,7 @@ public class AllAppsState extends LauncherState { }; public AllAppsState(int id) { - super(id, ContainerType.ALLAPPS, STATE_FLAGS); + super(id, LAUNCHER_STATE_ALLAPPS, STATE_FLAGS); } @Override 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 d102bccaad..da5a94f6fd 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java @@ -15,10 +15,11 @@ */ package com.android.launcher3.uioverrides.states; +import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW; + import android.content.Context; import com.android.launcher3.LauncherState; -import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; /** * Definition for overview state @@ -26,7 +27,7 @@ import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; public class OverviewState extends LauncherState { public OverviewState(int id) { - super(id, ContainerType.WORKSPACE, FLAG_DISABLE_RESTORE); + super(id, LAUNCHER_STATE_OVERVIEW, FLAG_DISABLE_RESTORE); } @Override |