From ca6b8be9e59a2c75fc21fe0ba6dfde3a49993e76 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Fri, 28 Jan 2022 12:36:10 -0800
Subject: [PATCH] Migrate "rounded_corner_content_padding"

This CL updates resource overlay of

  rounded_corner_content_padding

so that the same device-specific value can be seen from both the
Framework code and the SysUI.

With my previous CL [1], the SysUI continues to see the same value
even after this migration.

 [1]: I0c3717c0bdfc928167c6eba06247b37caabf33b9
      24d6b891f572f7be419d3acc9793ca68d062cf35

Bug: 215554582
Test: presubmit
Change-Id: I373b59068959d96f46f8d2d48e4923fbe8c961c8
---
 cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml | 3 +++
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml    | 3 ---
 panther/overlay/frameworks/base/core/res/res/values/dimens.xml | 3 +++
 .../frameworks/base/packages/SystemUI/res/values/dimens.xml    | 3 ---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
index 2e602ee..fb5ea14 100644
--- a/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -23,6 +23,9 @@
     <dimen name="rounded_corner_radius_top">50px</dimen>
     <dimen name="rounded_corner_radius_bottom">49px</dimen>
 
+    <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">50px</dimen>
+
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
diff --git a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index fb6ecc9..6d0894d 100644
--- a/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/cheetah/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,9 +16,6 @@
 */
 -->
 <resources>
-    <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">50px</dimen>
-
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</dimen>
 
diff --git a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
index 86ad4e7..82c194e 100644
--- a/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/panther/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -23,6 +23,9 @@
     <dimen name="rounded_corner_radius_top">47px</dimen>
     <dimen name="rounded_corner_radius_bottom">48px</dimen>
 
+   <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">47px</dimen>
+
     <!-- Height of the status bar.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
diff --git a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index abbe205..992a8f6 100644
--- a/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/panther/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -19,9 +19,6 @@
     <!-- Don't need the left side padding due to being inset from the cutout -->
     <dimen name="status_bar_padding_start">0dp</dimen>
 
-   <!-- for 20dp of padding at 3.5px/dp at default density -->
-    <dimen name="rounded_corner_content_padding">47px</dimen>
-
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</dimen>