From e06fef45a43ea2e9ddc426850f12568c7105cdf2 Mon Sep 17 00:00:00 2001 From: Tony Date: Fri, 22 Mar 2019 15:44:28 -0500 Subject: [PATCH] Move some classes to packages Added states/ and touchcontrollers/ packages Change-Id: I8d59c47770c24c9edd1b7ce879e6a80ca8b88c71 --- .../uioverrides/RecentsUiFactory.java | 5 ++- .../{ => states}/OverviewState.java | 2 +- .../LandscapeStatesTouchController.java | 2 +- .../PortraitOverviewStateTouchHelper.java | 2 +- .../uioverrides/OverviewPeekState.java | 18 ----------- .../uioverrides/RecentsUiFactory.java | 6 ++++ .../{ => states}/BackgroundAppState.java | 2 +- .../uioverrides/states/OverviewPeekState.java | 32 +++++++++++++++++++ .../{ => states}/OverviewState.java | 2 +- .../FlingAndHoldTouchController.java | 2 +- .../OverviewToAllAppsTouchController.java | 2 +- .../PortraitOverviewStateTouchHelper.java | 4 +-- .../TaskViewTouchController.java | 2 +- .../fallback/RecentsTaskController.java | 2 +- .../android/quickstep/views/RecentsView.java | 2 +- .../{ => states}/AllAppsState.java | 2 +- .../LandscapeEdgeSwipeController.java | 2 +- .../PortraitStatesTouchController.java | 4 ++- .../StatusBarTouchController.java | 2 +- .../quickstep/TestInformationProvider.java | 2 +- src/com/android/launcher3/LauncherState.java | 4 +-- .../uioverrides/BackgroundAppState.java | 26 --------------- .../{ => states}/AllAppsState.java | 2 +- .../{ => states}/OverviewState.java | 2 +- 24 files changed, 65 insertions(+), 66 deletions(-) rename go/quickstep/src/com/android/launcher3/uioverrides/{ => states}/OverviewState.java (98%) rename go/quickstep/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/LandscapeStatesTouchController.java (97%) rename go/quickstep/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/PortraitOverviewStateTouchHelper.java (97%) delete mode 100644 quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewPeekState.java rename quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/{ => states}/BackgroundAppState.java (98%) create mode 100644 quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java rename quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/{ => states}/OverviewState.java (99%) rename quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/FlingAndHoldTouchController.java (98%) rename quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/OverviewToAllAppsTouchController.java (98%) rename quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/PortraitOverviewStateTouchHelper.java (94%) rename quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/TaskViewTouchController.java (99%) rename quickstep/src/com/android/launcher3/uioverrides/{ => states}/AllAppsState.java (98%) rename quickstep/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/LandscapeEdgeSwipeController.java (97%) rename quickstep/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/PortraitStatesTouchController.java (98%) rename quickstep/src/com/android/launcher3/uioverrides/{ => touchcontrollers}/StatusBarTouchController.java (98%) delete mode 100644 src_ui_overrides/com/android/launcher3/uioverrides/BackgroundAppState.java rename src_ui_overrides/com/android/launcher3/uioverrides/{ => states}/AllAppsState.java (98%) rename src_ui_overrides/com/android/launcher3/uioverrides/{ => states}/OverviewState.java (96%) diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java index 29e650cef7..321861bfbb 100644 --- a/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java +++ b/go/quickstep/src/com/android/launcher3/uioverrides/RecentsUiFactory.java @@ -17,7 +17,6 @@ package com.android.launcher3.uioverrides; import static android.view.View.VISIBLE; - import static com.android.launcher3.LauncherAnimUtils.SCALE_PROPERTY; import android.view.View; @@ -26,6 +25,10 @@ import com.android.launcher3.Launcher; import com.android.launcher3.LauncherStateManager.StateHandler; import com.android.launcher3.Utilities; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController; +import com.android.launcher3.uioverrides.touchcontrollers.LandscapeStatesTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController; import com.android.launcher3.util.TouchController; import com.android.quickstep.OverviewInteractionState; import com.android.quickstep.views.IconRecentsView; diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java b/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java similarity index 98% rename from go/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java rename to go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java index 6293b82d84..eba7f5f22c 100644 --- a/go/quickstep/src/com/android/launcher3/uioverrides/OverviewState.java +++ b/go/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.states; import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; import static com.android.launcher3.anim.Interpolators.DEACCEL_2; diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java similarity index 97% rename from go/quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java rename to go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java index 2c91bc31c5..1ccd7d79ac 100644 --- a/go/quickstep/src/com/android/launcher3/uioverrides/LandscapeStatesTouchController.java +++ b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeStatesTouchController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.NORMAL; diff --git a/go/quickstep/src/com/android/launcher3/uioverrides/PortraitOverviewStateTouchHelper.java b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java similarity index 97% rename from go/quickstep/src/com/android/launcher3/uioverrides/PortraitOverviewStateTouchHelper.java rename to go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java index a3b41b02f2..011a4e75bd 100644 --- a/go/quickstep/src/com/android/launcher3/uioverrides/PortraitOverviewStateTouchHelper.java +++ b/go/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; import android.view.MotionEvent; diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewPeekState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewPeekState.java deleted file mode 100644 index 8f4d697178..0000000000 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewPeekState.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.android.launcher3.uioverrides; - -import com.android.launcher3.Launcher; -import com.android.launcher3.R; - -public class OverviewPeekState extends OverviewState { - public OverviewPeekState(int id) { - super(id); - } - - @Override - public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) { - ScaleAndTranslation result = super.getOverviewScaleAndTranslation(launcher); - result.translationX = NORMAL.getOverviewScaleAndTranslation(launcher).translationX - - launcher.getResources().getDimension(R.dimen.overview_peek_distance); - return result; - } -} diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java index 8e62cd3407..f5702a73cd 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/RecentsUiFactory.java @@ -29,6 +29,12 @@ import com.android.launcher3.LauncherStateManager.StateHandler; import com.android.launcher3.Utilities; import com.android.launcher3.anim.AnimatorPlaybackController; import com.android.launcher3.config.FeatureFlags; +import com.android.launcher3.uioverrides.touchcontrollers.FlingAndHoldTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.LandscapeEdgeSwipeController; +import com.android.launcher3.uioverrides.touchcontrollers.OverviewToAllAppsTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.StatusBarTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController; import com.android.launcher3.util.TouchController; import com.android.launcher3.util.UiThreadHelper; import com.android.launcher3.util.UiThreadHelper.AsyncCommand; diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/BackgroundAppState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java similarity index 98% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/BackgroundAppState.java rename to quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java index 726ae0504e..d8f1628079 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/BackgroundAppState.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/BackgroundAppState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.states; import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java new file mode 100644 index 0000000000..bc1d4ba0c7 --- /dev/null +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewPeekState.java @@ -0,0 +1,32 @@ +/* + * Copyright (C) 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.android.launcher3.uioverrides.states; +import com.android.launcher3.Launcher; +import com.android.launcher3.R; + +public class OverviewPeekState extends OverviewState { + public OverviewPeekState(int id) { + super(id); + } + + @Override + public ScaleAndTranslation getOverviewScaleAndTranslation(Launcher launcher) { + ScaleAndTranslation result = super.getOverviewScaleAndTranslation(launcher); + result.translationX = NORMAL.getOverviewScaleAndTranslation(launcher).translationX + - launcher.getResources().getDimension(R.dimen.overview_peek_distance); + return result; + } +} diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java similarity index 99% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java rename to quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java index 1754b8041e..2294d6721e 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewState.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/OverviewState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.states; import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS; import static com.android.launcher3.anim.Interpolators.DEACCEL_2; diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/FlingAndHoldTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java similarity index 98% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/FlingAndHoldTouchController.java rename to quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java index 7b33abb6b2..0757e85093 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/FlingAndHoldTouchController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java similarity index 98% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java rename to quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java index a069ed5936..82ab34ba2c 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/OverviewToAllAppsTouchController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/OverviewToAllAppsTouchController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; import static com.android.launcher3.LauncherState.ALL_APPS; import static com.android.launcher3.LauncherState.NORMAL; diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PortraitOverviewStateTouchHelper.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java similarity index 94% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PortraitOverviewStateTouchHelper.java rename to quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java index eead4c8ba3..5337c39eee 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/PortraitOverviewStateTouchHelper.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitOverviewStateTouchHelper.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; -import static com.android.launcher3.uioverrides.PortraitStatesTouchController.isTouchOverHotseat; +import static com.android.launcher3.uioverrides.touchcontrollers.PortraitStatesTouchController.isTouchOverHotseat; import android.view.MotionEvent; diff --git a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/TaskViewTouchController.java b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java similarity index 99% rename from quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/TaskViewTouchController.java rename to quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java index fb1828b071..a2219e8268 100644 --- a/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/TaskViewTouchController.java +++ b/quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/TaskViewTouchController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE; import static com.android.launcher3.Utilities.SINGLE_FRAME_MS; diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java index 9463cc90f1..a113604caa 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/fallback/RecentsTaskController.java @@ -15,7 +15,7 @@ */ package com.android.quickstep.fallback; -import com.android.launcher3.uioverrides.TaskViewTouchController; +import com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController; import com.android.quickstep.RecentsActivity; public class RecentsTaskController extends TaskViewTouchController { diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index a02df62f3e..ddb94d2dda 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -24,7 +24,7 @@ import static com.android.launcher3.anim.Interpolators.FAST_OUT_SLOW_IN; import static com.android.launcher3.anim.Interpolators.LINEAR; import static com.android.launcher3.config.FeatureFlags.ENABLE_QUICKSTEP_LIVE_TILE; import static com.android.launcher3.config.FeatureFlags.QUICKSTEP_SPRINGS; -import static com.android.launcher3.uioverrides.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS; +import static com.android.launcher3.uioverrides.touchcontrollers.TaskViewTouchController.SUCCESS_TRANSITION_PROGRESS; import static com.android.launcher3.util.SystemUiController.UI_STATE_OVERVIEW; import static com.android.quickstep.TaskUtils.checkCurrentOrManagedUserId; import static com.android.launcher3.Utilities.EDGE_NAV_BAR; diff --git a/quickstep/src/com/android/launcher3/uioverrides/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java similarity index 98% rename from quickstep/src/com/android/launcher3/uioverrides/AllAppsState.java rename to quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java index c629e3360a..ab24f5f5a1 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/AllAppsState.java +++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.states; import static com.android.launcher3.LauncherAnimUtils.ALL_APPS_TRANSITION_MS; import static com.android.launcher3.anim.Interpolators.DEACCEL_2; diff --git a/quickstep/src/com/android/launcher3/uioverrides/LandscapeEdgeSwipeController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java similarity index 97% rename from quickstep/src/com/android/launcher3/uioverrides/LandscapeEdgeSwipeController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java index 086cbdbfa1..92e9ac719d 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/LandscapeEdgeSwipeController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/LandscapeEdgeSwipeController.java @@ -1,4 +1,4 @@ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; import static com.android.launcher3.LauncherState.NORMAL; import static com.android.launcher3.LauncherState.OVERVIEW; diff --git a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java similarity index 98% rename from quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java index 62e525c49a..ce50b680f3 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/PortraitStatesTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/PortraitStatesTouchController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; import static com.android.launcher3.AbstractFloatingView.TYPE_ACCESSIBLE; import static com.android.launcher3.LauncherState.ALL_APPS; @@ -43,6 +43,8 @@ import com.android.launcher3.anim.AnimatorSetBuilder; import com.android.launcher3.anim.Interpolators; import com.android.launcher3.touch.AbstractStateChangeTouchController; import com.android.launcher3.touch.SwipeDetector; +import com.android.launcher3.uioverrides.states.OverviewState; +import com.android.launcher3.uioverrides.touchcontrollers.PortraitOverviewStateTouchHelper; import com.android.launcher3.userevent.nano.LauncherLogProto.Action.Touch; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; import com.android.quickstep.RecentsModel; diff --git a/quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java similarity index 98% rename from quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java rename to quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java index 8f33e40239..12e6f12bcc 100644 --- a/quickstep/src/com/android/launcher3/uioverrides/StatusBarTouchController.java +++ b/quickstep/src/com/android/launcher3/uioverrides/touchcontrollers/StatusBarTouchController.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.touchcontrollers; import static android.view.MotionEvent.ACTION_DOWN; import static android.view.MotionEvent.ACTION_MOVE; diff --git a/quickstep/src/com/android/quickstep/TestInformationProvider.java b/quickstep/src/com/android/quickstep/TestInformationProvider.java index e57d3ec5cd..b37ddda097 100644 --- a/quickstep/src/com/android/quickstep/TestInformationProvider.java +++ b/quickstep/src/com/android/quickstep/TestInformationProvider.java @@ -30,7 +30,7 @@ import com.android.launcher3.LauncherAppState; import com.android.launcher3.LauncherState; import com.android.launcher3.TestProtocol; import com.android.launcher3.Utilities; -import com.android.launcher3.uioverrides.OverviewState; +import com.android.launcher3.uioverrides.states.OverviewState; import com.android.quickstep.util.LayoutUtils; public class TestInformationProvider extends ContentProvider { diff --git a/src/com/android/launcher3/LauncherState.java b/src/com/android/launcher3/LauncherState.java index a3d5994e8c..182ed4bc88 100644 --- a/src/com/android/launcher3/LauncherState.java +++ b/src/com/android/launcher3/LauncherState.java @@ -31,8 +31,8 @@ import android.view.animation.Interpolator; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.states.SpringLoadedState; -import com.android.launcher3.uioverrides.AllAppsState; -import com.android.launcher3.uioverrides.OverviewState; +import com.android.launcher3.uioverrides.states.AllAppsState; +import com.android.launcher3.uioverrides.states.OverviewState; import com.android.launcher3.uioverrides.UiFactory; import com.android.launcher3.userevent.nano.LauncherLogProto.Action; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/BackgroundAppState.java b/src_ui_overrides/com/android/launcher3/uioverrides/BackgroundAppState.java deleted file mode 100644 index 9133b07eca..0000000000 --- a/src_ui_overrides/com/android/launcher3/uioverrides/BackgroundAppState.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright (C) 2018 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.android.launcher3.uioverrides; - -/** - * A dummy background app state - */ -public class BackgroundAppState extends OverviewState { - - public BackgroundAppState(int id) { - super(id); - } -} diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java similarity index 98% rename from src_ui_overrides/com/android/launcher3/uioverrides/AllAppsState.java rename to src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java index bca335d873..7006d7796c 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/AllAppsState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.states; import static com.android.launcher3.LauncherAnimUtils.ALL_APPS_TRANSITION_MS; import static com.android.launcher3.allapps.DiscoveryBounce.HOME_BOUNCE_SEEN; diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/OverviewState.java b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java similarity index 96% rename from src_ui_overrides/com/android/launcher3/uioverrides/OverviewState.java rename to src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java index 56e0aa50a3..1b1836d4c6 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/OverviewState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/states/OverviewState.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.launcher3.uioverrides; +package com.android.launcher3.uioverrides.states; import static com.android.launcher3.LauncherAnimUtils.OVERVIEW_TRANSITION_MS;