Merge "Use transient taskbar check in split screen" into udc-qpr-dev am: a0e0069cbd am: 1a96167f44
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:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user