summaryrefslogtreecommitdiffstats
path: root/quickstep/src/com/android/launcher3
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2019-02-13 14:57:52 -0800
committerSunny Goyal <sunnygoyal@google.com>2019-02-14 11:40:03 -0800
commit3f271d4b7f36c4529f3c2ef6ec202ab539b44bec (patch)
tree2b8e2cbb158f61d0248979e572cf71738528d26b /quickstep/src/com/android/launcher3
parent435041de60077dc07b10978db49ecb6f244baa9c (diff)
downloadandroid_packages_apps_Trebuchet-3f271d4b7f36c4529f3c2ef6ec202ab539b44bec.tar.gz
android_packages_apps_Trebuchet-3f271d4b7f36c4529f3c2ef6ec202ab539b44bec.tar.bz2
android_packages_apps_Trebuchet-3f271d4b7f36c4529f3c2ef6ec202ab539b44bec.zip
Deleting Quickscrub related logic
Bug: 124255113 Change-Id: Ic5f2338f1e3ae0a0cfb08f822dee0e01ae54a7b0
Diffstat (limited to 'quickstep/src/com/android/launcher3')
-rw-r--r--quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java19
-rw-r--r--quickstep/src/com/android/launcher3/uioverrides/UiFactory.java4
2 files changed, 2 insertions, 21 deletions
diff --git a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
index 0007b3755..ed83ed62f 100644
--- a/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
+++ b/quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java
@@ -112,7 +112,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
private static final int APP_LAUNCH_ALPHA_DURATION = 50;
public static final int RECENTS_LAUNCH_DURATION = 336;
- public static final int RECENTS_QUICKSCRUB_LAUNCH_DURATION = 300;
private static final int LAUNCHER_RESUME_START_DELAY = 100;
private static final int CLOSING_TRANSITION_DURATION_MS = 250;
@@ -181,10 +180,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
public ActivityOptions getActivityLaunchOptions(Launcher launcher, View v) {
if (hasControlRemoteAppTransitionPermission()) {
boolean fromRecents = isLaunchingFromRecents(v, null /* targets */);
- if (fromRecents && isQuickSwitchInProgress()) {
- return getQuickSwitchActivityOptions();
- }
-
RemoteAnimationRunnerCompat runner = new LauncherAnimationRunner(mHandler,
true /* startAtFrontOfQueue */) {
@@ -238,20 +233,6 @@ public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTrans
@Nullable RemoteAnimationTargetCompat[] targets);
/**
- * Whether a quick scrub is in progress.
- *
- * @return true if in progress
- */
- protected abstract boolean isQuickSwitchInProgress();
-
- /**
- * Get activity options for a quick switch launch that include the launch animation.
- *
- * @return the activity options for a quick switch recents launch
- */
- protected abstract ActivityOptions getQuickSwitchActivityOptions();
-
- /**
* Composes the animations for a launch from the recents list.
*
* @param anim the animator set to add to
diff --git a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
index 70aae136c..25e1c8983 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/UiFactory.java
@@ -125,8 +125,8 @@ public class UiFactory extends RecentsUiFactory {
public static void onEnterAnimationComplete(Context context) {
// After the transition to home, enable the high-res thumbnail loader if it wasn't enabled
- // as a part of quickstep/scrub, so that high-res thumbnails can load the next time we
- // enter overview
+ // as a part of quickstep, so that high-res thumbnails can load the next time we enter
+ // overview
RecentsModel.INSTANCE.get(context).getThumbnailCache()
.getHighResLoadingState().setVisible(true);
}