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

Commit 5841e40a authored by Winson Chung's avatar Winson Chung
Browse files

Merging ub-launcher3-qt-r1-dev, build 5736932 

Test: Manual

Bug:111935715 P2 Incorrect parent type when logging drag and drop from All Apps
Bug:131315856 P1 [PO restore] No work profile launcher shortcuts restore ~50% of the time
Bug:132900132 P1 Apparently, tests start running while provisioning is still in progress
Bug:133009122 P2 Rare flake: dragged launchable to workspace, but the current state is not WORKSPACE; Can't find a launcher object; selector: BySelector [RES='\Qcom.google.android.apps.nexuslauncher:id/apps_view\E']
Bug:133765434 P1 [Flaky test] Launching task didn't open a new window
Bug:133867119 P2 Lab-only flake: want to switch from workspace to all apps; Swipe failed to receive an event for the swipe end
Bug:133891845 P2 TAPL: need clearer diags when a crash dialog is over Launcher or there is lock screeen
Bug:134532571 P1 Launcher flake: java.lang.AssertionError: http://go/tapl : want to switch from background to overview, but the current state is not BASE_OVERVIEW; Can't find a launcher object; selector: BySelector [RES='\Qcom.google.android.apps.nexuslauncher:id/overview_panel\E']
Bug:135165284 P2 [Q-Preview4] Gestural navigation animation glitch on RTL
Bug:135567630 P1 testBackground crashes in Landscape
Bug:135636137 P1 Workspace is clipped at the top when transitioning from app -> home
Bug:135687618 P4 Task shows between back and swiping up to overview
Bug:135952890 P1 Drag up on home indicator does not track finger if recently entered split screen
Bug:136033787 P0 Vzw DoU: sendexchangeemail wifi test fails with failed dismissal exception
Bug:136215685 P1 Flake: swiping up from Home to Overview in 2-button mode sometimes fails
Bug:137197916 P1 Add gesture support for 3p Launcher
Bug:137215697 P2 FloatingIcon and workspace icon visible at the same time when touch input during app to close animation
Bug:137290162 P1 Overview suggest chip showing on apps due to misconfigured flag
Bug:137316430 P1 Jank when swiping quickly back down to home when overview is peeking
Bug:64712476 P3 Import translations for dev branches
Change-Id: Ib228c0f291884050904fa069e25519755071c40a
parents ea8fb85c 11b55355

go/quickstep/src/com/android/quickstep/TouchInteractionService.java

+9 −0
Original line number Diff line number Diff line
@@ -34,6 +34,8 @@ import android.view.MotionEvent; 


import com.android.launcher3.Utilities;

import com.android.launcher3.compat.UserManagerCompat;

import com.android.launcher3.util.LooperExecutor;

import com.android.launcher3.util.UiThreadHelper;

import com.android.systemui.shared.recents.IOverviewProxy;

import com.android.systemui.shared.recents.ISystemUiProxy;
@@ -137,6 +139,9 @@ public class TouchInteractionService extends Service { 
        return sConnected;

    }



    public static final LooperExecutor BACKGROUND_EXECUTOR =

            new LooperExecutor(UiThreadHelper.getBackgroundLooper());



    private RecentsModel mRecentsModel;

    private OverviewComponentObserver mOverviewComponentObserver;

    private OverviewCommandHelper mOverviewCommandHelper;
@@ -180,4 +185,8 @@ public class TouchInteractionService extends Service { 
        }

        return mMyBinder;

    }



    public static boolean isInputMonitorInitialized() {

        return true;

    }

}

quickstep/AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    package="com.android.launcher3" >



    <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />

    <uses-permission android:name="android.permission.VIBRATE" />



    <application

        android:backupAgent="com.android.launcher3.LauncherBackupAgent"

quickstep/recents_ui_overrides/src/com/android/launcher3/uioverrides/touchcontrollers/FlingAndHoldTouchController.java

+15 −0
Original line number Diff line number Diff line
@@ -167,6 +167,21 @@ public class FlingAndHoldTouchController extends PortraitStatesTouchController { 
        mMotionPauseDetector.clear();

    }



    @Override

    protected void goToTargetState(LauncherState targetState, int logAction) {

        if (mPeekAnim != null && mPeekAnim.isStarted()) {

            // Don't jump to the target state until overview is no longer peeking.

            mPeekAnim.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {

                    FlingAndHoldTouchController.super.goToTargetState(targetState, logAction);

                }

            });

        } else {

            super.goToTargetState(targetState, logAction);

        }

    }



    @Override

    protected void updateAnimatorBuilderOnReinit(AnimatorSetBuilder builder) {

        if (handlingOverviewAnim()) {

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

0 → 100644
+496 −0

File added.

Preview size limit exceeded, changes collapsed.

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

+1 −10
Original line number Diff line number Diff line
@@ -151,16 +151,10 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe 
            @NonNull

            @Override

            public RectF getWindowTargetRect() {

                final int halfIconSize = dp.iconSizePx / 2;

                final float targetCenterX = dp.availableWidthPx / 2f;

                final float targetCenterY = dp.availableHeightPx - dp.hotseatBarSizePx;



                if (canUseWorkspaceView) {

                    return iconLocation;

                } else {

                    // Fallback to animate to center of screen.

                    return new RectF(targetCenterX - halfIconSize, targetCenterY - halfIconSize,

                            targetCenterX + halfIconSize, targetCenterY + halfIconSize);

                    return HomeAnimationFactory.getDefaultWindowTargetRect(dp);

                }

            }
@@ -194,9 +188,6 @@ public final class LauncherActivityControllerHelper implements ActivityControlHe 
    @Override

    public AnimationFactory prepareRecentsUI(Launcher activity, boolean activityVisible,

            boolean animateActivity, Consumer<AnimatorPlaybackController> callback) {

        if (TestProtocol.sDebugTracing) {

            Log.d(TestProtocol.NO_OVERVIEW_EVENT_TAG, "prepareRecentsUI");

        }

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



        LauncherState resetState = startState;