From 504fe7e8ca7ad2eb0e1095976a56dc9ac9234198 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Fri, 28 Jan 2022 12:03:33 -0800
Subject: [PATCH] Migrate "rounded_corner_content_padding" for raven/oriole

This CL updates resource overlay of

  rounded_corner_content_padding

for raven/oriole 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: Id95b8c063ece7eb43d91f96afe21b4fb01e8b489
---
 .../base/core/res/res/values/dimens.xml       | 22 +++++++++++++++++++
 .../packages/SystemUI/res/values/dimens.xml   |  3 ---
 .../base/core/res/res/values/dimens.xml       | 22 +++++++++++++++++++
 .../packages/SystemUI/res/values/dimens.xml   |  3 ---
 4 files changed, 44 insertions(+), 6 deletions(-)
 create mode 100644 oriole/overlay/frameworks/base/core/res/res/values/dimens.xml
 create mode 100644 raven/overlay/frameworks/base/core/res/res/values/dimens.xml

diff --git a/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml b/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000..447e59c
--- /dev/null
+++ b/oriole/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2022, 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>
+   <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">50px</dimen>
+</resources>
+
diff --git a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index b364c4a..61f284d 100644
--- a/oriole/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/oriole/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">50px</dimen>
-
     <!-- the padding on the top of the statusbar (usually 0) -->
     <dimen name="status_bar_padding_top">1px</dimen>
 
diff --git a/raven/overlay/frameworks/base/core/res/res/values/dimens.xml b/raven/overlay/frameworks/base/core/res/res/values/dimens.xml
new file mode 100644
index 0000000..1188e6c
--- /dev/null
+++ b/raven/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ * Copyright (c) 2022, 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>
+    <!-- for 20dp of padding at 3.5px/dp at default density -->
+    <dimen name="rounded_corner_content_padding">50px</dimen>
+</resources>
+
diff --git a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index fb6ecc9..6d0894d 100644
--- a/raven/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/raven/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>