Remove usage of private resources
Use public alternatives instead, overriding when needed.
Bug: 137864652
Change-Id: I7a51b0bdbdaee23753aab2445351680a9d195cc1
diff --git a/res/layout/preview_page_info.xml b/res/layout/preview_page_info.xml
index 587e120..9299426 100644
--- a/res/layout/preview_page_info.xml
+++ b/res/layout/preview_page_info.xml
@@ -49,7 +49,7 @@
android:layout_marginTop="@dimen/preview_attribution_pane_author_top_margin"
android:forceHasOverlappingRendering="false"
android:gravity="center"
- android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Subhead"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.Widget.ActionBar.Subtitle"
android:textColor="@color/material_white_100"
android:visibility="gone"/>
@@ -60,7 +60,8 @@
android:minHeight="@dimen/preview_attribution_pane_description_height"
android:forceHasOverlappingRendering="false"
android:gravity="center_horizontal"
- android:textAppearance="@*android:style/TextAppearance.DeviceDefault.Caption"
+ android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
+ android:textSize="12dp"
android:textColor="@color/material_white_100"
android:visibility="gone"/>
diff --git a/res/values-v29/styles.xml b/res/values-v29/styles.xml
new file mode 100644
index 0000000..e7f27d4
--- /dev/null
+++ b/res/values-v29/styles.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+
+ Copyright (C) 2019 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>
+ <style name="PreviewCheckboxDeviceTheme" parent="@android:style/ThemeOverlay.DeviceDefault.Accent.DayNight">
+ <item name="android:colorControlActivated">?android:attr/colorAccent</item>
+ </style>
+</resources>
\ No newline at end of file
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2723934..6259281 100755
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -13,7 +13,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<resources xmlns:tools="http://schemas.android.com/tools" tools:targetApi="23">
+<resources>
<!-- Main themes -->
<style name="WallpaperTheme" parent="@android:style/Theme.DeviceDefault.Settings">
@@ -102,9 +102,7 @@
<style name="ActionBarCheckboxStyle" parent="@android:style/Widget.DeviceDefault.CompoundButton.CheckBox"/>
- <style name="PreviewCheckboxDeviceTheme" parent="@android:style/Theme.DeviceDefault">
- <item name="android:colorControlActivated">@*android:color/accent_device_default_light</item>
- </style>
+ <style name="PreviewCheckboxDeviceTheme" parent="@android:style/Theme.DeviceDefault"/>
<style name="select_wallpaper_header">
<item name="android:textColor">@color/translucent_black_60_alpha</item>
