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

Commit 9d69c8da authored by Sunny Goyal's avatar Sunny Goyal
Browse files

Abstracting out all the Laucher related logic 

> Enabling swipe up geture for fallback activity
> Using a preferecens for showing back button

Bug: 75979063
Change-Id: I8bbb44d8e250428c3da9bde57975dc4f952624be
parent 449b9e7b

quickstep/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,8 @@ 
        <!-- STOPSHIP: Change exported to false once all the integration is complete.

        It is set to true so that the activity can be started from command line -->

        <activity android:name="com.android.quickstep.RecentsActivity"

            android:exported="true" />

            android:exported="true"

            android:excludeFromRecents="true" />



        <!-- Content provider to settings search -->

        <provider

quickstep/libs/sysui_shared.jar

+141 B (116 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

quickstep/src/com/android/launcher3/LauncherInitListener.java

0 → 100644
+54 −0
Original line number Diff line number Diff line 
/*

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



import static com.android.launcher3.states.RotationHelper.REQUEST_LOCK;



import android.annotation.TargetApi;

import android.os.Build;



import com.android.launcher3.states.InternalStateHandler;

import com.android.quickstep.ActivityControlHelper.ActivityInitListener;



import java.util.function.BiPredicate;



@TargetApi(Build.VERSION_CODES.P)

public class LauncherInitListener extends InternalStateHandler implements ActivityInitListener {



    private final BiPredicate<Launcher, Boolean> mOnInitListener;



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

        mOnInitListener = onInitListener;

    }



    @Override

    protected boolean init(Launcher launcher, boolean alreadyOnHome) {

        // For the duration of the gesture, lock the screen orientation to ensure that we do not

        // rotate mid-quickscrub

        launcher.getRotationHelper().setStateHandlerRequest(REQUEST_LOCK);

        return mOnInitListener.test(launcher, alreadyOnHome);

    }



    @Override

    public void register() {

        initWhenReady();

    }



    @Override

    public void unregister() {

        clearReference();

    }

}

quickstep/src/com/android/launcher3/uioverrides/UiFactory.java

+7 −5
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.launcher3.uioverrides; 


import static com.android.launcher3.LauncherState.NORMAL;



import android.content.Context;

import android.view.View;

import android.view.View.AccessibilityDelegate;
@@ -73,7 +74,8 @@ public class UiFactory { 
                }

            }

        }

        OverviewInteractionState.setBackButtonVisible(launcher, shouldBackButtonBeVisible);

        OverviewInteractionState.getInstance(launcher)

                .setBackButtonVisible(shouldBackButtonBeVisible);

    }



    public static void resetOverview(Launcher launcher) {
@@ -81,15 +83,15 @@ public class UiFactory { 
        recents.reset();

    }



    public static void onStart(Launcher launcher) {

        RecentsModel model = RecentsModel.getInstance(launcher);

    public static void onStart(Context context) {

        RecentsModel model = RecentsModel.getInstance(context);

        if (model != null) {

            model.onStart();

        }

    }



    public static void onTrimMemory(Launcher launcher, int level) {

        RecentsModel model = RecentsModel.getInstance(launcher);

    public static void onTrimMemory(Context context, int level) {

        RecentsModel model = RecentsModel.getInstance(context);

        if (model != null) {

            model.onTrimMemory(level);

        }

quickstep/src/com/android/quickstep/ActivityControlHelper.java

0 → 100644
+308 −0
Original line number Diff line number Diff line 
/*

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



import static com.android.launcher3.LauncherState.FAST_OVERVIEW;

import static com.android.launcher3.LauncherState.OVERVIEW;

import static com.android.launcher3.allapps.AllAppsTransitionController.ALL_APPS_PROGRESS;

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



import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;

import android.app.ActivityOptions;

import android.content.Context;

import android.content.Intent;

import android.graphics.Rect;

import android.os.Handler;

import android.os.Looper;

import android.view.View;



import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;

import com.android.launcher3.LauncherInitListener;

import com.android.launcher3.LauncherState;

import com.android.launcher3.allapps.AllAppsTransitionController;

import com.android.launcher3.anim.AnimatorPlaybackController;

import com.android.launcher3.util.ViewOnDrawExecutor;

import com.android.quickstep.views.LauncherLayoutListener;

import com.android.quickstep.views.RecentsView;

import com.android.quickstep.views.TaskView;

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

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

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

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

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



import java.util.function.BiPredicate;



/**

 * Utility class which abstracts out the logical differences between Launcher and RecentsActivity.

 */

public interface ActivityControlHelper<T extends BaseDraggingActivity> {



    LayoutListener createLayoutListener(T activity);



    void onQuickstepGestureStarted(T activity, boolean activityVisible);



    void onQuickInteractionStart(T activity, boolean activityVisible);



    void executeOnNextDraw(T activity, TaskView targetView, Runnable action);



    void onTransitionCancelled(T activity, boolean activityVisible);



    int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect);



    void onSwipeUpComplete(T activity);



    void prepareRecentsUI(T activity, boolean activityVisible);



    AnimatorPlaybackController createControllerForVisibleActivity(T activity);



    AnimatorPlaybackController createControllerForHiddenActivity(T activity, int transitionLength);



    ActivityInitListener createActivityInitListener(BiPredicate<T, Boolean> onInitListener);



    void startRecents(Context context, Intent intent, AssistDataReceiver assistDataReceiver,

            RecentsAnimationListener remoteAnimationListener);



    class LauncherActivityControllerHelper implements ActivityControlHelper<Launcher> {



        @Override

        public LayoutListener createLayoutListener(Launcher activity) {

            return new LauncherLayoutListener(activity);

        }



        @Override

        public void onQuickstepGestureStarted(Launcher activity, boolean activityVisible) {

            activity.onQuickstepGestureStarted(activityVisible);

        }



        @Override

        public void onQuickInteractionStart(Launcher activity, boolean activityVisible) {

            activity.getStateManager().goToState(FAST_OVERVIEW, activityVisible);

        }



        @Override

        public void executeOnNextDraw(Launcher activity, TaskView targetView, Runnable action) {

            ViewOnDrawExecutor executor = new ViewOnDrawExecutor() {

                @Override

                public void onViewDetachedFromWindow(View v) {

                    if (!isCompleted()) {

                        runAllTasks();

                    }

                }

            };

            executor.attachTo(activity, targetView, false /* waitForLoadAnimation */);

            executor.execute(action);

        }



        @Override

        public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {

            RecentsView.getPageRect(dp, context, outRect);

            if (dp.isVerticalBarLayout()) {

                Rect targetInsets = dp.getInsets();

                int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;

                return dp.hotseatBarSizePx + dp.hotseatBarSidePaddingPx + hotseatInset;

            } else {

                return dp.heightPx - outRect.bottom;

            }

        }



        @Override

        public void onTransitionCancelled(Launcher activity, boolean activityVisible) {

            LauncherState startState = activity.getStateManager().getRestState();

            activity.getStateManager().goToState(startState, activityVisible);

        }



        @Override

        public void onSwipeUpComplete(Launcher activity) {

            // Re apply state in case we did something funky during the transition.

            activity.getStateManager().reapplyState();

        }



        @Override

        public void prepareRecentsUI(Launcher activity, boolean activityVisible) {

            LauncherState startState = activity.getStateManager().getState();

            if (startState.disableRestore) {

                startState = activity.getStateManager().getRestState();

            }

            activity.getStateManager().setRestState(startState);



            if (!activityVisible) {

                activity.getStateManager().goToState(OVERVIEW, false);



                // Optimization, hide the all apps view to prevent layout while initializing

                activity.getAppsView().setVisibility(View.GONE);

            }

        }



        @Override

        public AnimatorPlaybackController createControllerForVisibleActivity(Launcher activity) {

            DeviceProfile dp = activity.getDeviceProfile();

            long accuracy = 2 * Math.max(dp.widthPx, dp.heightPx);

            return activity.getStateManager().createAnimationToNewWorkspace(OVERVIEW, accuracy);

        }



        @Override

        public AnimatorPlaybackController createControllerForHiddenActivity(

                Launcher activity, int transitionLength) {

            float startProgress;

            AllAppsTransitionController controller = activity.getAllAppsController();



            if (activity.getDeviceProfile().isVerticalBarLayout()) {

                startProgress = 1;

            } else {

                float scrollRange = Math.max(controller.getShiftRange(), 1);

                startProgress = (transitionLength / scrollRange) + 1;

            }

            AnimatorSet anim = new AnimatorSet();

            ObjectAnimator shiftAnim = ObjectAnimator.ofFloat(controller, ALL_APPS_PROGRESS,

                    startProgress, OVERVIEW.getVerticalProgress(activity));

            shiftAnim.setInterpolator(LINEAR);

            anim.play(shiftAnim);



            // TODO: Link this animation to state animation, so that it is cancelled

            // automatically on state change

            anim.setDuration(transitionLength * 2);

            return AnimatorPlaybackController.wrap(anim, transitionLength * 2);

        }



        @Override

        public ActivityInitListener createActivityInitListener(

                BiPredicate<Launcher, Boolean> onInitListener) {

            return new LauncherInitListener(onInitListener);

        }



        @Override

        public void startRecents(Context context, Intent intent,

                AssistDataReceiver assistDataReceiver,

                RecentsAnimationListener remoteAnimationListener) {

            ActivityManagerWrapper.getInstance().startRecentsActivity(

                    intent, assistDataReceiver, remoteAnimationListener, null, null);

        }

    }



    class FallbackActivityControllerHelper implements ActivityControlHelper<RecentsActivity> {



        @Override

        public void onQuickstepGestureStarted(RecentsActivity activity, boolean activityVisible) {

            // TODO:

        }



        @Override

        public void onQuickInteractionStart(RecentsActivity activity, boolean activityVisible) {

            // TODO:

        }



        @Override

        public void executeOnNextDraw(RecentsActivity activity, TaskView targetView,

                Runnable action) {

            // TODO:

            new Handler(Looper.getMainLooper()).post(action);

        }



        @Override

        public void onTransitionCancelled(RecentsActivity activity, boolean activityVisible) {

            // TODO:

        }



        @Override

        public int getSwipeUpDestinationAndLength(DeviceProfile dp, Context context, Rect outRect) {

            FallbackRecentsView.getCenterPageRect(dp, context, outRect);

            if (dp.isVerticalBarLayout()) {

                Rect targetInsets = dp.getInsets();

                int hotseatInset = dp.isSeascape() ? targetInsets.left : targetInsets.right;

                return dp.hotseatBarSizePx + dp.hotseatBarSidePaddingPx + hotseatInset;

            } else {

                return dp.heightPx - outRect.bottom;

            }

        }



        @Override

        public void onSwipeUpComplete(RecentsActivity activity) {

            // TODO:

        }



        @Override

        public void prepareRecentsUI(RecentsActivity activity, boolean activityVisible) {

            // TODO:

        }



        @Override

        public AnimatorPlaybackController createControllerForVisibleActivity(

                RecentsActivity activity) {

            DeviceProfile dp = activity.getDeviceProfile();

            return createControllerForHiddenActivity(activity, Math.max(dp.widthPx, dp.heightPx));

        }



        @Override

        public AnimatorPlaybackController createControllerForHiddenActivity(

                RecentsActivity activity, int transitionLength) {

            // We do not animate anything. Create a empty controller

            AnimatorSet anim = new AnimatorSet();

            return AnimatorPlaybackController.wrap(anim, transitionLength * 2);

        }



        @Override

        public LayoutListener createLayoutListener(RecentsActivity activity) {

            // We do not change anything as part of layout changes in fallback activity. Return a

            // default layout listener.

            return new LayoutListener() {

                @Override

                public void open() { }



                @Override

                public void setHandler(WindowTransformSwipeHandler handler) { }



                @Override

                public void finish() { }

            };

        }



        @Override

        public ActivityInitListener createActivityInitListener(

                BiPredicate<RecentsActivity, Boolean> onInitListener) {

            return new RecentsActivityTracker(onInitListener);

        }



        @Override

        public void startRecents(Context context, Intent intent,

                AssistDataReceiver assistDataReceiver,

                final RecentsAnimationListener remoteAnimationListener) {

            ActivityOptions options =

                    ActivityOptionsCompat.makeRemoteAnimation(new RemoteAnimationAdapterCompat(

                            new FallbackActivityOptions(remoteAnimationListener), 10000, 10000));

            context.startActivity(intent, options.toBundle());

        }

    }



    interface LayoutListener {



        void open();



        void setHandler(WindowTransformSwipeHandler handler);



        void finish();

    }



    interface ActivityInitListener {



        void register();



        void unregister();

    }

}