PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix predictive back to home with pinned taskbar

Browse Source 
Bug: 309969400
Flag: ACONFIG com.android.window.flags.predictive_back_system_animations DISABLED
Test: Manual, i.e. testing predictive back with pinned taskbar
Change-Id: Ic6f747e87f8ebb2bed58f4783736ed4dca43fb7e
This commit is contained in:
Johannes Gallmann
2023-12-07 15:48:39 +01:00
parent 52b5113e8d
commit 661f96066e
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
quickstep/src/com/android/quickstep/LauncherBackAnimationController.java
+8 -1
View File
@@ -23,6 +23,8 @@ import static com.android.launcher3.AbstractFloatingView.TYPE_REBIND_SAFE;
import static com.android.launcher3.BaseActivity.INVISIBLE_ALL;
import static com.android.launcher3.BaseActivity.INVISIBLE_BY_PENDING_FLAGS;
import static com.android.launcher3.BaseActivity.PENDING_INVISIBLE_BY_WALLPAPER_ANIMATION;
import static com.android.launcher3.LauncherPrefs.TASKBAR_PINNING;
import static com.android.launcher3.config.FeatureFlags.enableTaskbarPinning;
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
@@ -52,6 +54,7 @@ import android.window.IOnBackInvokedCallback;
import com.android.internal.view.AppearanceRegion;
import com.android.launcher3.AbstractFloatingView;
import com.android.launcher3.LauncherPrefs;
import com.android.launcher3.QuickstepTransitionManager;
import com.android.launcher3.R;
import com.android.launcher3.Utilities;
@@ -294,8 +297,12 @@ public class LauncherBackAnimationController {
mBackTarget = appTarget;
mInitialTouchPos.set(backEvent.getTouchX(), backEvent.getTouchY());
// TODO(b/218916755): Offset start rectangle in multiwindow mode.
mStartRect.set(appTarget.windowConfiguration.getMaxBounds());
if (mLauncher.getDeviceProfile().isTaskbarPresent && enableTaskbarPinning()
&& LauncherPrefs.get(mLauncher).get(TASKBAR_PINNING)) {
int insetBottom = mStartRect.bottom - appTarget.contentInsets.bottom;
mStartRect.set(mStartRect.left, mStartRect.top, mStartRect.right, insetBottom);
}
mCurrentRect.set(mStartRect);
addScrimLayer();
mTransaction.apply();