Merge "Renaming WhichPreview following the camal case (1/3)" into main
diff --git a/res/drawable/check_circle_full_preview.xml b/res/drawable/check_circle_full_preview.xml
index 09b288a..f716d8f 100644
--- a/res/drawable/check_circle_full_preview.xml
+++ b/res/drawable/check_circle_full_preview.xml
@@ -15,6 +15,6 @@
limitations under the License.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/wallpaper_control_button_on_background" />
+ <item android:drawable="@drawable/set_crop_button_background" />
<item android:drawable="@drawable/ic_check_wallpaper" />
</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_check_wallpaper.xml b/res/drawable/ic_check_wallpaper.xml
index a280693..6c2f238 100644
--- a/res/drawable/ic_check_wallpaper.xml
+++ b/res/drawable/ic_check_wallpaper.xml
@@ -20,6 +20,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
- android:fillColor="@color/text_color_on_accent"
+ android:fillColor="@color/system_on_primary"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41L9,16.17z"/>
</vector>
diff --git a/res/drawable/set_crop_button_background.xml b/res/drawable/set_crop_button_background.xml
new file mode 100644
index 0000000..68149ad
--- /dev/null
+++ b/res/drawable/set_crop_button_background.xml
@@ -0,0 +1,32 @@
+<?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.
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:colorControlHighlight">
+
+ <item android:id="@android:id/mask">
+ <shape android:shape="oval">
+ <padding
+ android:bottom="@dimen/wallpaper_control_button_padding"
+ android:left="@dimen/wallpaper_control_button_padding"
+ android:right="@dimen/wallpaper_control_button_padding"
+ android:top="@dimen/wallpaper_control_button_padding" />
+ <solid android:color="?android:colorControlHighlight" />
+ </shape>
+ </item>
+
+ <item android:drawable="@drawable/set_crop_button_background_base" />
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/set_crop_button_background_base.xml b/res/drawable/set_crop_button_background_base.xml
new file mode 100644
index 0000000..338fc3f
--- /dev/null
+++ b/res/drawable/set_crop_button_background_base.xml
@@ -0,0 +1,25 @@
+<?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.
+-->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="oval">
+ <padding
+ android:left="@dimen/wallpaper_control_button_padding"
+ android:right="@dimen/wallpaper_control_button_padding"
+ android:top="@dimen/wallpaper_control_button_padding"
+ android:bottom="@dimen/wallpaper_control_button_padding"/>
+ <solid android:color="@color/system_primary" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/set_wallpaper_button_background_variant.xml b/res/drawable/set_wallpaper_button_background_variant.xml
new file mode 100644
index 0000000..1f2a746
--- /dev/null
+++ b/res/drawable/set_wallpaper_button_background_variant.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.
+-->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:colorControlHighlight">
+
+ <item android:id="@android:id/mask">
+ <shape android:shape="rectangle">
+ <corners android:radius="@dimen/set_wallpaper_button_corner_radius" />
+ <padding
+ android:left="@dimen/set_wallpaper_button_horizontal_padding"
+ android:top="@dimen/set_wallpaper_button_vertical_padding"
+ android:right="@dimen/set_wallpaper_button_horizontal_padding"
+ android:bottom="@dimen/set_wallpaper_button_vertical_padding" />
+ <solid android:color="?android:colorControlHighlight" />
+ </shape>
+ </item>
+
+ <item android:drawable="@drawable/set_wallpaper_button_background_variant_base" />
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/set_wallpaper_button_background_variant_base.xml b/res/drawable/set_wallpaper_button_background_variant_base.xml
new file mode 100644
index 0000000..14e2448
--- /dev/null
+++ b/res/drawable/set_wallpaper_button_background_variant_base.xml
@@ -0,0 +1,26 @@
+<?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.
+ -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners android:radius="@dimen/set_wallpaper_button_corner_radius" />
+ <padding
+ android:left="@dimen/set_wallpaper_button_horizontal_padding"
+ android:top="@dimen/set_wallpaper_button_vertical_padding"
+ android:right="@dimen/set_wallpaper_button_horizontal_padding"
+ android:bottom="@dimen/set_wallpaper_button_vertical_padding" />
+ <solid android:color="@color/system_primary" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/set_wallpaper_dialog_positive_button.xml b/res/drawable/set_wallpaper_dialog_positive_button.xml
new file mode 100644
index 0000000..540a8a4
--- /dev/null
+++ b/res/drawable/set_wallpaper_dialog_positive_button.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.
+ -->
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+ android:color="?android:colorControlHighlight">
+
+ <item android:id="@android:id/mask">
+ <shape android:shape="rectangle">
+ <corners android:radius="@dimen/set_wallpaper_button_corner_radius" />
+ <padding
+ android:left="@dimen/set_wallpaper_button_horizontal_padding"
+ android:top="@dimen/set_wallpaper_button_vertical_padding"
+ android:right="@dimen/set_wallpaper_button_horizontal_padding"
+ android:bottom="@dimen/set_wallpaper_button_vertical_padding" />
+ <solid android:color="?android:colorControlHighlight" />
+ </shape>
+ </item>
+
+ <item android:drawable="@drawable/set_wallpaper_dialog_positive_button_base" />
+</ripple>
\ No newline at end of file
diff --git a/res/drawable/set_wallpaper_dialog_positive_button_base.xml b/res/drawable/set_wallpaper_dialog_positive_button_base.xml
new file mode 100644
index 0000000..5942cbb
--- /dev/null
+++ b/res/drawable/set_wallpaper_dialog_positive_button_base.xml
@@ -0,0 +1,26 @@
+<?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.
+ -->
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle">
+ <corners android:radius="@dimen/set_wallpaper_button_corner_radius" />
+ <padding
+ android:left="@dimen/set_wallpaper_button_horizontal_padding"
+ android:top="@dimen/set_wallpaper_button_vertical_padding"
+ android:right="@dimen/set_wallpaper_button_horizontal_padding"
+ android:bottom="@dimen/set_wallpaper_button_vertical_padding" />
+ <solid android:color="@color/system_secondary" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable/small_preview_tab_background.xml b/res/drawable/small_preview_tab_background.xml
index 3408f68..ced9242 100644
--- a/res/drawable/small_preview_tab_background.xml
+++ b/res/drawable/small_preview_tab_background.xml
@@ -17,7 +17,7 @@
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
- <solid android:color="@color/color_accent_secondary" />
+ <solid android:color="@color/system_secondary" />
<corners android:radius="@dimen/small_preview_button_radius" />
<padding
android:top="@dimen/small_preview_button_padding_vertical"
diff --git a/res/layout/fragment_full_preview.xml b/res/layout/fragment_full_preview.xml
index 88983d0..df296e5 100644
--- a/res/layout/fragment_full_preview.xml
+++ b/res/layout/fragment_full_preview.xml
@@ -50,6 +50,7 @@
android:elevation="@dimen/wallpaper_preview_buttons_elevation"
android:layout_marginEnd="@dimen/set_wallpaper_button_margin_end"
android:contentDescription="@string/show_preview_controls_action"
+ android:textColor="@color/system_on_primary"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/toolbar_container"
app:layout_constraintBottom_toBottomOf="@id/toolbar_container"/>
diff --git a/res/layout/fragment_small_preview_foldable.xml b/res/layout/fragment_small_preview_foldable.xml
index 05f30a6..2ea100b 100644
--- a/res/layout/fragment_small_preview_foldable.xml
+++ b/res/layout/fragment_small_preview_foldable.xml
@@ -38,9 +38,10 @@
android:layout_height="wrap_content"
android:elevation="@dimen/wallpaper_preview_buttons_elevation"
android:layout_marginEnd="@dimen/set_wallpaper_button_margin_end"
- android:background="@drawable/set_wallpaper_button_background"
+ android:background="@drawable/set_wallpaper_button_background_variant"
android:text="@string/set_wallpaper_button_text"
- android:textColor="@color/text_color_on_accent"
+ android:textColor="@color/system_on_primary"
+ android:textAppearance="@style/WallpaperPicker.Preview.TextAppearance.NoAllCaps"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/toolbar_container"
app:layout_constraintBottom_toBottomOf="@id/toolbar_container"/>
diff --git a/res/layout/fragment_small_preview_handheld.xml b/res/layout/fragment_small_preview_handheld.xml
index 553d813..a255ace 100644
--- a/res/layout/fragment_small_preview_handheld.xml
+++ b/res/layout/fragment_small_preview_handheld.xml
@@ -39,9 +39,10 @@
android:layout_height="wrap_content"
android:elevation="@dimen/wallpaper_preview_buttons_elevation"
android:layout_marginEnd="@dimen/set_wallpaper_button_margin_end"
- android:background="@drawable/set_wallpaper_button_background"
+ android:background="@drawable/set_wallpaper_button_background_variant"
android:text="@string/set_wallpaper_button_text"
- android:textColor="@color/text_color_on_accent"
+ android:textColor="@color/system_on_primary"
+ android:textAppearance="@style/WallpaperPicker.Preview.TextAppearance.NoAllCaps"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/toolbar_container"
app:layout_constraintBottom_toBottomOf="@id/toolbar_container"/>
diff --git a/res/layout/item_text.xml b/res/layout/item_text.xml
index 9b411f3..97fe155 100644
--- a/res/layout/item_text.xml
+++ b/res/layout/item_text.xml
@@ -25,5 +25,5 @@
android:background="@drawable/small_preview_tab_background"
android:layout_gravity="center"
android:textAppearance="@style/WallpaperPicker.Preview.TextAppearance.NoAllCaps"
- android:textSize="16sp"/>
+ android:textColor="@color/system_on_primary" />
</FrameLayout>
diff --git a/res/layout/set_wallpaper_dialog.xml b/res/layout/set_wallpaper_dialog.xml
index 72c2356..7e5e75c 100644
--- a/res/layout/set_wallpaper_dialog.xml
+++ b/res/layout/set_wallpaper_dialog.xml
@@ -52,16 +52,16 @@
android:id="@+id/button_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/set_wallpaper_button_background"
- android:textColor="@color/text_color_on_accent"
+ android:background="@drawable/set_wallpaper_dialog_positive_button"
+ android:textColor="@color/system_on_primary"
android:text="Cancel" />
<Button
android:id="@+id/button_set"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:background="@drawable/set_wallpaper_button_background"
- android:textColor="@color/text_color_on_accent"
+ android:background="@drawable/set_wallpaper_dialog_positive_button"
+ android:textColor="@color/system_on_primary"
android:text="Set" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
