From b703af216a0d1d1bf72a8b409e1037df4544e4f8 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Fri, 28 Jan 2022 07:41:26 -0800
Subject: [PATCH] clover: Migrate "rounded_corner_content_padding"

With my previous CL [1], we can override

   rounded_corner_content_padding

at the Framework resource layer rather than the SysUI resource layer.

No matter whether

  persist.sys.ime.can_render_gestural_nav_buttons

is enabled or not, there should be no observable behavior change in
this CL.

 [1]: I0c3717c0bdfc928167c6eba06247b37caabf33b9
      24d6b891f572f7be419d3acc9793ca68d062cf35

Bug: 215554582
Test: Manually verified as follows.
  1. Build aosp_coral-userdebug and flash it
  2. adb shell cmd overlay lookup android \
       android:dimen/rounded_corner_content_padding
     -> 70.0px
  3. adb shell cmd overlay lookup com.android.systemui \
       com.android.systemui:dimen/rounded_corner_content_padding
     -> 70.0px
Change-Id: I391a504482f25c17f9b67f7eb8f56f362da71ae0
Signed-off-by: pix106 <sbordenave@gmail.com>
---
 .../base/core/res/res/values/dimens.xml       |  3 +++
 .../packages/SystemUI/res/values/dimens.xml   | 20 -------------------
 2 files changed, 3 insertions(+), 20 deletions(-)
 delete mode 100644 overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml

diff --git a/overlay/frameworks/base/core/res/res/values/dimens.xml b/overlay/frameworks/base/core/res/res/values/dimens.xml
index f50c223..8b3a88c 100644
--- a/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -27,4 +27,7 @@
 <resources>
     <!-- Default radius of the software rounded corners. -->
     <dimen name="rounded_corner_radius">33px</dimen>
+
+    <!-- the padding of the rounded corner -->
+    <dimen name="rounded_corner_content_padding">8dp</dimen>
 </resources>
diff --git a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
deleted file mode 100644
index f380aad..0000000
--- a/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- * Copyright (c) 2006, The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
-*/
--->
-<resources>
-    <dimen name="rounded_corner_content_padding">8dp</dimen>
-</resources>