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

Commit 21c62170 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Snap for 5153607 from 87c45e2b to qt-release 

Change-Id: Ib8cc30e42625354d3f14a7eaf8e02ca1256df6bf
parents 054d0c21 87c45e2b

proguard.flags

+1 −0
Original line number Diff line number Diff line
@@ -50,3 +50,4 @@ 
-dontwarn android.app.**

-dontwarn android.view.**

-dontwarn android.os.**

-dontwarn android.graphics.**
 
 No newline at end of file

quickstep/libs/sysui_shared.jar

+654 B (140 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

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

+15 −7
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import static com.android.quickstep.TouchConsumer.INTERACTION_QUICK_SCRUB; 
import static com.android.quickstep.views.RecentsView.CONTENT_ALPHA;

import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_BACK;

import static com.android.systemui.shared.system.NavigationBarCompat.HIT_TARGET_ROTATION;



import android.animation.Animator;

import android.animation.AnimatorSet;

import android.animation.ObjectAnimator;
@@ -44,7 +43,8 @@ import android.os.Build; 
import android.os.Handler;

import android.os.Looper;

import android.view.View;



import androidx.annotation.Nullable;

import androidx.annotation.UiThread;

import com.android.launcher3.BaseDraggingActivity;

import com.android.launcher3.DeviceProfile;

import com.android.launcher3.Launcher;
@@ -77,9 +77,6 @@ import java.util.Objects; 
import java.util.function.BiPredicate;

import java.util.function.Consumer;



import androidx.annotation.Nullable;

import androidx.annotation.UiThread;



/**

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

 */
@@ -156,10 +153,21 @@ public interface ActivityControlHelper<T extends BaseDraggingActivity> { 
        public void onQuickInteractionStart(Launcher activity, RunningTaskInfo taskInfo,

                boolean activityVisible, TouchInteractionLog touchInteractionLog) {

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

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



            QuickScrubController controller = activity.<RecentsView>getOverviewPanel()

                    .getQuickScrubController();

            boolean isQuickSwitch = controller.isQuickSwitch();

            boolean animate = activityVisible;

            if (isQuickSwitch && fromState == FAST_OVERVIEW && !animate) {

                // We can already be in FAST_OVERVIEW if createActivityController() was called

                // before us. This could happen, for instance, when launcher is slow to load when

                // starting quick switch, causing us to call onQuickScrubStart() on the background

                // thread. In this case, we also hadn't set isQuickSwitch = true before setting

                // FAST_OVERVIEW, so we need to reapply FAST_OVERVIEW to take that into account.

                activity.getStateManager().reapplyState();

            } else {

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

            }



            controller.onQuickScrubStart(activityVisible && !fromState.overviewUi, this,

                    touchInteractionLog);

quickstep/src/com/android/quickstep/RecentsActivity.java

+0 −9
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import com.android.launcher3.ItemInfo; 
import com.android.launcher3.LauncherAnimationRunner;

import com.android.launcher3.R;

import com.android.launcher3.anim.Interpolators;

import com.android.launcher3.badge.BadgeInfo;

import com.android.launcher3.uioverrides.UiFactory;

import com.android.launcher3.util.SystemUiController;

import com.android.launcher3.util.Themes;
@@ -155,11 +154,6 @@ public class RecentsActivity extends BaseDraggingActivity { 
        return (T) mFallbackRecentsView;

    }



    @Override

    public BadgeInfo getBadgeInfoForItem(ItemInfo info) {

        return null;

    }



    @Override

    public ActivityOptions getActivityLaunchOptions(final View v) {

        if (!(v instanceof TaskView)) {
@@ -210,9 +204,6 @@ public class RecentsActivity extends BaseDraggingActivity { 
        return target;

    }



    @Override

    public void invalidateParent(ItemInfo info) { }



    @Override

    protected void onStart() {

        // Set the alpha to 1 before calling super, as it may get set back to 0 due to

quickstep/src/com/android/quickstep/TaskSystemShortcut.java

+2 −1
Original line number Diff line number Diff line
@@ -203,7 +203,8 @@ public class TaskSystemShortcut<T extends SystemShortcut> extends SystemShortcut 
                        }

                    };

                    WindowManagerWrapper.getInstance().overridePendingAppTransitionMultiThumbFuture(

                            future, animStartedListener, mHandler, true /* scaleUp */);

                            future, animStartedListener, mHandler, true /* scaleUp */,

                            v.getDisplay().getDisplayId());

                }

            });

        }