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

Merge "Use transient taskbar check in split screen" into udc-qpr-dev am: a0e0069cbd am: 1a96167f44

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

Change-Id: I267243abb7a270eca7acb6c574ab97e9832faf07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Thales Lima
2023-09-07 11:40:26 +00:00
committed by Automerger Merge Worker
parent 6fe9c3e555 1a96167f44
commit ec8265f437
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DeviceProfile.java
+3 -1
View File
@@ -296,6 +296,7 @@ public class DeviceProfile {
public final int taskbarIconSize;
// If true, used to layout taskbar in 3 button navigation mode.
public final boolean startAlignTaskbar;
public final boolean isTransientTaskbar;
// DragController
public int flingToDeleteThresholdVelocity;
@@ -363,7 +364,8 @@ public class DeviceProfile {
}
}
if (DisplayController.isTransientTaskbar(context)) {
isTransientTaskbar = DisplayController.isTransientTaskbar(context);
if (isTransientTaskbar) {
float invTransientIconSizeDp = inv.transientTaskbarIconSize[mTypeIndex];
taskbarIconSize = pxFromDp(invTransientIconSizeDp, mMetrics);
taskbarHeight = Math.round((taskbarIconSize * ICON_VISIBLE_AREA_FACTOR)
src/com/android/launcher3/touch/PortraitPagedViewHandler.java
+4 -2
View File
@@ -582,7 +582,8 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
? splitInfo.dividerHeightPercent
: splitInfo.dividerWidthPercent;
float scale = (float) outRect.height() / dp.availableHeightPx;
int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight;
float scale = (float) outRect.height() / (dp.availableHeightPx - taskbarHeight);
float topTaskHeight = dp.availableHeightPx * topLeftTaskPercent;
float scaledTopTaskHeight = topTaskHeight * scale;
float dividerHeight = dp.availableHeightPx * dividerBarPercent;
@@ -639,7 +640,8 @@ public class PortraitPagedViewHandler implements PagedOrientationHandler {
// Reset unused translations
primarySnapshot.setTranslationY(0);
} else {
float scale = (float) totalThumbnailHeight / dp.availableHeightPx;
int taskbarHeight = dp.isTransientTaskbar ? 0 : dp.taskbarHeight;
float scale = (float) totalThumbnailHeight / (dp.availableHeightPx - taskbarHeight);
float topTaskHeight = dp.availableHeightPx * taskPercent;
float finalDividerHeight = Math.round(totalThumbnailHeight * dividerScale);
float scaledTopTaskHeight = topTaskHeight * scale;