Merge "Update taskbar to spec" into tm-qpr-dev am: 39688d2d61

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

Change-Id: I5d5cf3caadc6081d728948bb1674344714126363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
TreeHugger Robot
2023-01-03 23:01:45 +00:00
committed by Automerger Merge Worker
6 changed files with 18 additions and 19 deletions

View File

@@ -101,16 +101,15 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar
super(context, attrs, defStyleAttr, defStyleRes);
mActivityContext = ActivityContext.lookupContext(context);
mIconLayoutBounds = mActivityContext.getTransientTaskbarBounds();
mIsRtl = Utilities.isRtl(getResources());
Resources resources = getResources();
mIconTouchSize = resources.getDimensionPixelSize(R.dimen.taskbar_icon_touch_size);
mIsRtl = Utilities.isRtl(resources);
int actualMargin = DisplayController.isTransientTaskbar(mActivityContext)
? resources.getDimensionPixelSize(R.dimen.transient_taskbar_icon_spacing)
: resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
int actualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);
int actualIconSize = mActivityContext.getDeviceProfile().iconSizePx;
mIconTouchSize = Math.max(actualIconSize,
resources.getDimensionPixelSize(R.dimen.taskbar_icon_min_touch_size));
// We layout the icons to be of mIconTouchSize in width and height
mItemMarginLeftRight = actualMargin - (mIconTouchSize - actualIconSize) / 2;
mItemPadding = (mIconTouchSize - actualIconSize) / 2;