Merge "Update taskbar paddings/sizes to match spec." into udc-dev am: 10b3e64d51 am: 704e573375
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23597945 Change-Id: Ia010ad063c34ea08baaf7ef4593a487f633b1fab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -26,6 +26,7 @@ import static com.android.launcher3.Utilities.pxFromSp;
|
||||
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;
|
||||
@@ -346,8 +347,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 =
|
||||
|
||||
Reference in New Issue
Block a user