diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml index 5a58bc25f6..baf097e580 100644 --- a/quickstep/res/values/dimens.xml +++ b/quickstep/res/values/dimens.xml @@ -282,6 +282,7 @@ 76dp + 72dp 24dp 40dp 10dp diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java index 1e29cac248..01ec5f34ad 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarActivityContext.java @@ -270,9 +270,11 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } private void updateIconSize(Resources resources) { - float taskbarIconSize = DisplayController.isTransientTaskbar(this) - ? resources.getDimension(R.dimen.transient_taskbar_icon_size) - : resources.getDimension(R.dimen.taskbar_icon_size); + float taskbarIconSize = resources.getDimension(DisplayController.isTransientTaskbar(this) + ? mDeviceProfile.isTwoPanels + ? R.dimen.transient_taskbar_two_panels_icon_size + : R.dimen.transient_taskbar_icon_size + : R.dimen.taskbar_icon_size); mDeviceProfile.updateIconSize(1, resources); float iconScale = taskbarIconSize / mDeviceProfile.iconSizePx; mDeviceProfile.updateIconSize(iconScale, resources); @@ -681,7 +683,10 @@ public class TaskbarActivityContext extends BaseTaskbarContext { } if (DisplayController.isTransientTaskbar(this)) { - return resources.getDimensionPixelSize(R.dimen.transient_taskbar_size) + int taskbarSize = resources.getDimensionPixelSize(mDeviceProfile.isTwoPanels + ? R.dimen.transient_taskbar_two_panels_size + : R.dimen.transient_taskbar_size); + return taskbarSize + (2 * resources.getDimensionPixelSize(R.dimen.transient_taskbar_margin)) + resources.getDimensionPixelSize(R.dimen.transient_taskbar_shadow_blur); } diff --git a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java index a7e45d1623..a82e7be8b9 100644 --- a/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java +++ b/quickstep/src/com/android/launcher3/taskbar/TaskbarStashController.java @@ -203,7 +203,9 @@ public class TaskbarStashController implements TaskbarControllers.LoggableTaskba Resources resources = mActivity.getResources(); boolean isTransientTaskbar = DisplayController.isTransientTaskbar(mActivity); mUnstashedHeight = resources.getDimensionPixelSize(isTransientTaskbar - ? R.dimen.transient_taskbar_size + ? (mActivity.getDeviceProfile().isTwoPanels + ? R.dimen.transient_taskbar_two_panels_size + : R.dimen.transient_taskbar_size) : R.dimen.taskbar_size); mStashedHeight = resources.getDimensionPixelSize(isTransientTaskbar ? R.dimen.transient_taskbar_stashed_size diff --git a/res/values/dimens.xml b/res/values/dimens.xml index db604f2ba7..dc53552fa6 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -362,8 +362,10 @@ 0dp 44dp 57dp + 50dp 0dp + 0dp 0dp 0dp 0dp diff --git a/src/com/android/launcher3/DeviceProfile.java b/src/com/android/launcher3/DeviceProfile.java index 3f4d0360c1..828066a1b0 100644 --- a/src/com/android/launcher3/DeviceProfile.java +++ b/src/com/android/launcher3/DeviceProfile.java @@ -319,7 +319,9 @@ public class DeviceProfile { if (isTaskbarPresent) { if (DisplayController.isTransientTaskbar(context)) { - taskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_size); + taskbarSize = res.getDimensionPixelSize(isTwoPanels + ? R.dimen.transient_taskbar_two_panels_size + : R.dimen.transient_taskbar_size); stashedTaskbarSize = res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_size); transientTaskbarMargin =