aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-20 11:18:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Revert^3 "Maximised the taskbar window to the default size"" into main

Browse Source
This commit is contained in:
Mykola Podolian
2025-04-21 14:10:13 -07:00
committed by Android (Google) Code Review
parent ae986a5682 ac7db52a91
commit 6ba50e36e4
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1296,25 +1296,20 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
}
/**
* Updates the TaskbarContainer size, using the maximum of the provided {@code size}
* and the default size from {@link #getDefaultTaskbarWindowSize()}.
* Updates the TaskbarContainer size (pass {@link #getDefaultTaskbarWindowSize()} to reset).
*/
public void setTaskbarWindowSize(int size) {
// In landscape phone button nav mode, we should set the task bar width instead of height
// because this is the only case in which the nav bar is not on the display bottom.
int windowSize = size;
if (windowSize != MATCH_PARENT) {
windowSize = Math.max(size, getDefaultTaskbarWindowSize());
}
boolean landscapePhoneButtonNav = isPhoneButtonNavMode() && mDeviceProfile.isLandscape;
if ((landscapePhoneButtonNav ? mWindowLayoutParams.width : mWindowLayoutParams.height)
== windowSize || mIsDestroyed) {
== size || mIsDestroyed) {
return;
}
if (windowSize == MATCH_PARENT) {
windowSize = mDeviceProfile.heightPx;
if (size == MATCH_PARENT) {
size = mDeviceProfile.heightPx;
} else {
mLastRequestedNonFullscreenSize = windowSize;
mLastRequestedNonFullscreenSize = size;
if (mIsFullscreen || mIsTaskbarSizeFrozenForAnimatingBubble) {
// We either still need to be fullscreen or a bubble is still animating, so defer
// any change to our height until setTaskbarWindowFullscreen(false) is called or
@@ -1326,14 +1321,14 @@ public class TaskbarActivityContext extends BaseTaskbarContext {
}
}
if (landscapePhoneButtonNav) {
mWindowLayoutParams.width = windowSize;
mWindowLayoutParams.width = size;
for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {
mWindowLayoutParams.paramsForRotation[rot].width = windowSize;
mWindowLayoutParams.paramsForRotation[rot].width = size;
}
} else {
mWindowLayoutParams.height = windowSize;
mWindowLayoutParams.height = size;
for (int rot = Surface.ROTATION_0; rot <= Surface.ROTATION_270; rot++) {
mWindowLayoutParams.paramsForRotation[rot].height = windowSize;
mWindowLayoutParams.paramsForRotation[rot].height = size;
}
}
mControllers.runAfterInit(