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

Commit fdbc99b7 authored by Jon Miranda's avatar Jon Miranda Committed by Automerger Merge Worker
Browse files

Merge "Only hide taskbar view for app launches w/ transient taskbar." into... 

Merge "Only hide taskbar view for app launches w/ transient taskbar." into tm-qpr-dev am: 15ca085d

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21986398



Change-Id: Ib4837e460463b9c56b57d85e52c8c460945cf5c6
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0714e68c 15ca085d

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

+3 −3
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import static com.android.launcher3.config.FeatureFlags.ENABLE_SCRIM_FOR_APP_LAU 
import static com.android.launcher3.config.FeatureFlags.KEYGUARD_ANIMATION;

import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY;

import static com.android.launcher3.model.data.ItemInfo.NO_MATCHING_ID;

import static com.android.launcher3.util.DisplayController.isTransientTaskbar;

import static com.android.launcher3.util.MultiPropertyFactory.MULTI_PROPERTY_VALUE;

import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;

import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION;
@@ -122,7 +123,6 @@ import com.android.launcher3.testing.shared.ResourceUtils; 
import com.android.launcher3.touch.PagedOrientationHandler;

import com.android.launcher3.uioverrides.QuickstepLauncher;

import com.android.launcher3.util.ActivityOptionsWrapper;

import com.android.launcher3.util.DisplayController;

import com.android.launcher3.util.DynamicResource;

import com.android.launcher3.util.ObjectWrapper;

import com.android.launcher3.util.RunnableList;
@@ -448,7 +448,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 
        }

        if (mDeviceProfile.isTaskbarPresentInApps

                && !target.willShowImeOnTarget

                && !DisplayController.isTransientTaskbar(mLauncher)) {

                && !isTransientTaskbar(mLauncher)) {

            // Animate to above the taskbar.

            bounds.bottom -= target.contentInsets.bottom;

        }
@@ -635,7 +635,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener 


        RectF launcherIconBounds = new RectF();

        FloatingIconView floatingView = getFloatingIconView(mLauncher, v,

                mLauncher.getTaskbarUIController() == null

                (mLauncher.getTaskbarUIController() == null || !isTransientTaskbar(mLauncher))

                        ? null

                        : mLauncher.getTaskbarUIController().findMatchingView(v),

                !appTargetsAreTranslucent, launcherIconBounds, true /* isOpening */);