[WPPG] Separate files of overriding for building different variant
We moved the files in ThemePicker that are NOT shared with WPPG to
another folder.
Bug: 239542256
Test: Tested wallpaperpicker2Debug, themepickerDebug and googleDebug
could build
Change-Id: Ie90fcc0d614b10928bc948c03decc0d83d47f80e
diff --git a/Android.bp b/Android.bp
index c85fd2b..5b16e07 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,7 +54,7 @@
name: "ThemePicker_res",
tools: ["soong_zip"],
srcs: [
- "res/**/*"
+ "res/**/*",
],
out: ["ThemePicker_res.zip"],
cmd: "INPUTS=($(in)) && "
@@ -89,6 +89,10 @@
"src_override/**/*.kt",
],
+ resource_dirs: [
+ "res_override",
+ ],
+
use_embedded_native_libs: true,
resource_zips: [":WallpaperPicker2_res", ":ThemePicker_res"],
diff --git a/res/layout/check_circle_grey_large_not_select_background_color.xml b/res/layout/check_circle_grey_large_not_select_background_color.xml
new file mode 100644
index 0000000..c023611
--- /dev/null
+++ b/res/layout/check_circle_grey_large_not_select_background_color.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2021 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.
+-->
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:androidprv="http://schemas.android.com/apk/prv/res/android">
+ <item android:color="?androidprv:attr/textColorSecondaryInverse" />
+</selector>
\ No newline at end of file
diff --git a/res/layout/theme_cover_qsb.xml b/res_override/layout/theme_cover_qsb.xml
similarity index 100%
rename from res/layout/theme_cover_qsb.xml
rename to res_override/layout/theme_cover_qsb.xml
diff --git a/res/values/override.xml b/res_override/values/override.xml
similarity index 82%
rename from res/values/override.xml
rename to res_override/values/override.xml
index addebd4..05af982 100644
--- a/res/values/override.xml
+++ b/res_override/values/override.xml
@@ -17,12 +17,17 @@
-->
<resources>
<!-- Package of the stub apk containing the themes descriptions -->
- <string name="themes_stub_package" translatable="false">com.android.customization.themes
+ <string name="themes_stub_package" translatable="false">
+ com.android.customization.themes
</string>
+ <!-- Package of the stub apk containing the clock content -->
<string name="clocks_stub_package" translatable="false"/>
- <!-- Authority of a provider in System UI that will provide preview info for available clockfaces. -->
- <string name="clocks_provider_authority" translatable="false">com.android.keyguard.clock</string>
+
+ <!-- Authority of a System UI provider that provides preview info for available clockfaces. -->
+ <string name="clocks_provider_authority" translatable="false">
+ com.android.keyguard.clock
+ </string>
<string name="launcher_overlayable_package" translatable="false">com.android.launcher3</string>