Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b6e38fb2 authored by Jon Miranda's avatar Jon Miranda Committed by Automerger Merge Worker
Browse files

Merge "Update taskbar paddings/sizes to match spec." into udc-dev am: 10b3e64d 

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



Change-Id: Ide9c9b394fcc57fead29b2000b8e8509eb85810d
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents a4e8ceaf 10b3e64d

quickstep/src/com/android/launcher3/taskbar/TaskbarView.java

+4 −1
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.launcher3.taskbar; 
import static android.content.pm.PackageManager.FEATURE_PC;

import static android.view.accessibility.AccessibilityEvent.TYPE_WINDOW_CONTENT_CHANGED;



import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;



import android.content.Context;

import android.content.res.Resources;

import android.graphics.Canvas;
@@ -128,12 +130,13 @@ public class TaskbarView extends FrameLayout implements FolderIcon.FolderIconPar 


        int actualMargin = resources.getDimensionPixelSize(R.dimen.taskbar_icon_spacing);

        int actualIconSize = mActivityContext.getDeviceProfile().taskbarIconSize;

        int visualIconSize = (int) (actualIconSize * ICON_VISIBLE_AREA_FACTOR);



        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;

        mItemMarginLeftRight = actualMargin - (mIconTouchSize - visualIconSize) / 2;

        mItemPadding = (mIconTouchSize - actualIconSize) / 2;



        mFolderLeaveBehindColor = Themes.getAttrColor(mActivityContext,

src/com/android/launcher3/DeviceProfile.java

+3 −2
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import static com.android.launcher3.anim.Interpolators.LINEAR; 
import static com.android.launcher3.config.FeatureFlags.ENABLE_MULTI_DISPLAY_PARTIAL_DEPTH;

import static com.android.launcher3.folder.ClippedFolderIconLayoutRule.ICON_OVERLAP_FACTOR;

import static com.android.launcher3.icons.GraphicsUtils.getShapePath;

import static com.android.launcher3.icons.IconNormalizer.ICON_VISIBLE_AREA_FACTOR;

import static com.android.launcher3.testing.shared.ResourceUtils.INVALID_RESOURCE_HANDLE;

import static com.android.launcher3.testing.shared.ResourceUtils.pxFromDp;

import static com.android.launcher3.testing.shared.ResourceUtils.roundPxValueFromFloat;
@@ -353,8 +354,8 @@ public class DeviceProfile { 
        if (DisplayController.isTransientTaskbar(context)) {

            float invTransientIconSizeDp = inv.transientTaskbarIconSize[mTypeIndex];

            taskbarIconSize = pxFromDp(invTransientIconSizeDp, mMetrics);

            taskbarHeight = taskbarIconSize

                    + (2 * res.getDimensionPixelSize(R.dimen.transient_taskbar_padding));

            taskbarHeight = Math.round((taskbarIconSize * ICON_VISIBLE_AREA_FACTOR)

                    + (2 * res.getDimensionPixelSize(R.dimen.transient_taskbar_padding)));

            stashedTaskbarHeight =

                    res.getDimensionPixelSize(R.dimen.transient_taskbar_stashed_height);

            taskbarBottomMargin =