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

Merge "Update overview to fit transient taskbar" into tm-qpr-dev am: 3dc6d7fb47

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

Change-Id: I3907c3804f3c1a7e8b4fc9f647bde01b5eb186ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Alex Chau
2022-11-17 11:34:15 +00:00
committed by Automerger Merge Worker
parent 7f754c162e 3dc6d7fb47
commit 29db172f9f
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/DeviceProfile.java
+11 -8
View File
@@ -255,6 +255,7 @@ public class DeviceProfile {
public boolean isTaskbarPresentInApps;
public int taskbarSize;
public int stashedTaskbarSize;
public int transientTaskbarMargin;
// DragController
public int flingToDeleteThresholdVelocity;
@@ -320,6 +321,8 @@ public class DeviceProfile {
taskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size);
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);
@@ -1305,15 +1308,15 @@ public class DeviceProfile {
* Returns the number of pixels required below OverviewActions excluding insets.
*/
public int getOverviewActionsClaimedSpaceBelow() {
if (isTaskbarPresent && !isGestureMode
// If taskbar is in overview, overview action has dedicated space above nav buttons
&& !FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get()) {
// Align vertically to where nav buttons are.
return ((taskbarSize - overviewActionsHeight) / 2) + getTaskbarOffsetY();
}
if (isTaskbarPresent) {
return FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get() ? taskbarSize : stashedTaskbarSize;
if (FeatureFlags.ENABLE_TASKBAR_IN_OVERVIEW.get()) {
return taskbarSize + transientTaskbarMargin;
}
return isGestureMode
? stashedTaskbarSize
// Align vertically to where nav buttons are.
: ((taskbarSize - overviewActionsHeight) / 2) + getTaskbarOffsetY();
}
return mInsets.bottom;
}