Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5d3dc9c7 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge changes I4649483a,I890a45e6,I6ccfab86 into ub-launcher3-master 

* changes:
  17.5/ Remove synchronized calls, verify controller before finishing animation
  17/ Update activity tracker callback
  16/ Renaming the swipe handlers
parents e6691f34 4356311c

quickstep/recents_ui_overrides/src/com/android/launcher3/LauncherInitListenerEx.java

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * 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;



import com.android.launcher3.appprediction.PredictionUiStateManager;

import com.android.launcher3.appprediction.PredictionUiStateManager.Client;



import java.util.function.BiPredicate;



public class LauncherInitListenerEx extends LauncherInitListener {



    public LauncherInitListenerEx(BiPredicate<Launcher, Boolean> onInitListener) {

        super(onInitListener);

    }



    @Override

    public boolean init(Launcher launcher, boolean alreadyOnHome) {

        PredictionUiStateManager.INSTANCE.get(launcher).switchClient(Client.OVERVIEW);

        return super.init(launcher, alreadyOnHome);

    }

}

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/states/QuickSwitchState.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import com.android.quickstep.views.TaskView; 


/**

 * State to indicate we are about to launch a recent task. Note that this state is only used when

 * quick switching from launcher; quick switching from an app uses WindowTransformSwipeHelper.

 * quick switching from launcher; quick switching from an app uses LauncherSwipeHandler.

 * @see GestureState.GestureEndTarget#NEW_TASK

 */

public class QuickSwitchState extends BackgroundAppState {

quickstep/recents_ui_overrides/src/com/android/quickstep/inputconsumers/FallbackNoButtonInputConsumer.java→quickstep/recents_ui_overrides/src/com/android/quickstep/FallbackSwipeHandler.java

+7 −14
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.quickstep.inputconsumers;

package com.android.quickstep;



import static com.android.quickstep.GestureState.GestureEndTarget.HOME;

import static com.android.quickstep.GestureState.GestureEndTarget.LAST_TASK;
@@ -22,7 +22,7 @@ import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS; 
import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;

import static com.android.quickstep.RecentsActivity.EXTRA_TASK_ID;

import static com.android.quickstep.RecentsActivity.EXTRA_THUMBNAIL;

import static com.android.quickstep.WindowTransformSwipeHandler.MIN_PROGRESS_FOR_OVERVIEW;

import static com.android.quickstep.LauncherSwipeHandler.MIN_PROGRESS_FOR_OVERVIEW;

import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;



import android.animation.Animator;
@@ -40,26 +40,19 @@ import com.android.launcher3.anim.AnimationSuccessListener; 
import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.util.ObjectWrapper;

import com.android.quickstep.BaseActivityInterface.HomeAnimationFactory;

import com.android.quickstep.AnimatedFloat;

import com.android.quickstep.BaseSwipeUpHandler;

import com.android.quickstep.GestureState;

import com.android.quickstep.GestureState.GestureEndTarget;

import com.android.quickstep.InputConsumer;

import com.android.quickstep.MultiStateCallback;

import com.android.quickstep.RecentsActivity;

import com.android.quickstep.RecentsAnimationController;

import com.android.quickstep.RecentsAnimationDeviceState;

import com.android.quickstep.fallback.FallbackRecentsView;

import com.android.quickstep.util.RectFSpringAnim;

import com.android.quickstep.RecentsAnimationTargets;

import com.android.quickstep.views.TaskView;

import com.android.systemui.shared.recents.model.ThumbnailData;

import com.android.systemui.shared.system.ActivityManagerWrapper;

import com.android.systemui.shared.system.ActivityOptionsCompat;

import com.android.systemui.shared.system.InputConsumerController;



public class FallbackNoButtonInputConsumer extends

        BaseSwipeUpHandler<RecentsActivity, FallbackRecentsView> {

/**

 * Handles the navigation gestures when a 3rd party launcher is the default home activity.

 */

public class FallbackSwipeHandler extends BaseSwipeUpHandler<RecentsActivity, FallbackRecentsView> {



    private static final String[] STATE_NAMES = DEBUG_STATES ? new String[5] : null;
@@ -108,7 +101,7 @@ public class FallbackNoButtonInputConsumer extends 
    private final PointF mEndVelocityPxPerMs = new PointF(0, 0.5f);

    private RunningWindowAnim mFinishAnimation;



    public FallbackNoButtonInputConsumer(Context context, RecentsAnimationDeviceState deviceState,

    public FallbackSwipeHandler(Context context, RecentsAnimationDeviceState deviceState,

            GestureState gestureState, InputConsumerController inputConsumer,

            boolean isLikelyToStartNewTask, boolean continuingLastGesture) {

        super(context, deviceState, gestureState, inputConsumer);

quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherActivityInterface.java

+14 −3
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import static com.android.launcher3.anim.Interpolators.ACCEL_2; 
import static com.android.launcher3.anim.Interpolators.ACCEL_DEACCEL;

import static com.android.launcher3.anim.Interpolators.INSTANT;

import static com.android.launcher3.anim.Interpolators.LINEAR;

import static com.android.quickstep.WindowTransformSwipeHandler.RECENTS_ATTACH_DURATION;

import static com.android.quickstep.LauncherSwipeHandler.RECENTS_ATTACH_DURATION;



import android.animation.Animator;

import android.animation.AnimatorSet;
@@ -49,12 +49,13 @@ import androidx.annotation.UiThread; 


import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherInitListenerEx;

import com.android.launcher3.LauncherInitListener;

import com.android.launcher3.LauncherState;

import com.android.launcher3.LauncherStateManager;

import com.android.launcher3.allapps.DiscoveryBounce;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.anim.AnimatorSetBuilder;

import com.android.launcher3.appprediction.PredictionUiStateManager;

import com.android.launcher3.uioverrides.states.OverviewState;

import com.android.launcher3.userevent.nano.LauncherLogProto;

import com.android.launcher3.views.FloatingIconView;
@@ -413,7 +414,7 @@ public final class LauncherActivityInterface implements BaseActivityInterface<La 


    @Override

    public ActivityInitListener createActivityInitListener(Predicate<Boolean> onInitListener) {

        return new LauncherInitListenerEx((activity, alreadyOnHome) ->

        return new LauncherInitListener((activity, alreadyOnHome) ->

                onInitListener.test(alreadyOnHome));

    }
@@ -541,4 +542,14 @@ public final class LauncherActivityInterface implements BaseActivityInterface<La 
        }

        launcher.setOnDeferredActivityLaunchCallback(r);

    }



    @Override

    public void updateOverviewPredictionState() {

        Launcher launcher = getCreatedActivity();

        if (launcher == null) {

            return;

        }

        PredictionUiStateManager.INSTANCE.get(launcher).switchClient(

                PredictionUiStateManager.Client.OVERVIEW);

    }

}
 
 No newline at end of file

quickstep/recents_ui_overrides/src/com/android/quickstep/WindowTransformSwipeHandler.java→quickstep/recents_ui_overrides/src/com/android/quickstep/LauncherSwipeHandler.java

+28 −11
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ import static com.android.quickstep.GestureState.GestureEndTarget.NEW_TASK; 
import static com.android.quickstep.GestureState.GestureEndTarget.RECENTS;

import static com.android.quickstep.GestureState.STATE_END_TARGET_ANIMATION_FINISHED;

import static com.android.quickstep.MultiStateCallback.DEBUG_STATES;

import static com.android.quickstep.SysUINavigationMode.Mode.TWO_BUTTONS;

import static com.android.quickstep.views.RecentsView.UPDATE_SYSUI_FLAGS_THRESHOLD;



import android.animation.Animator;
@@ -83,10 +84,13 @@ import com.android.systemui.shared.system.InputConsumerController; 
import com.android.systemui.shared.system.LatencyTrackerCompat;

import com.android.systemui.shared.system.RemoteAnimationTargetCompat;



/**

 * Handles the navigation gestures when Launcher is the default home activity.

 */

@TargetApi(Build.VERSION_CODES.O)

public class WindowTransformSwipeHandler<T extends BaseDraggingActivity>

public class LauncherSwipeHandler<T extends BaseDraggingActivity>

        extends BaseSwipeUpHandler<T, RecentsView> implements OnApplyWindowInsetsListener {

    private static final String TAG = WindowTransformSwipeHandler.class.getSimpleName();

    private static final String TAG = LauncherSwipeHandler.class.getSimpleName();



    private static final String[] STATE_NAMES = DEBUG_STATES ? new String[16] : null;
@@ -189,7 +193,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 


    private final Runnable mOnDeferredActivityLaunch = this::onDeferredActivityLaunch;



    public WindowTransformSwipeHandler(Context context, RecentsAnimationDeviceState deviceState,

    public LauncherSwipeHandler(Context context, RecentsAnimationDeviceState deviceState,

            TaskAnimationManager taskAnimationManager, GestureState gestureState,

            long touchTimeMs, boolean continuingLastGesture,

            InputConsumerController inputConsumer) {
@@ -293,6 +297,12 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
        }



        setupRecentsViewUi();



        if (mDeviceState.getNavMode() == TWO_BUTTONS) {

            // If the device is in two button mode, swiping up will show overview with predictions

            // so we need to kick off switching to the overview predictions as soon as possible

            mActivityInterface.updateOverviewPredictionState();

        }

        return true;

    }
@@ -423,6 +433,12 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
    @Override

    public void onMotionPauseChanged(boolean isPaused) {

        setShelfState(isPaused ? PEEK : HIDE, OVERSHOOT_1_2, SHELF_ANIM_DURATION);



        if (mDeviceState.isFullyGesturalNavMode() && isPaused) {

            // In fully gestural nav mode, switch to overview predictions once the user has paused

            // (this is a no-op if the predictions are already in that state)

            mActivityInterface.updateOverviewPredictionState();

        }

    }



    public void maybeUpdateRecentsAttachedState() {
@@ -666,7 +682,7 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
        endLauncherTransitionController();

        if (!ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            // Hide the task view, if not already hidden

            setTargetAlphaProvider(WindowTransformSwipeHandler::getHiddenTargetAlpha);

            setTargetAlphaProvider(LauncherSwipeHandler::getHiddenTargetAlpha);

        }



        BaseDraggingActivity activity = mActivityInterface.getCreatedActivity();
@@ -1172,20 +1188,21 @@ public class WindowTransformSwipeHandler<T extends BaseDraggingActivity> 
    private void finishCurrentTransitionToRecents() {

        if (ENABLE_QUICKSTEP_LIVE_TILE.get()) {

            mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

        } else if (!hasTargets()) {

            // If there are no targets, then there is nothing to finish

        } else if (!hasTargets() || mRecentsAnimationController == null) {

            // If there are no targets or the animation not started, then there is nothing to finish

            mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

        } else {

            synchronized (mRecentsAnimationController) {

            mRecentsAnimationController.finish(true /* toRecents */,

                    () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED));

        }

        }

        ActiveGestureLog.INSTANCE.addLog("finishRecentsAnimation", true);

    }



    private void finishCurrentTransitionToHome() {

        synchronized (mRecentsAnimationController) {

        if (!hasTargets() || mRecentsAnimationController == null) {

            // If there are no targets or the animation not started, then there is nothing to finish

            mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED);

        } else {

            mRecentsAnimationController.finish(true /* toRecents */,

                    () -> mStateCallback.setStateOnUiThread(STATE_CURRENT_TASK_FINISHED),

                    true /* sendUserLeaveHint */);