From 67fd7d8f6f795c358691714eb3b76d1aad88a4ea Mon Sep 17 00:00:00 2001
From: Zaiyue Xue <xuezaiyue@google.com>
Date: Mon, 20 Feb 2023 11:36:55 +0800
Subject: [PATCH] Move the same-name-different-product configs from res folder
 to res-product folder

This could unblock the build in go/settings-studio.

Bug: 269974284
Fix: 269974284
Test: presubmit
Change-Id: I962ce24c827d6412af2b861753ae57bd17a27de2
---
 res-product/values/config.xml             | 33 +++++++++++++++++++++++
 {res => res-product}/values/drawables.xml |  0
 res/values/config.xml                     | 16 -----------
 3 files changed, 33 insertions(+), 16 deletions(-)
 create mode 100755 res-product/values/config.xml
 rename {res => res-product}/values/drawables.xml (100%)

diff --git a/res-product/values/config.xml b/res-product/values/config.xml
new file mode 100755
index 00000000000..39fbdffb0e1
--- /dev/null
+++ b/res-product/values/config.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2023 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 xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+    <!-- The illustration for those screen are not in one of below type. This file should be a video in JSON format. -->
+    <item name="a11y_timeout_banner" type="raw" product="default">@raw/accessibility_timeout_banner</item>
+    <item name="a11y_timeout_banner" type="raw" product="tablet">@raw/accessibility_timeout_banner_tablet</item>
+
+    <item name="a11y_shortcut_type_triple_tap" type="raw" product="default">@raw/accessibility_shortcut_type_triple_tap</item>
+    <item name="a11y_shortcut_type_triple_tap" type="raw" product="tablet">@raw/accessibility_shortcut_type_triple_tap_tablet</item>
+
+    <item name="a11y_color_inversion_banner" type="raw" product="default">@raw/accessibility_color_inversion_banner</item>
+    <item name="a11y_color_inversion_banner" type="raw" product="tablet">@raw/accessibility_color_inversion_banner_tablet</item>
+
+    <item name="a11y_magnification_banner" type="raw" product="default">@raw/accessibility_magnification_banner</item>
+    <item name="a11y_magnification_banner" type="raw" product="tablet">@raw/accessibility_magnification_banner_tablet</item>
+
+    <item name="a11y_extra_dim_banner" type="raw" product="default">@raw/extra_dim_banner</item>
+    <item name="a11y_extra_dim_banner" type="raw" product="tablet">@raw/extra_dim_banner_tablet</item>
+</resources>
diff --git a/res/values/drawables.xml b/res-product/values/drawables.xml
similarity index 100%
rename from res/values/drawables.xml
rename to res-product/values/drawables.xml
diff --git a/res/values/config.xml b/res/values/config.xml
index e27f25734f6..07f6432ed3d 100755
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -695,20 +695,4 @@
 
     <!-- Whether auto data switching on secondary SIM enables cross-SIM calling on both SIMs. -->
     <bool name="config_auto_data_switch_enables_cross_sim_calling">false</bool>
-
-    <!-- The illustration for those screen are not in one of below type. This file should be a video in JSON format. -->
-    <item name="a11y_timeout_banner" type="raw" product="default">@raw/accessibility_timeout_banner</item>
-    <item name="a11y_timeout_banner" type="raw" product="tablet">@raw/accessibility_timeout_banner_tablet</item>
-
-    <item name="a11y_shortcut_type_triple_tap" type="raw" product="default">@raw/accessibility_shortcut_type_triple_tap</item>
-    <item name="a11y_shortcut_type_triple_tap" type="raw" product="tablet">@raw/accessibility_shortcut_type_triple_tap_tablet</item>
-
-    <item name="a11y_color_inversion_banner" type="raw" product="default">@raw/accessibility_color_inversion_banner</item>
-    <item name="a11y_color_inversion_banner" type="raw" product="tablet">@raw/accessibility_color_inversion_banner_tablet</item>
-
-    <item name="a11y_magnification_banner" type="raw" product="default">@raw/accessibility_magnification_banner</item>
-    <item name="a11y_magnification_banner" type="raw" product="tablet">@raw/accessibility_magnification_banner_tablet</item>
-
-    <item name="a11y_extra_dim_banner" type="raw" product="default">@raw/extra_dim_banner</item>
-    <item name="a11y_extra_dim_banner" type="raw" product="tablet">@raw/extra_dim_banner_tablet</item>
 </resources>