diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 32250787b3..6e3fd32329 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -288,6 +288,8 @@ 24dp 40dp 10dp + 32dp + 10dp 150dp 225dp diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index afd659fc6e..72ae1d1c31 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -190,8 +190,13 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba if (isPhoneMode()) { // DeviceProfile's taskbar vars aren't initialized w/ the flag off Resources resources = mActivity.getResources(); - mUnstashedHeight = resources.getDimensionPixelSize(R.dimen.taskbar_size); - mStashedHeight = resources.getDimensionPixelOffset(R.dimen.taskbar_stashed_size); + boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity); + mUnstashedHeight = resources.getDimensionPixelSize(isTransientTaskbar + ? R.dimen.transient_taskbar_size + : R.dimen.taskbar_size); + mStashedHeight = resources.getDimensionPixelSize(isTransientTaskbar + ? R.dimen.transient_taskbar_stashed_size + : R.dimen.taskbar_stashed_size); } else { mUnstashedHeight = mActivity.getDeviceProfile().taskbarSize; mStashedHeight = mActivity.getDeviceProfile().stashedTaskbarSize; @@ -344,7 +349,8 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba * @see WindowInsets.Type#systemBars() */ public int getContentHeightToReportToApps() { - if (isPhoneMode() && !mActivity.isThreeButtonNav()) { + if ((isPhoneMode() && !mActivity.isThreeButtonNav()) + || DisplayController.isTransientTaskbar(mActivity)) { return getStashedHeight(); } diff --git a/res/values/dimens.xml b/res/values/dimens.xml index afdb0717b3..8f48ec8b2a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -367,7 +367,9 @@ 0dp 0dp 0dp - 10dp + 0dp + + 0dp 8dp 0dp diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index edd809c39b..2b9eb29051 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -312,10 +312,14 @@ public class DeviceProfile { } if (isTaskbarPresent) { - taskbarSize = DisplayController.isTransientTaskbar(context) - ? res.getDimensionPixelSize(R.dimen.transient_taskbar_size) - : res.getDimensionPixelSize(R.dimen.taskbar_size); - stashedTaskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_stashed_size); + if (DisplayController.isTransientTaskbar(context)) { + taskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size); + stashedTaskbarSize = + res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_size); + } else { + taskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_size); + stashedTaskbarSize = res.getDimensionPixelSize(R.dimen.taskbar_stashed_size); + } } edgeMarginPx = res.getDimensionPixelSize(R.dimen.dynamic_grid_edge_margin);