Merge "Update the name to Wallpaper & style" into sc-dev
diff --git a/res/color/toolbar_icon_color.xml b/res/color/toolbar_icon_color.xml
deleted file mode 100644
index 91e56c1..0000000
--- a/res/color/toolbar_icon_color.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?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">
- <item android:color="?android:textColorPrimary"/>
-</selector>
diff --git a/res/drawable/ic_tune.xml b/res/drawable/ic_tune.xml
deleted file mode 100644
index a310d56..0000000
--- a/res/drawable/ic_tune.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="20dp"
- android:height="20dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M3,17v2h6v-2H3zM3,5v2h10V5H3zM13,21v-2h8v-2h-8v-2h-2v6H13zM7,9v2H3v2h4v2h2V9H7zM21,13v-2H11v2H21zM15,9h2V7h4V5h-4V3h-2V9z"/>
-</vector>
diff --git a/res/drawable/ic_wifi_24px.xml b/res/drawable/ic_wifi_24px.xml
deleted file mode 100644
index 0e27c57..0000000
--- a/res/drawable/ic_wifi_24px.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
- 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3l3,-3C13.35,15.34 10.66,15.34 9,17zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
-</vector>
diff --git a/res/drawable/option_color.xml b/res/drawable/option_color.xml
deleted file mode 100644
index 1fc1837..0000000
--- a/res/drawable/option_color.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?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.
--->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <solid android:color="@android:color/black" />
- <corners android:radius="6dp" />
-</shape>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 26c67ea..3bad9e6 100644
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -17,9 +17,7 @@
-->
<resources>
<dimen name="card_title_text_size">12sp</dimen>
- <dimen name="card_cover_title_text_size">14sp</dimen>
<dimen name="card_header_icon_size">24dp</dimen>
- <dimen name="preview_card_top_padding">6dp</dimen>
<dimen name="preview_theme_content_margin">8dp</dimen>
<dimen name="preview_theme_content_max_height">140dp</dimen>
<dimen name="preview_theme_content_min_height">100dp</dimen>
@@ -28,9 +26,6 @@
<dimen name="preview_theme_icon_size">26dp</dimen>
<dimen name="preview_theme_tile_size">14dp</dimen>
<dimen name="preview_theme_shape_size">30dp</dimen>
- <dimen name="preview_theme_content_bottom">8dp</dimen>
-
- <dimen name="font_preview_divider_gap">12dp</dimen>
<dimen name="options_container_width">400dp</dimen>
<dimen name="option_bottom_margin">8dp</dimen>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 1c53517..a0c0e34 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -18,25 +18,6 @@
<resources>
<color name="theme_preview_icon_color">@color/white_70_alpha</color>
- <color name="icon_thumbnail_color">@color/white_88_alpha</color>
-
- <color name="theme_preview_color_icons_background">@color/material_black_100</color>
- <color name="theme_preview_color_icons_title_color">@color/material_white_100</color>
-
- <color name="control_grey">#b3b3b3</color>
- <color name="switch_track_tint">#171717</color>
- <color name="switch_thumb_tint">#bdbdbd</color>
-
<color name="tile_enabled_icon_color">#2d2d2d</color>
- <color name="tile_disabled_icon_color">@color/light_grey</color>
- <color name="tile_disabled_background_color">#353535</color>
- <color name="shape_option_tile_foreground_color">@color/edit_background_base</color>
-
- <color name="tip_dot_color">#81C995</color>
- <color name="tip_dot_line_color">#000000</color>
-
- <color name="divider_color">@color/white_14_alpha</color>
-
- <color name="cover_title_color">@color/white_88_alpha</color>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index df7b65c..02b109b 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,40 +16,11 @@
limitations under the License.
-->
<resources>
- <color name="icon_background">#FF4285f4</color>
- <color name="black_14_alpha">#24000000</color>
- <color name="white_14_alpha">#24FFFFFF</color>
<color name="status_bar_color">#ffffffff</color>
- <color name="system_navigation_bar_background">@android:color/white</color>
- <color name="system_navigation_bar_divider">#1f000000</color>
-
- <color name="shape_thumbnail_color">#b2b2b2</color>
- <color name="icon_thumbnail_color">@color/black_87_alpha</color>
-
- <color name="clockface_preview_background">@android:color/black</color>
-
<color name="theme_preview_icon_color">@color/google_grey700</color>
- <color name="theme_preview_color_icons_background">@color/material_white_100</color>
- <color name="theme_preview_color_icons_title_color">@color/black_87_alpha</color>
-
- <color name="control_grey">#757575</color>
- <color name="switch_track_tint">#acacac</color>
- <color name="switch_thumb_tint">#f1f1f1</color>
<color name="tile_enabled_icon_color">@color/material_white_100</color>
- <color name="tile_disabled_icon_color">#2d2d2d</color>
- <color name="tile_disabled_background_color">@color/light_grey</color>
- <color name="shape_option_tile_foreground_color">@color/edit_background_base</color>
-
- <color name="tip_dot_color">#34A853</color>
- <color name="tip_dot_line_color">#FFFFFF</color>
-
- <color name="divider_color">@color/black_14_alpha</color>
-
- <color name="cover_title_color">@color/black_87_alpha</color>
-
- <color name="center_check_color">#EDF2EB</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index ef9f417..b5d024d 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -55,10 +55,7 @@
<dimen name="option_tile_margin_horizontal">6dp</dimen>
<dimen name="theme_option_label_margin">4dp</dimen>
- <dimen name="preview_card_top_padding">@dimen/preview_card_padding</dimen>
-
<dimen name="card_title_text_size">16sp</dimen>
- <dimen name="card_cover_title_text_size">24sp</dimen>
<dimen name="card_header_icon_size">32dp</dimen>
<dimen name="preview_theme_max_height">400dp</dimen>
<dimen name="preview_theme_min_height">180dp</dimen>
@@ -72,7 +69,6 @@
<dimen name="preview_theme_shape_size">36dp</dimen>
<dimen name="preview_theme_cover_topbar_clock_size">12sp</dimen>
<dimen name="preview_theme_cover_topbar_icon_size">16dp</dimen>
- <dimen name="preview_theme_content_bottom">@dimen/min_taptarget_height</dimen>
<!-- For the new preview of theme picker. -->
<dimen name="preview_theme_content_padding_top">16dp</dimen>
@@ -97,7 +93,6 @@
<dimen name="preview_content_padding_bottom">@dimen/indicator_container_height</dimen>
<dimen name="font_preview_body_width">220dp</dimen>
- <dimen name="font_preview_divider_gap">24dp</dimen>
<dimen name="custom_theme_nav_height">56dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 40f8f06..c8ce13b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -72,11 +72,6 @@
<item name="android:textSize">@dimen/card_title_text_size</item>
</style>
- <style name="CoverTitleTextAppearance" parent="CardTitleTextAppearance">
- <item name="android:textSize">@dimen/card_cover_title_text_size</item>
- <item name="android:textColor">@color/cover_title_color</item>
- </style>
-
<style name="FontCardTitleStyle" parent="TitleTextAppearance">
<item name="android:textAlignment">center</item>
<item name="android:textSize">28dp</item>
@@ -91,11 +86,6 @@
</style>
<!-- Custom theme editor -->
- <style name="EditLabelStyle">
- <item name="android:textAppearance">@android:style/TextAppearance.DeviceDefault.Widget.Button</item>
- <item name="android:textColor">@color/material_white_100</item>
- <item name="android:textAllCaps">false</item>
- </style>
<style name="CustomThemeNameEditText" parent="@android:style/Widget.DeviceDefault.EditText">
<item name="android:background">@drawable/edittext_background</item>