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

Merge "Use transient taskbar size/margin to calculate taskbar position for persistent taskbar" into tm-qpr-dev am: 6ef0f12286

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

Change-Id: Ia2d14bdd2ccea3b5f57920a019cde0c12310b4c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Chau
2023-01-18 16:11:28 +00:00
committed by Automerger Merge Worker
parent c18a4081d5 6ef0f12286
commit 73f1fa59c0
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/launcher3/DeviceProfile.java
View File

@@ -260,6 +260,7 @@ public class DeviceProfile {
// Whether Taskbar will inset the bottom of apps by taskbarSize.
public boolean isTaskbarPresentInApps;
public int taskbarSize;
public int transientTaskbarSize;
public int stashedTaskbarSize;
public int transientTaskbarMargin;
@@ -324,12 +325,12 @@ public class DeviceProfile {
}
if (isTaskbarPresent) {
transientTaskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size);
transientTaskbarMargin = res.getDimensionPixelSize(R.dimen.transient_taskbar_margin);
if (DisplayController.isTransientTaskbar(context)) {
taskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size);
taskbarSize = transientTaskbarSize;
stashedTaskbarSize =
res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_size);
transientTaskbarMargin =
res.getDimensionPixelSize(R.dimen.transient_taskbar_margin);
} else {
taskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_size);
stashedTaskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_stashed_size);
@@ -1383,7 +1384,7 @@ public class DeviceProfile {
public int getOverviewActionsClaimedSpaceBelow() {
if (isTaskbarPresent) {
if (FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get()) {
return taskbarSize + transientTaskbarMargin * 2;
return transientTaskbarSize + transientTaskbarMargin * 2;
}
return isGestureMode