pa-fazil
/
android_packages_apps_Launcher3
mirror of https://github.com/fazilsheik96/android_packages_apps_Launcher3
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
Jon Miranda 2023-03-13 23:54:06 +00:00 committed by Android (Google) Code Review
parent df57fd822c c58dc1063a
commit 15ca085d5c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
quickstep/src/com/android/launcher3/QuickstepTransitionManager.java
View File

@ -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.KEYGUARD_ANIMATION;
import static com.android.launcher3.config.FeatureFlags.SEPARATE_RECENTS_ACTIVITY; 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.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.MultiPropertyFactory.MULTI_PROPERTY_VALUE;
import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs; import static com.android.launcher3.util.window.RefreshRateTracker.getSingleFrameMs;
import static com.android.launcher3.views.FloatingIconView.SHAPE_PROGRESS_DURATION; 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.touch.PagedOrientationHandler;
import com.android.launcher3.uioverrides.QuickstepLauncher; import com.android.launcher3.uioverrides.QuickstepLauncher;
import com.android.launcher3.util.ActivityOptionsWrapper; import com.android.launcher3.util.ActivityOptionsWrapper;
import com.android.launcher3.util.DisplayController;
import com.android.launcher3.util.DynamicResource; import com.android.launcher3.util.DynamicResource;
import com.android.launcher3.util.ObjectWrapper; import com.android.launcher3.util.ObjectWrapper;
import com.android.launcher3.util.RunnableList; import com.android.launcher3.util.RunnableList;
@ -448,7 +448,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
} }
if (mDeviceProfile.isTaskbarPresentInApps if (mDeviceProfile.isTaskbarPresentInApps
&& !target.willShowImeOnTarget && !target.willShowImeOnTarget
&& !DisplayController.isTransientTaskbar(mLauncher)) { && !isTransientTaskbar(mLauncher)) {
// Animate to above the taskbar. // Animate to above the taskbar.
bounds.bottom -= target.contentInsets.bottom; bounds.bottom -= target.contentInsets.bottom;
} }
@ -635,7 +635,7 @@ public class QuickstepTransitionManager implements OnDeviceProfileChangeListener
RectF launcherIconBounds = new RectF(); RectF launcherIconBounds = new RectF();
FloatingIconView floatingView = getFloatingIconView(mLauncher, v, FloatingIconView floatingView = getFloatingIconView(mLauncher, v,
mLauncher.getTaskbarUIController() == null (mLauncher.getTaskbarUIController() == null || !isTransientTaskbar(mLauncher))
? null ? null
: mLauncher.getTaskbarUIController().findMatchingView(v), : mLauncher.getTaskbarUIController().findMatchingView(v),
!appTargetsAreTranslucent, launcherIconBounds, true /* isOpening */); !appTargetsAreTranslucent, launcherIconBounds, true /* isOpening */);