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

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

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

Change-Id: Ifb13e200987d1a3475c1116589d87c57376c8179
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vinit Nayak
2022-11-30 01:13:40 +00:00
committed by Automerger Merge Worker
parent 1c96b6584c 792a827309
commit 5d84ac3640
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java
View File

@@ -210,7 +210,7 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
DeviceProfile deviceProfile = mContext.getDeviceProfile();
Resources resources = mContext.getResources();
Point p = !mContext.isUserSetupComplete()
? new Point(0, resources.getDimensionPixelSize(R.dimen.taskbar_suw_frame))
? new Point(0, controllers.taskbarActivityContext.getSetupWindowHeight())
: DimensionUtils.getTaskbarPhoneDimensions(deviceProfile, resources,
TaskbarManager.isPhoneMode(deviceProfile));
mNavButtonsView.getLayoutParams().height = p.y;
@@ -691,8 +691,9 @@ public class NavbarButtonsViewController implements TaskbarControllers.LoggableT
(resources.getDimensionPixelSize(R.dimen.taskbar_nav_buttons_size) / 2);
navButtonsLayoutParams.setMarginEnd(0);
navButtonsLayoutParams.gravity = Gravity.START;
mNavButtonsView.getLayoutParams().height =
mControllers.taskbarActivityContext.getSetupWindowHeight();
mNavButtonContainer.setLayoutParams(navButtonsLayoutParams);
mNavButtonContainer.requestLayout();
}
/**

9
quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java
View File

@@ -341,6 +341,9 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
public void onConfigurationChanged(@Config int configChanges) {
mControllers.onConfigurationChanged(configChanges);
if (!mIsUserSetupComplete) {
setTaskbarWindowHeight(getSetupWindowHeight());
}
}
public boolean isThreeButtonNav() {
@@ -673,7 +676,7 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
}
if (!isUserSetupComplete()) {
return resources.getDimensionPixelSize(R.dimen.taskbar_suw_frame);
return getSetupWindowHeight();
}
if (DisplayController.isTransientTaskbar(this)) {
@@ -685,6 +688,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
return mDeviceProfile.taskbarSize + Math.max(getLeftCornerRadius(), getRightCornerRadius());
}
public int getSetupWindowHeight() {
return getResources().getDimensionPixelSize(R.dimen.taskbar_suw_frame);
}
/**
* Either adds or removes {@link WindowManager.LayoutParams#FLAG_NOT_FOCUSABLE} on the taskbar
* window.

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;
}