From 92a04f15eb2d3284e8bd463fc4a98db7cb9123e6 Mon Sep 17 00:00:00 2001 From: Pierre Barbier de Reuille Date: Thu, 1 Jul 2021 10:07:48 +0100 Subject: [PATCH] Use the current padding instead of the default one during layout. Bug: 191612352 Test: Manually, adding extra logs, checking with/without changed padding. Change-Id: I7bc03602fe5e6e9085f0d187e6d2a11d2f15dcca --- core/java/android/appwidget/AppWidgetHostView.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/java/android/appwidget/AppWidgetHostView.java b/core/java/android/appwidget/AppWidgetHostView.java index ba3fc1e55c54c..8aa27853b4622 100644 --- a/core/java/android/appwidget/AppWidgetHostView.java +++ b/core/java/android/appwidget/AppWidgetHostView.java @@ -282,11 +282,10 @@ public class AppWidgetHostView extends FrameLayout { } private SizeF computeSizeFromLayout(int left, int top, int right, int bottom) { - Rect padding = getDefaultPadding(); float density = getResources().getDisplayMetrics().density; return new SizeF( - (right - left - padding.right - padding.left) / density, - (bottom - top - padding.bottom - padding.top) / density + (right - left - getPaddingLeft() - getPaddingRight()) / density, + (bottom - top - getPaddingTop() - getPaddingBottom()) / density ); } @@ -386,7 +385,7 @@ public class AppWidgetHostView extends FrameLayout { maxHeight = Math.max(maxHeight, paddedSize.getHeight()); } if (paddedSizes.equals( - widgetManager.getAppWidgetOptions(mAppWidgetId).getParcelableArrayList( + widgetManager.getAppWidgetOptions(mAppWidgetId).getParcelableArrayList( AppWidgetManager.OPTION_APPWIDGET_SIZES))) { return; }