aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Send corrent SUW insets for taskbar portrait vs landscape" into tm-qpr-dev

Browse Source
This commit is contained in:
Vinit Nayak
2022-11-30 00:50:51 +00:00
committed by Android (Google) Code Review
parent 912e6dd64d 209dd03b69
commit 792a827309
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java
View File

@@ -375,11 +375,11 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
if (supportsVisualStashing() && hasAnyFlag(FLAGS_REPORT_STASHED_INSETS_TO_APP)) {
DeviceProfile dp = mActivity.getDeviceProfile();
if (hasAnyFlag(FLAG_STASHED_IN_APP_SETUP) && dp.isTaskbarPresent && !dp.isLandscape) {
if (hasAnyFlag(FLAG_STASHED_IN_APP_SETUP) && dp.isTaskbarPresent) {
// We always show the back button in SUW but in portrait the SUW layout may not
// be wide enough to support overlapping the nav bar with its content. For now,
// just inset by the bar height.
return mUnstashedHeight;
// be wide enough to support overlapping the nav bar with its content.
// We're sending different res values in portrait vs landscape
return mActivity.getResources().getDimensionPixelSize(R.dimen.taskbar_suw_insets);
}
boolean isAnimating = mAnimator != null && mAnimator.isStarted();
if (!mControllers.stashedHandleViewController.isStashedHandleVisible()
@@ -393,10 +393,6 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba
return mStashedHeight;
}
if (!mActivity.isUserSetupComplete()) {
// Special insets for SUW.
return mActivity.getResources().getDimensionPixelSize(R.dimen.taskbar_suw_insets);
}
return mUnstashedHeight;
}