From 1187a1448e04c65b2af0611a561eb02ec1ebb85b Mon Sep 17 00:00:00 2001
From: Pierre Barbier de Reuille <pbdr@google.com>
Date: Wed, 5 May 2021 21:12:18 +0100
Subject: [PATCH] Remove system_app_widget_internal_padding resource

Fix: 187326256
Test: atest AppWidgetDimensionsTest
Change-Id: Ic78fa7e3165d9b937d100082915f28e90fca1f5b
---
 core/api/current.txt           | 1 -
 core/api/removed.txt           | 8 ++++++++
 core/res/res/values/dimens.xml | 4 ++--
 core/res/res/values/public.xml | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/api/current.txt b/core/api/current.txt
index 82264c177248b..6290d7324cba9 100644
--- a/core/api/current.txt
+++ b/core/api/current.txt
@@ -1821,7 +1821,6 @@ package android {
     field public static final int notification_large_icon_width = 17104901; // 0x1050005
     field public static final int system_app_widget_background_radius;
     field public static final int system_app_widget_inner_radius;
-    field public static final int system_app_widget_internal_padding;
     field public static final int thumbnail_height = 17104897; // 0x1050001
     field public static final int thumbnail_width = 17104898; // 0x1050002
   }
diff --git a/core/api/removed.txt b/core/api/removed.txt
index cdaa5f53eda0d..8229019ab6643 100644
--- a/core/api/removed.txt
+++ b/core/api/removed.txt
@@ -1,4 +1,12 @@
 // Signature format: 2.0
+package android {
+
+  public static final class R.dimen {
+    field public static final int __removed_system_app_widget_internal_padding;
+  }
+
+}
+
 package android.app {
 
   public class Notification implements android.os.Parcelable {
diff --git a/core/res/res/values/dimens.xml b/core/res/res/values/dimens.xml
index 6be6167fba309..ade8516a48e97 100644
--- a/core/res/res/values/dimens.xml
+++ b/core/res/res/values/dimens.xml
@@ -936,7 +936,7 @@
     <dimen name="system_app_widget_background_radius">16dp</dimen>
     <!-- System-provided radius for inner views on app widgets. The resolved value of this resource may change at runtime. -->
     <dimen name="system_app_widget_inner_radius">8dp</dimen>
-    <!-- System-provided padding for inner views on app widgets. The resolved value of this resource may change at runtime. -->
-    <dimen name="system_app_widget_internal_padding">16dp</dimen>
+    <!-- System-provided padding for inner views on app widgets. The resolved value of this resource may change at runtime. @removed -->
+    <dimen name="__removed_system_app_widget_internal_padding">16dp</dimen>
 
 </resources>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 03701c3ceee6f..500a9dae6554d 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3184,7 +3184,7 @@
     <!-- System-provided dimensions for app widgets. -->
     <public name="system_app_widget_background_radius" />
     <public name="system_app_widget_inner_radius" />
-    <public name="system_app_widget_internal_padding" />
+    <public name="__removed_system_app_widget_internal_padding" />
   </staging-public-group>
 
   <staging-public-group type="bool" first-id="0x01110007">