Merge "Fix dismiss dialog shows on dark mode apply (2/2)" into main

commit: 27cccd8673cd3e29e506e8620781bb3a34429465 [log] [tgz]
author: Catherine Liang <cathliang@google.com> Thu Mar 20 08:38:19 2025 -0700
committer: Android (Google) Code Review <android-gerrit@google.com> Thu Mar 20 08:38:19 2025 -0700
tree: 22fab55b04b306fc4b0ad87353481c665018113a
parent: b8520b1549aa3f7166e7d5910e9e416452d366d2 [diff]
parent: fa76527f7556c92250e89dd0f0498ecbb59ec06b [diff]
diff --git a/res/drawable/ic_font_size_filled_24px.xml b/res/drawable/ic_font_size_filled_24px.xml
new file mode 100644
index 0000000..b37e8e6
--- /dev/null
+++ b/res/drawable/ic_font_size_filled_24px.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2024 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="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M560,800L560,280L360,280L360,160L880,160L880,280L680,280L680,800L560,800ZM200,800L200,480L80,480L80,360L440,360L440,480L320,480L320,800L200,800Z"/>
+</vector>
\ No newline at end of file

diff --git a/res/layout/clock_style_option.xml b/res/layout/clock_style_option.xml
index fa20706..c59a9d4 100644
--- a/res/layout/clock_style_option.xml
+++ b/res/layout/clock_style_option.xml

@@ -14,57 +14,25 @@
      limitations under the License.
 -->
 <!-- Content description is set programmatically on the parent FrameLayout -->
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="@dimen/floating_sheet_clock_style_option_width"
-    android:layout_height="@dimen/floating_sheet_clock_style_option_height"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="@dimen/floating_sheet_clock_style_option_size"
+    android:layout_height="@dimen/floating_sheet_clock_style_option_size"
     android:clipToPadding="false"
     android:clipChildren="false">
 
     <com.android.wallpaper.picker.option.ui.view.OptionItemBackground
         android:id="@id/background"
-        android:layout_width="@dimen/floating_sheet_clock_style_option_background_size"
-        android:layout_height="@dimen/floating_sheet_clock_style_option_background_size"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        android:importantForAccessibility="no"
-        android:layout_gravity="bottom" />
+        android:layout_width="@dimen/floating_sheet_clock_style_option_size"
+        android:layout_height="@dimen/floating_sheet_clock_style_option_size"
+        android:layout_gravity="center"
+        android:importantForAccessibility="no" />
 
 
     <ImageView
         android:id="@+id/foreground"
         android:layout_width="@dimen/floating_sheet_clock_style_option_thumbnail_size"
         android:layout_height="@dimen/floating_sheet_clock_style_option_thumbnail_size"
-        android:layout_marginBottom="@dimen/floating_sheet_clock_style_thumbnail_margin_bottom"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
+        android:layout_gravity="center"
         android:src="@drawable/ic_clock_24px" />
-
-    <FrameLayout
-        android:id="@+id/edit_icon"
-        android:layout_width="@dimen/floating_sheet_clock_edit_icon_size"
-        android:layout_height="@dimen/floating_sheet_clock_edit_icon_size"
-        android:layout_marginTop="@dimen/floating_sheet_clock_edit_icon_margin"
-        android:layout_marginEnd="@dimen/floating_sheet_clock_edit_icon_margin"
-        app:layout_constraintEnd_toEndOf="@+id/background"
-        app:layout_constraintTop_toTopOf="@+id/background" >
-        <ImageView
-            android:id="@+id/edit_icon_background"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/edit_icon_background"
-            android:importantForAccessibility="no" />
-
-        <ImageView
-            android:id="@+id/edit_icon_foreground"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:src="@drawable/edit_icon_foreground"
-            android:importantForAccessibility="no" />
-    </FrameLayout>
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
+</FrameLayout>
 

diff --git a/res/layout/floating_sheet_clock.xml b/res/layout/floating_sheet_clock.xml
index 6b757be..2e98b4f 100644
--- a/res/layout/floating_sheet_clock.xml
+++ b/res/layout/floating_sheet_clock.xml

@@ -41,8 +41,8 @@
             android:layout_height="wrap_content" />
 
         <include
-            layout="@layout/floating_sheet_clock_font_content"
-            android:id="@+id/clock_floating_sheet_font_content"
+            layout="@layout/floating_sheet_clock_size_content"
+            android:id="@+id/clock_floating_sheet_size_content"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
     </FrameLayout>
@@ -66,28 +66,5 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center" />
-
-        <LinearLayout
-            android:id="@+id/clock_font_toolbar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="horizontal"
-            android:layout_gravity="center_horizontal">
-
-            <ImageView
-                android:id="@+id/clock_font_revert"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/clock_font_revert"
-                android:contentDescription="@string/clock_font_editor_revert" />
-
-            <ImageView
-                android:id="@+id/clock_font_apply"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingStart="@dimen/clock_font_apply_padding_start"
-                android:src="@drawable/clock_font_apply"
-                android:contentDescription="@string/clock_font_editor_apply" />
-        </LinearLayout>
     </FrameLayout>
 </LinearLayout>

diff --git a/res/layout/floating_sheet_clock_font_content.xml b/res/layout/floating_sheet_clock_font_content.xml
deleted file mode 100644
index ba6c70c..0000000
--- a/res/layout/floating_sheet_clock_font_content.xml
+++ /dev/null

@@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2024 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.
-  -->
-
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/clock_floating_sheet_font_content"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingVertical="@dimen/floating_sheet_content_vertical_padding"
-    android:paddingHorizontal="@dimen/floating_sheet_content_horizontal_padding"
-    android:clipChildren="false"
-    android:clipToPadding="false">
-
-    <TextView
-        android:id="@+id/clock_axis_slider_name1"
-        android:layout_width="@dimen/clock_font_axis_name_width"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/barrier1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/clock_axis_slider1"
-        android:layout_marginVertical="@dimen/clock_axis_control_slider_row_margin_vertical"
-        android:layout_marginEnd="@dimen/clock_axis_control_text_margin_end"
-        android:lines="1"
-        android:ellipsize="end"
-        style="@style/CustomizationOptionEntryTitleTextStyle"
-        android:text="@string/tab_placeholder_text" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/clock_axis_slider1"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/accessibility_min_height"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/barrier1"
-        app:layout_constraintStart_toEndOf="@+id/clock_axis_slider_name1"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginVertical="@dimen/clock_axis_control_slider_row_margin_vertical"
-        app:trackHeight="@dimen/slider_track_height"
-        app:thumbHeight="@dimen/slider_thumb_height"
-        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/barrier1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="clock_axis_slider1,clock_axis_slider_name1" />
-
-    <TextView
-        android:id="@+id/clock_axis_slider_name2"
-        android:layout_width="@dimen/clock_font_axis_name_width"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/barrier1"
-        app:layout_constraintBottom_toTopOf="@+id/barrier2"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/clock_axis_slider2"
-        android:layout_marginVertical="@dimen/clock_axis_control_slider_row_margin_vertical"
-        android:layout_marginEnd="@dimen/clock_axis_control_text_margin_end"
-        android:lines="1"
-        android:ellipsize="end"
-        style="@style/CustomizationOptionEntryTitleTextStyle"
-        android:text="@string/tab_placeholder_text" />
-
-    <com.google.android.material.slider.Slider
-        android:id="@+id/clock_axis_slider2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/accessibility_min_height"
-        app:layout_constraintTop_toBottomOf="@+id/barrier1"
-        app:layout_constraintBottom_toTopOf="@+id/barrier2"
-        app:layout_constraintStart_toEndOf="@+id/clock_axis_slider_name2"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginVertical="@dimen/clock_axis_control_slider_row_margin_vertical"
-        app:trackHeight="@dimen/slider_track_height"
-        app:thumbHeight="@dimen/slider_thumb_height"
-        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
-
-    <androidx.constraintlayout.widget.Barrier
-        android:id="@+id/barrier2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="clock_axis_slider2,clock_axis_slider_name2" />
-
-    <TextView
-        android:id="@+id/clock_axis_switch_name1"
-        android:layout_width="@dimen/clock_font_axis_name_width"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/barrier2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        android:layout_marginVertical="@dimen/clock_axis_control_switch_row_margin_vertical"
-        android:lines="1"
-        android:ellipsize="end"
-        style="@style/CustomizationOptionEntryTitleTextStyle"
-        android:text="@string/tab_placeholder_text" />
-
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/clock_axis_switch1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/barrier2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/clock_axis_switch_name1"
-        android:layout_marginVertical="@dimen/clock_axis_control_switch_row_margin_vertical"
-        android:layout_marginStart="@dimen/clock_axis_control_text_margin_end"
-        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
-
-    <ImageView
-        android:id="@+id/divider"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/barrier2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        android:src="@drawable/clock_font_switch_divider"
-        android:importantForAccessibility="no" />
-
-    <TextView
-        android:id="@+id/clock_axis_switch_name2"
-        android:layout_width="@dimen/clock_font_axis_name_width"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/barrier2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/clock_axis_switch2"
-        android:layout_marginVertical="@dimen/clock_axis_control_switch_row_margin_vertical"
-        android:layout_marginEnd="@dimen/clock_axis_control_text_margin_end"
-        android:lines="1"
-        android:ellipsize="end"
-        style="@style/CustomizationOptionEntryTitleTextStyle"
-        android:text="@string/tab_placeholder_text" />
-
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/clock_axis_switch2"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:layout_constraintTop_toBottomOf="@+id/barrier2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        android:layout_marginVertical="@dimen/clock_axis_control_switch_row_margin_vertical"
-        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file

diff --git a/res/layout/floating_sheet_clock_size_content.xml b/res/layout/floating_sheet_clock_size_content.xml
new file mode 100644
index 0000000..e6c41f2
--- /dev/null
+++ b/res/layout/floating_sheet_clock_size_content.xml

@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (C) 2025 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.
+  -->
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingVertical="@dimen/floating_sheet_content_vertical_padding"
+    android:clipToPadding="false"
+    android:clipChildren="false">
+
+    <TextView
+        android:id="@+id/clock_style_clock_size_title"
+        style="@style/CustomizationOptionEntryTitleTextStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:text="@string/clock_size_large"
+        android:layout_marginStart="@dimen/floating_sheet_content_horizontal_padding"
+        android:layout_marginEnd="@dimen/floating_sheet_clock_style_clock_size_text_margin_end"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/clock_style_clock_size_switch"
+        app:layout_constraintTop_toBottomOf="parent"
+        app:layout_constraintBottom_toTopOf="@+id/clock_style_clock_size_description" />
+
+    <TextView
+        android:id="@+id/clock_style_clock_size_description"
+        style="@style/CustomizationOptionEntrySubtitleTextStyle"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/floating_sheet_content_horizontal_padding"
+        android:layout_marginEnd="@dimen/floating_sheet_clock_style_clock_size_text_margin_end"
+        android:text="@string/clock_size_large_description"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/clock_style_clock_size_switch"
+        app:layout_constraintTop_toBottomOf="@+id/clock_style_clock_size_title"
+        app:layout_constraintBottom_toBottomOf="parent" />
+
+    <com.google.android.material.materialswitch.MaterialSwitch
+        android:id="@+id/clock_style_clock_size_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="@dimen/floating_sheet_content_horizontal_padding"
+        app:layout_constraintTop_toTopOf="@+id/clock_style_clock_size_title"
+        app:layout_constraintBottom_toBottomOf="@+id/clock_style_clock_size_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
+</androidx.constraintlayout.widget.ConstraintLayout>

diff --git a/res/layout/floating_sheet_clock_style_content.xml b/res/layout/floating_sheet_clock_style_content.xml
index 0339e26..259f376 100644
--- a/res/layout/floating_sheet_clock_style_content.xml
+++ b/res/layout/floating_sheet_clock_style_content.xml

@@ -13,26 +13,18 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="@dimen/floating_sheet_clock_style_content_top_padding"
-    android:paddingBottom="@dimen/floating_sheet_clock_style_content_bottom_padding"
+    android:orientation="vertical"
+    android:paddingVertical="@dimen/floating_sheet_content_vertical_padding"
     android:clipToPadding="false"
     android:clipChildren="false">
 
     <FrameLayout
-        android:id="@+id/clock_style_list_container"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/clock_style_clock_size_title"
-        android:layout_marginBottom="@dimen/floating_sheet_clock_style_option_list_margin_bottom"
         android:clipToPadding="false"
         android:clipChildren="false">
 
@@ -47,8 +39,8 @@
         -->
         <include
             layout="@layout/clock_style_option"
-            android:layout_width="@dimen/floating_sheet_clock_style_option_width"
-            android:layout_height="@dimen/floating_sheet_clock_style_option_height"
+            android:layout_width="@dimen/floating_sheet_clock_style_option_size"
+            android:layout_height="@dimen/floating_sheet_clock_style_option_size"
             android:visibility="invisible" />
 
         <androidx.recyclerview.widget.RecyclerView
@@ -59,40 +51,18 @@
             android:clipToPadding="false"/>
     </FrameLayout>
 
-    <TextView
-        android:id="@+id/clock_style_clock_size_title"
-        style="@style/CustomizationOptionEntryTitleTextStyle"
-        android:layout_width="0dp"
+    <com.google.android.material.slider.Slider
+        android:id="@+id/clock_axis_preset_slider"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/clock_size_large"
-        android:layout_marginTop="8dp"
-        android:layout_marginStart="@dimen/floating_sheet_content_horizontal_padding"
-        android:layout_marginEnd="@dimen/floating_sheet_clock_style_clock_size_text_margin_end"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/clock_style_clock_size_switch"
-        app:layout_constraintTop_toBottomOf="@+id/clock_style_list_container"
-        app:layout_constraintBottom_toTopOf="@+id/clock_style_clock_size_description" />
-
-    <TextView
-        android:id="@+id/clock_style_clock_size_description"
-        style="@style/CustomizationOptionEntrySubtitleTextStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/floating_sheet_content_horizontal_padding"
-        android:layout_marginEnd="@dimen/floating_sheet_clock_style_clock_size_text_margin_end"
-        android:text="@string/clock_size_large_description"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/clock_style_clock_size_switch"
-        app:layout_constraintTop_toBottomOf="@+id/clock_style_clock_size_title"
-        app:layout_constraintBottom_toBottomOf="parent" />
-
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/clock_style_clock_size_switch"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/floating_sheet_content_horizontal_padding"
-        app:layout_constraintTop_toTopOf="@+id/clock_style_clock_size_title"
-        app:layout_constraintBottom_toBottomOf="@+id/clock_style_clock_size_description"
-        app:layout_constraintEnd_toEndOf="parent"
+        android:minHeight="@dimen/accessibility_min_height"
+        android:layout_marginTop="@dimen/clock_axis_control_slider_row_margin_vertical"
+        android:valueFrom="0.0"
+        android:valueTo="100.0"
+        android:stepSize="10.0"
+        app:trackHeight="@dimen/slider_track_height"
+        app:thumbHeight="@dimen/slider_thumb_height"
+        app:labelBehavior="gone"
         android:theme="@style/Theme.Material3.DynamicColors.DayNight" />
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>
+

diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 5d4c259..6a0e9d0 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Hou huidige muurpapier"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Stylvoorskou"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Roostervoorskou"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Lettertipevoorskou"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Ikoonvoorskou"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Kleurvoorskou"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Donkertema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Tydelik gedeaktiveer vanweë Batterybespaarder"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Tema-ikone"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Verander programrooster"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Muurpapierkleure"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikone, teks en meer passingkleure in jou muurpapier"</string>

diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 836cc8d..2478db4 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"የአሁኑን ልጣፍ ያቆዩት"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"የቅጥ ቅድመ-ዕይታ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"የፍርግርግ ቅድመ-ዕይታ"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"የቅርጸ-ቁምፊ ቅድመ-ዕይታ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"የአዶ ቅድመ-ዕይታ"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"የቀለም ቅድመ-ዕይታ"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"ጠቆር ያለ ገጽታ"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"በባትሪ ኃይል ቆጣቢ ምክንያት ለጊዜው ተሰናክሏል"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"ገጽታ ያላቸው አዶዎች"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"ቤታ"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"የመተግበሪያ ፍርግርግን ይቀይሩ"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"የልጣፍ ቀለማት"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"በልጣፍዎ ውስጥ ያሉ አዶዎች፣ ጹሁፍ እና ሌሎችም ተዛማጅ ቀለማት"</string>

diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 1264283..0662a46 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"الاحتفاظ بالخلفية الحالية"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"معاينة النمط"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"معاينة الشبكة"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"كيفية معاينة المظاهر"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"معاينة الخط"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"معاينة الرمز"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"معاينة اللون"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"المظهر الداكن"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"تم الإيقاف مؤقتًا بسبب تفعيل ميزة \"توفير شحن البطارية\"."</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"رموز مستوحاة من موضوع معيّن"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"المظاهر"</string>
     <string name="beta_title" msgid="8703819523760746458">"تجريبي"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"استكشاف مظاهر Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"تغيير شبكة التطبيقات"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ألوان الخلفية"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"تتطابق الرموز والنصوص والمزيد مع الألوان في الخلفية"</string>

diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 8f0d668..cef7ec3 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"বৰ্তমানৰ ৱালপেপাৰখন ৰাখক"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"শৈলীৰ পূৰ্বদৰ্শন"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"গ্ৰিডৰ পূৰ্বদৰ্শন"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"ফণ্টৰ পূৰ্বদৰ্শন"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"চিহ্নৰ পূৰ্বদৰ্শন"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"ৰঙৰ পূৰ্বদৰ্শন"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"গাঢ় ৰঙৰ থীম"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"বেটাৰী সঞ্চয়কাৰীৰ বাবে অস্থায়ীভাৱে অক্ষম কৰা হৈছে"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"থীমযুক্ত চিহ্ন"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"বিটা"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"এপৰ গ্ৰিড সলনি কৰক"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ৱালপেপাৰৰ ৰং"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"আপোনাৰ ৱালপেপাৰত চিহ্ন, পাঠ আৰু অধিক মিলা ৰং"</string>

diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index b1913d0..f20b5d1 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Cari divar kağızını saxlayın"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Üslub önizləməsi"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Tor önizləməsi"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Temalara önbaxış"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Şrift önizləməsi"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"İkona önizləməsi"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Rəng önizləməsi"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Tünd tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Enerjiyə Qənaət rejiminə görə müvəqqəti deaktivdir"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Temalı ikonalar"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Temalar"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel temalarını kəşf edin"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Tətbiq torunu dəyişin"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Divar kağızı rəngləri"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"İkona, mətn və s. divar kağızındakı rənglərə uyğundur"</string>

diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 4956d50..908c6b9 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Zadrži aktuelnu pozadinu"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Pregled stila"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Pregled mreže"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Pregled tema"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Pregled fonta"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Pregled ikone"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Pregled boje"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Tamna tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Privremeno je onemogućeno zbog uštede baterije"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Tematske ikone"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Teme"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Otkrijte teme za Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Promenite mrežu aplikacija"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Boje pozadine"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikone, tekst i drugo uklapaju se sa bojama pozadine"</string>

diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 058ea61..544dc8e 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Захаваць бягучыя шпалеры"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Перадпрагляд стылю"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Перадпрагляд сеткі"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Перадпрагляд тэм"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Перапрагляд шрыфту"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Перадпрагляд значка"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Перадпрагляд колеру"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Цёмная тэма"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Часова выключана ў рэжыме эканоміі зараду"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Тэматычныя значкі"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Тэмы"</string>
     <string name="beta_title" msgid="8703819523760746458">"Бэта"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Пазнаёмцеся з тэмамі Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Змяніць сетку праграм"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Колеры шпалер"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Значкі і іншае змесціва адпавядаюць колерам шпалер"</string>

diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index aeca171..81d0e72 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Запазване на текущия тапет"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Визуализация на стила"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Визуализация на решетката"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Визуализация на темите"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Визуализация на шрифта"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Визуализация на иконата"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Визуализация на цвета"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Тъмна тема"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Временно деактивирано с цел режим за запазване на батерията"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Икони с теми"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Теми"</string>
     <string name="beta_title" msgid="8703819523760746458">"Бета"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Открийте теми за Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Промяна на решетката с приложения"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Цветове от тапета"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Иконите, текстът и др. съответстват на цветовете в тапета"</string>

diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index c153934..439d332 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"এখন যে ওয়ালপেপার আছে সেটি রাখুন"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"স্টাইল প্রিভিউ করুন"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"গ্রিড প্রিভিউ করুন"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"ফন্ট প্রিভিউ করুন"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"আইকন প্রিভিউ করুন"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"রঙ প্রিভিউ করুন"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"ডার্ক থিম"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ব্যাটারি সেভারের কারণে সাময়িকভাবে বন্ধ করা আছে"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"থিমযুক্ত আইকন"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"বিটা"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"অ্যাপ গ্রিড পরিবর্তন করুন"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ওয়ালপেপারের রঙ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ওয়ালপেপারে আইকন, টেক্সট ও এগুলির সাথে মানানসই আরও রঙ"</string>

diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 8c36544..0827347 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Zadrži trenutnu pozadinsku sliku"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Pregled stila"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Pregled mreže"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Pregled fonta"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Pregled ikone"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Pregled boje"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tamna tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Privremeno onemogućeno zbog uštede baterije"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Tematske ikone"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Promjena mreže aplikacije"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Boje pozadinske slike"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikone, tekst i drugo odgovara bojama pozadinske slike"</string>

diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 208da78..a33dfb1 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Mantén el fons de pantalla actual"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Previsualització de l\'estil"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Previsualització de quadrícula"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Previsualització de la lletra"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Previsualització de la icona"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Previsualització del color"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema fosc"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Desactivat temporalment per Estalvi de bateria"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Icones temàtiques"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Canvia la quadrícula d\'aplicacions"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Colors del fons"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Combina el color d\'icones, text i més amb el fons"</string>

diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 03ad45c..4eff6b2 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Zachovat stávající tapetu"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Náhled stylu"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Náhled mřížky"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Náhled písma"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Náhled ikony"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Náhled barvy"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tmavý motiv"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Dočasně deaktivováno spořičem baterie"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Přebarvené ikony"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Změnit mřížku aplikací"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Barvy tapety"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikony, text a další prvky jsou barevně sladěné s vaší tapetou"</string>

diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 26bb399..bbd3c53 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Behold den aktuelle baggrund"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Forhåndsvisning af stil"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Forhåndsvisning af gitter"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Forhåndsvisning af skrifttype"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Forhåndsvisning af ikon"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Forhåndsvisning af farve"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Mørkt tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Midlertidigt deaktiveret på grund af Batterisparefunktion"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Temaikoner"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Juster appgitter"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Baggrundsfarver"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikoner, tekst og flere matchende farver på din baggrund"</string>

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 91e6111..0faa6bc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Aktuellen Hintergrund behalten"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Designvorschau"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Rastervorschau"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Schriftartvorschau"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Symbolvorschau"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Farbvorschau"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Dunkles Design"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Wegen Energiesparmodus vorübergehend deaktiviert"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Symboldesigns"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"App-Raster ändern"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Hintergrundfarben"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Symbole, Texte und mehr passen farblich zum Hintergrund"</string>

diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 46b4864..14cde02 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Διατήρηση τρέχουσας ταπετσαρίας"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Προεπισκόπηση στιλ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Προεπισκόπηση πλέγματος"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Προεπισκόπηση θεμάτων"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Προεπισκόπηση γραμματοσειράς"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Προεπισκόπηση εικονιδίου"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Προεπισκόπηση χρώματος"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Σκούρο θέμα"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Απενεργοποιήθηκε προσωρινά λόγω Εξοικονόμησης μπαταρίας"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Θεματικά εικονίδια"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Θέματα"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Ανακαλύψτε θέματα Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Αλλαγή πλέγματος εφαρμογής"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Χρώματα ταπετσαρίας"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Εικονίδια, κείμενο και χρώματα στην ταπετσαρία σας"</string>

diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index 906819f..4c7199d 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Style preview"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Grid preview"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Font preview"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Icon preview"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Colour preview"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Dark theme"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Temporarily disabled due to Battery Saver"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Themed icons"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Change app grid"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Wallpaper colours"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icons, text and more match colours in your wallpaper"</string>

diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 82ddde5..ec6b725 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Style preview"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Grid preview"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Themes preview"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Font preview"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Icon preview"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Color preview"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Dark theme"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Temporarily disabled due to Battery Saver"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Themed icons"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Themes"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Discover Pixel themes"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Change app grid"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Wallpaper colors"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icons, text, and more match colors in your wallpaper"</string>

diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 906819f..4c7199d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Style preview"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Grid preview"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Font preview"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Icon preview"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Colour preview"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Dark theme"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Temporarily disabled due to Battery Saver"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Themed icons"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Change app grid"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Wallpaper colours"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icons, text and more match colours in your wallpaper"</string>

diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 906819f..4c7199d 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Keep current wallpaper"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Style preview"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Grid preview"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Font preview"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Icon preview"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Colour preview"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Dark theme"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Temporarily disabled due to Battery Saver"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Themed icons"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Change app grid"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Wallpaper colours"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icons, text and more match colours in your wallpaper"</string>

diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index a71afa3..f806977 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Conservar fondo de pantalla actual"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Vista previa del estilo"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Vista previa de la cuadrícula"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Vista previa de fuente"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Vista previa de ícono"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Vista previa de color"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema oscuro"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Se inhabilitó temporalmente debido al Ahorro de batería"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Íconos temáticos"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Cambiar cuadrícula de apps"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Colores del fondo"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Combina el color de íconos, texto y más con tu fondo"</string>

diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index f76a199..0e626b4 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Mantener fondo de pantalla actual"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Previsualizar estilo"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Vista previa de cuadrícula"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Vista previa de fuente"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Vista previa de icono"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Vista previa de color"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema oscuro"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Inhabilitado temporalmente debido a Ahorro de batería"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Iconos temáticos"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Cambiar cuadrícula de aplicaciones"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Colores del fondo"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Combina el color de iconos, texto y más con el del fondo"</string>

diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index 7b7a949..79477cf 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Säilita praegune taustapilt"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Stiili eelvaade"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Ruudustiku eelvaade"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Fondi eelvaade"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Ikooni eelvaade"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Värvi eelvaade"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tume teema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Akusäästja tõttu ajutiselt keelatud"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Temaatilised ikoonid"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beeta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Rakenduste ruudustiku muutmine"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Taustapildi värvid"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikoonide, teksti ja muud värvid ühtivad taustapildiga."</string>

diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 0feeb14..e7528c0 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Utzi bere horretan horma-papera"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Estiloaren aurrebista"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Saretaren aurrebista"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Letraren aurrebista"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Ikonoaren aurrebista"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Kolorearen aurrebista"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Gai iluna"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Aldi baterako desgaituta, bateria-aurreztailea dela eta"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ikono gaidunak"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Aldatu aplikazioen sareta"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Horma-paperaren koloreak"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikonoak, testua, etab. horma-paperaren koloreekin bat datoz"</string>

diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index 691bc2b..ef3ebeb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"حفظ کاغذدیواری فعلی"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"پیش‌نمایش سبک"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"پیش‌نمایش جدول"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"پیش‌نمایش زمینه"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"پیش‌نمایش قلم"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"پیش‌نمایش نماد"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"پیش‌نمایش رنگ"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"زمینه تاریک"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"به‌دلیل روشن بودن «بهینه‌سازی باتری» موقتاً غیرفعال شده است"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"نمادهای موضوعی"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"زمینه‌ها"</string>
     <string name="beta_title" msgid="8703819523760746458">"بتا"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"کاوش زمینه‌های Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"تغییر جدول برنامه"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"رنگ‌های کاغذدیواری"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"نمادها، نوشتار، و موارد دیگر با رنگ کاغذدیواری هماهنگ می‌شود"</string>

diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 08c7a9d..07131bb 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Säilytä nykyinen taustakuva"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Tyylin esikatselu"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Ruudukon esikatselu"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Fontin esikatselu"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Kuvakkeen esikatselu"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Värin esikatselu"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tumma teema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Tilapäisesti pois käytöstä virransäästön takia"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Teemaan sopivat kuvakkeet"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Muuta sovellusruudukkoa"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Taustakuvan värit"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Kuvakkeet, teksti jne. taustakuvan värisiä"</string>

diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index ba97afc..9faad10 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Garder le fond d\'écran actuel"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Aperçu du style"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Aperçu de la grille"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Aperçu des thèmes"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Aperçu de la police"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Aperçu de l\'icône"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Aperçu de la couleur"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Thème sombre"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Temporairement désactivé par l\'économiseur de pile"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Icônes du thème"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Thèmes"</string>
     <string name="beta_title" msgid="8703819523760746458">"Bêta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Découvrez les thèmes Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Modifiez la grille d\'applis"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Couleurs de fond d\'écran"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icônes, texte, etc., assortis aux couleurs du fond d\'écran"</string>

diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fe04a89..5110958 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Conserver le fond d\'écran actuel"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Aperçu du style"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Aperçu de la grille"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Aperçu de la police"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Aperçu de l\'icône"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Aperçu de la couleur"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Thème sombre"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Temporairement désactivé par l\'économiseur de batterie"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Icônes à thème"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Bêta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Modifier la grille d\'applis"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Couleurs fond d\'écran"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Couleur des icônes, du texte… assortie au fond d\'écran"</string>

diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index c32848a..84a12a0 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Conservar fondo de pantalla actual"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Vista previa do estilo"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Vista previa da grade"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Vista previa do tipo de letra"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Vista previa da icona"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Vista previa da cor"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema escuro"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Desactivouse temporalmente debido ao Aforro de batería"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Iconas temáticas"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Cambia a grade de aplicacións"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Cores do fondo"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Combina as cores das iconas, o texto e outros co fondo"</string>

diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 1d4bcee..f28fa9a 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"હાલનું વૉલપેપર રાખો"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"શૈલીનો પ્રીવ્યૂ કરો"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ગ્રિડનો પ્રીવ્યૂ કરો"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"ફોન્ટનો પ્રીવ્યૂ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"આઇકનનો પ્રીવ્યૂ"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"રંગનો પ્રીવ્યૂ"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"ડાર્ક થીમ"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"બૅટરી સેવરના લીધે હંગામીરૂપે બંધ કર્યું"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"થીમવાળા આઇકન"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"બીટા"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ઍપ ગ્રિડ બદલો"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"વૉલપેપરના રંગો"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"તમારા વૉલપેપરમાં આઇકન, ટેક્સ્ટ, વગેરેના મેળ ખાતા રંગો"</string>

diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 213bd1d..04a0c4a 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"मौजूदा वॉलपेपर बनाए रखें"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"थीम की झलक देखें"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ग्रिड की झलक देखें"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"फ़ॉन्ट की झलक देखें"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"आइकॉन की झलक देखें"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"रंग की झलक देखें"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"गहरे रंग वाली थीम"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"बैटरी सेवर मोड चालू होने की वजह से, इस सुविधा को कुछ समय के लिए बंद कर दिया गया है"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"थीम वाले आइकॉन"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"बीटा"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ऐप्लिकेशन ग्रिड बदलें"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"वॉलपेपर के रंग"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"वॉलपेपर में आइकॉन, टेक्स्ट वगैरह के लिए मिलते-जुलते रंग"</string>

diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 6ad9769..06f5ab5 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Zadrži trenutačnu pozadinu"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Pregled stila"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Pregled rešetke"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Pregled fonta"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Pregled ikone"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Pregled boje"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tamna tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Privremeno onemogućeno zbog štednje baterije"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Tematske ikone"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Promjena rešetke aplikacije"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Boje pozadine"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikone, tekst i ostalo odgovara bojama na pozadini"</string>

diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 99f030a..c311161 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Jelenlegi háttérkép megtartása"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Stílus előnézete"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Rács előnézete"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Betűtípus előnézete"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Ikon előnézete"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Szín előnézete"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Sötét téma"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Átmenetileg kikapcsolva az Akkumulátorkímélő mód miatt"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Tematikus ikonok"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Béta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Alkalmazásrács módosítása"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Háttérképszínek"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"A háttérképpel egyező színű ikonok, szövegek és egyebek"</string>

diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index b6bd68d..00e91fd 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Պահպանել ընթացիկ պաստառը"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Ոճի նախադիտում"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Ցանցի նախադիտում"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Տառատեսակի նախադիտում"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Պատկերակի նախադիտում"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Գույնի նախադիտում"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Մուգ թեմա"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Ժամանակավորապես անջատվել է մարտկոցի տնտեսման համար"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Թեմատիկ պատկերակներ"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Բետա"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Փոխել հավելվածների ցանցը"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Պաստառի գույներ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Պատկերակները և տեքստը ընտրված են ըստ պաստառի գույների"</string>

diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index e0b1761..751a190 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Pertahankan wallpaper saat ini"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Pratinjau gaya"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Pratinjau petak"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Pratinjau font"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Pratinjau ikon"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Pratinjau warna"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema gelap"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Dinonaktifkan sementara karena fitur Penghemat Baterai"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ikon bertema"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Ubah petak aplikasi"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Warna wallpaper"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikon, teks, dan lain-lain serasi dengan warna wallpaper"</string>

diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 3199f6f..2c93743 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Halda núverandi veggfóðri"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Forskoðun stíls"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Forskoðun hnitanets"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Forskoðun leturgerðar"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Forskoðun tákns"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Forskoðun litar"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Dökkt þema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Slökkt tímabundið vegna rafhlöðusparnaðar"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Þematákn"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Breyta forritatöflu"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Veggfóðurslitir"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Tákn, texti og fleira passar við liti veggfóðursins"</string>

diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index ebf1726..0ee4dee 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Mantieni lo sfondo corrente"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Anteprima stile"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Anteprima griglia"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Anteprima dei temi"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Anteprima carattere"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Anteprima icona"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Anteprima colore"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema scuro"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Opzione disattivata temporaneamente per risparmio energetico"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Icone a tema"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Temi"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Scopri i temi Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Cambia griglia di app"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Colori di sfondo"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icone, testo e altro si adattano ai colori dello sfondo"</string>

diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index e0930ff..d5f963f 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"שמירת הטפט הנוכחי"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"תצוגה מקדימה של הסגנון"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"תצוגה מקדימה של הרשת"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"תצוגה מקדימה של הגופן"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"תצוגה מקדימה של הסמל"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"תצוגה מקדימה של הצבע"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"עיצוב כהה"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"מושבת זמנית כי הופעל מצב \'חיסכון בסוללה\'"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"סמלים מעוצבים"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"בטא"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"שינוי רשת האפליקציות"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"צבעי הטפט"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"הצבע של הסמלים, הטקסטים ורכיבים נוספים יתאים לצבעי הטפט"</string>

diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index fed9d95..8ac1f27 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"現在の壁紙を保持"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"スタイルのプレビュー"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"グリッドのプレビュー"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"テーマのプレビュー"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"フォントのプレビュー"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"アイコンのプレビュー"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"色のプレビュー"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"ダークモード"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"バッテリー セーバーにより一時的に無効になりました"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"テーマアイコン"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"テーマ"</string>
     <string name="beta_title" msgid="8703819523760746458">"ベータ版"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Google Pixel のテーマを探す"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"アプリグリッドを変更します"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"壁紙の色"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"壁紙の色に合うアイコン、テキストなど"</string>

diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index c28ec26..f82c371 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"ამჟამინდელი ფონის შენარჩუნება"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"სტილის გადახედვა"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ბადის გადახედვა"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"თემების გადახედვა"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"შრიფტის გადახედვა"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"ხატულის გადახედვა"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"ფერის გადახედვა"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"მუქი თემა"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ბატარეის დამზოგის გამო დროებით გათიშულია"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"თემატური ხატულები"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"თემები"</string>
     <string name="beta_title" msgid="8703819523760746458">"ბეტა"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"აღმოაჩინეთ Pixel თემები"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"აპების ბადის შეცვლა"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ფონის ფერები"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ხატულები, ტექსტი და სხვა ემთხვევა ფერებს თქვენს ფონზე"</string>

diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index c7539be..2f5eb9a 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Қазіргі тұсқағазды қалдыру"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Стильді алдын ала көру"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Торды алдын ала көру"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Қаріпті алдын ала көру"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Белгішені алдын ала көру"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Түсті алдын ала көру"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Қараңғы режим"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Батареяны үнемдеу режиміне байланысты уақытша өшірілген."</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Тақырыптық белгішелер"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Бета"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Қолданбалар торын өзгерту"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Тұсқағаз түстері"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Белгіше, мәтін және тұсқағаздағы басқа да сәйкес түстер"</string>

diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index f60d71f..79f049d 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"រក្សាទុកផ្ទាំងរូបភាពបច្ចុប្បន្ន"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"ការមើលរចនាប័ទ្មសាកល្បង"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ការមើលក្រឡាសាកល្បង"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"ការមើលទម្រង់រចនាសាកល្បង"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"ការមើលពុម្ពអក្សរសាកល្បង"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"ការមើលរូបតំណាងសាកល្បង"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"ការមើលពណ៌សាកល្បង"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"ទម្រង់រចនាងងឹត"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"បានបិទជាបណ្តោះអាសន្ន ដោយសារមុខងារសន្សំថ្ម"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"រូបតំណាងប្ដូរតាមទម្រង់រចនា"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"ទម្រង់រចនា"</string>
     <string name="beta_title" msgid="8703819523760746458">"បេតា"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"ស្វែងយល់អំពីទម្រង់រចនា Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ប្ដូរក្រឡាកម្មវិធី"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ពណ៌ផ្ទាំងរូបភាព"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"រូបតំណាង អក្សរ និងពណ៌ដែលត្រូវគ្នាជាច្រើនទៀតក្នុងផ្ទាំងរូបភាពរបស់អ្នក"</string>

diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index 5c4ea0a..8a63d01 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"ಪ್ರಸ್ತುತ ವಾಲ್‌ಪೇಪರ್ ಅನ್ನು ಉಳಿಸಿ"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"ಶೈಲಿ ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ಗ್ರಿಡ್ ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"ಥೀಮ್‌ಗಳ ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"ಫಾಂಟ್ ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"ಐಕಾನ್ ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"ಬಣ್ಣ ಪೂರ್ವವೀಕ್ಷಣೆ"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"ಡಾರ್ಕ್ ಥೀಮ್"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ಬ್ಯಾಟರಿ ಸೇವರ್‌ ಕಾರಣದಿಂದ ತಾತ್ಕಾಲಿಕವಾಗಿ ನಿಷ್ಕ್ರಿಯಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"ಥೀಮ್ ಮಾಡಿದ ಐಕಾನ್‌ಗಳು"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"ಥೀಮ್‌ಗಳು"</string>
     <string name="beta_title" msgid="8703819523760746458">"ಬೀಟಾ"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel ಥೀಮ್‌ಗಳನ್ನು ಅನ್ವೇಷಿಸಿ"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ಆ್ಯಪ್ ಗ್ರಿಡ್ ಬದಲಾಯಿಸಿ"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ವಾಲ್‌ಪೇಪರ್ ಬಣ್ಣಗಳು"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ಐಕಾನ್‌, ಪಠ್ಯ ಮತ್ತು ಇತ್ಯಾದಿಗಳು ವಾಲ್‌ಪೇಪರ್‌ನಲ್ಲಿನ ಬಣ್ಣಗಳನ್ನು ಹೋಲುತ್ತವೆ"</string>

diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 65b4a28..a2d0f2d 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"현재 배경화면 유지"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"스타일 미리보기"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"그리드 미리보기"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"글꼴 미리보기"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"아이콘 미리보기"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"색상 미리보기"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"어두운 테마"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"절전 모드로 인해 일시적으로 사용 중지됨"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"테마 아이콘"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"베타"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"앱 그리드 변경"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"배경화면 색상"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"아이콘, 텍스트 등의 색상이 배경화면과 일치합니다"</string>

diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index c1c6db2..5c5ed7c 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Учурдагы тушкагаз калсын"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Стилди алдын ала көрүү"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Торчону алдын ала көрүү"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Темаларды алдын ала көрүү"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Арипти алдын ала көрүү"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Сүрөтчөнү алдын ала көрүү"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Түстү алдын ала көрүү"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Караңгы тема"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Батареяны үнөмдөөчү режимде убактылуу өчүрүлдү"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Тематикалык сүрөтчөлөр"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Темалар"</string>
     <string name="beta_title" msgid="8703819523760746458">"Бета"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel темаларын карап чыгуу"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Колдонмонун торчосун өзгөртүү"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Тушкагаздын түстөрү"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Сүрөтчөлөр, текст ж.б. тушкагаздын түсүнө айкалышат"</string>

diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 1119e6d..04c94e3 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"ໃຊ້ຮູບພື້ນຫຼັງປັດຈຸບັນ"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"ຕົວຢ່າງຮູບແບບ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ຕົວຢ່າງຊ່ອງ"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"ຕົວຢ່າງຮູບແບບສີສັນ"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"ຕົວຢ່າງຟອນ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"ຕົວຢ່າງໄອຄອນ"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"ຕົວຢ່າງສີ"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"ຮູບແບບສີສັນມືດ"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ຖືກປິດການນຳໃຊ້ຊົ່ວຄາວເນື່ອງຈາກຕົວປະຢັດແບັດເຕີຣີ"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"ໄອຄອນຕາມຮູບແບບສີສັນ"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"ຮູບແບບສີສັນ"</string>
     <string name="beta_title" msgid="8703819523760746458">"ເບຕ້າ"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"ຄົ້ນພົບຮູບແບບສີສັນ Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ປ່ຽນຕາຕະລາງແອັບ"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ສີຮູບພື້ນຫຼັງ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ໄອຄອນ, ຂໍ້ຄວາມ ແລະ ອື່ນໆຈະມີສີທີ່ເຂົ້າກັບຮູບພື້ນຫຼັງຂອງທ່ານ"</string>

diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index 477eb05..0dec5fc 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Palikti dabartinį ekrano foną"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Stiliaus peržiūra"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Tinklelio peržiūra"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Šrifto peržiūra"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Piktogramos peržiūra"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Spalvos peržiūra"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tamsioji tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Laikinai išjungta dėl Akumuliatoriaus tausojimo priemonės"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Teminės piktogramos"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Programų tinklelio keitimas"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Ekrano fono spalvos"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ekrano foną atitinkančios pikt., teksto ir kt. spalvos"</string>

diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index be6ab31..5773945 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Paturēt pašreizējo fona tapeti"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Stila priekšskatījums"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Režģa priekšskatījums"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Fonta priekšskatījums"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Ikonas priekšskatījums"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Krāsas priekšskatījums"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tumšais motīvs"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Īslaicīgi atspējots akumulatora enerģijas taupīšanas dēļ"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Motīvu ikonas"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Mainīt lietotņu režģi"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Fona tapetes krāsas"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Saskaņotas ikonu, teksta u.c. krāsas jūsu fona tapetē"</string>

diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 9444ce0..53aec5c 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Задржи тековен тапет"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Преглед на стил"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Преглед на решетка"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Преглед на темите"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Преглед на фонтот"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Преглед на иконата"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Преглед на бојата"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Темна тема"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Привремено оневозможено поради „Штедачот на батерија“"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Тематски икони"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Теми"</string>
     <string name="beta_title" msgid="8703819523760746458">"Бета"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Откријте теми на Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Променете ја мрежата на апликации"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Бои од тапетот"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Иконите, текстот и др. се совпаѓаат по боја со тапетот"</string>

diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 650aaf4..5d7e770 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"നിലവിലെ വാൾപേപ്പർ നിലനിർത്തുക"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"സ്‌റ്റൈൽ പ്രിവ്യൂ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ഗ്രിഡ് പ്രിവ്യൂ"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"തീമുകളുടെ പ്രിവ്യൂ"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"ഫോണ്ട് പ്രിവ്യൂ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"ഐക്കൺ പ്രിവ്യൂ"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"വർണ്ണ പ്രിവ്യൂ"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"ഡാർക്ക് തീം"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ബാറ്ററി സേവർ കാരണം തൽക്കാലം പ്രവർത്തനരഹിതമാണ്"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"തീമുള്ള ഐക്കണുകൾ"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"തീമുകൾ"</string>
     <string name="beta_title" msgid="8703819523760746458">"ബീറ്റ"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"ഡിസ്‌ക്കവർ Pixel തീമുകൾ"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ആപ്പ് ഗ്രിഡ് മാറ്റുക"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"വാൾപേപ്പർ നിറങ്ങൾ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"വാൾപേപ്പർ നിറത്തിനിണങ്ങുന്ന ഐക്കണും ടെക്സ്റ്റും മറ്റും"</string>

diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index 0e2a3df..2b4d972 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Одоогийн дэлгэцийн зургийг хадгалах"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Загварыг урьдчилан үзэх"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Торыг урьдчилан үзэх"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Фонтыг урьдчилан үзэх"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Дүрс тэмдгийг урьдчилан үзэх"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Өнгийг урьдчилан үзэх"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Бараан загвар"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Батарей хэмнэгчийн улмаас түр зуур идэвхгүй болгосон"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Загварын дүрс тэмдэг"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Бета"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Аппын хүснэгтийг өөрчлөх"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Дэлгэцийн зургийн өнгө"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Таны дэлгэцийн зургийн дүрс тэмдэг, текст, бусад таарсан өнгө"</string>

diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 1b29fc2..eddbeb9 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"सध्याचा वॉलपेपर ठेवा"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"शैली पूर्वावलोकन"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ग्रिड पूर्वावलोकन"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"थीमचे पूर्वावलोकन"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"फाँटचे पूर्वावलोकन"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"आयकनचे पूर्वावलोकन"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"रंगाचे पूर्वावलोकन"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"गडद थीम"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"बॅटरी सेव्हर मुळे तात्पुरते बंद केले आहे"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"थीम असलेले आयकन"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"थीम"</string>
     <string name="beta_title" msgid="8703819523760746458">"बीटा"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel थीम डिस्कव्हर करा"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"अ‍ॅप ग्रिड बदला"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"वॉलपेपरचे रंग"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"वॉलपेपरमधील आयकन, मजकूर व आणखी गोष्टींचे जुळणारे रंग"</string>

diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 474bc4f..7e99630 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Kekalkan kertas dinding semasa"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Pratonton Gaya"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Pratonton grid"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Pratonton tema"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Pratonton fon"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Pratonton ikon"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Pratonton warna"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema gelap"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Dilumpuhkan sementara disebabkan Penjimat Bateri"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ikon bertema"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Tema"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Temukan tema Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Tukar grid apl"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Warna hiasan latar"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikon, teks dan pelbagai padanan warna pada hiasan latar"</string>

diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index ea89c91..77fc555 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"လက်ရှိနောက်ခံပုံ ဆက်ထားရန်"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"ပုံစံ အစမ်းကြည့်ရှုခြင်း"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ဇယားကွက် အစမ်းကြည့်ရှုခြင်း"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"ဖောင့် အစမ်းကြည့်ရှုခြင်း"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"သင်္ကေတ အစမ်းကြည့်ရှုခြင်း"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"အရောင် အစမ်းကြည့်ရှုခြင်း"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"အမှောင်နောက်ခံ"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"‘ဘက်ထရီ အားထိန်း’ ကြောင့် ယာယီပိတ်ထားသည်"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"အကြောင်းအရာ သင်္ကေတများ"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"စမ်းသပ်"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"အက်ပ်ဇယား ပြောင်းရန်"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"နောက်ခံအရောင်များ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"သင်္ကေတ၊ စာသားစသည်တို့သည် သင့်နောက်ခံအရောင်များနှင့် လိုက်ဖက်သည်"</string>

diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 95b9d25..79d2a18 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Behold den nåværende bakgrunnen"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Forhåndsvisning av stil"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Forhåndsvisning av rutenett"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Forhåndsvisning av skrifttype"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Forhåndsvisning av ikon"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Forhåndsvisning av farge"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Mørkt tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Midlertidig slått av på grunn av Batterisparing"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Temaikoner"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Endre apprutenett"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Bakgrunnsfarger"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikoner, tekst og annet matcher fargene i bakgrunnen"</string>

diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index a417a2e..74b8402 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"अहिले कै वालपेपर राख्नुहोस्"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"शैलीको प्रिभ्यु"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ग्रिडको प्रिभ्यु"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"फन्टको प्रिभ्यू"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"आइकनको प्रिभ्यू"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"रङको प्रिभ्यू"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"अँध्यारो थिम"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ब्याट्री सेभर अन भएकाले केही समयका लागि अफ गरिएको छ"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"थिमयुक्त आइकन"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"बिटा"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"एप ग्रिड बदल्नुहोस्"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"वालपेपरका रङहरू"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"तपाईंको वालपेपरमा आइकन, टेक्स्ट तथा अन्य कुरासँग मिल्दाजुल्दा रङहरू"</string>

diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 39be3af..e0ded7c 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Huidige achtergrond behouden"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Stijlvoorbeeld"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Rastervoorbeeld"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Lettertypevoorbeeld"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Icoonvoorbeeld"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Kleurvoorbeeld"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Donker thema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Tijdelijk uit vanwege Batterijbesparing"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Thema-iconen"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Bèta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"App-raster wijzigen"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Achtergrondkleuren"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Iconen, tekst en meer matchen je achtergrondkleur"</string>

diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 1223425..7669b6e 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"ବର୍ତ୍ତମାନର ୱାଲ୍‌ପେପର୍‌କୁ ରଖନ୍ତୁ"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"ଷ୍ଟାଇଲ୍ ପ୍ରିଭ୍ୟୁ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ଗ୍ରିଡ୍ ପ୍ରିଭ୍ୟୁ"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"ଥିମ ପ୍ରିଭ୍ୟୁ"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"ଫଣ୍ଟ ପ୍ରିଭ୍ୟୁ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"ଆଇକନ୍ ପ୍ରିଭ୍ୟୁ"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"ରଙ୍ଗ ପ୍ରିଭ୍ୟୁ"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"ଡାର୍କ ଥିମ"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ବ୍ୟାଟେରୀ ସେଭର୍ ଯୋଗୁଁ ଅସ୍ଥାୟୀ ଭାବେ ଅକ୍ଷମ କରାଯାଇଛି"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"ଥିମ ଯୁକ୍ତ ଆଇକନ"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"ଥିମ"</string>
     <string name="beta_title" msgid="8703819523760746458">"ବିଟା"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel ଥିମ ଡିସ୍କଭର କରନ୍ତୁ"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ଆପ୍ ଗ୍ରିଡ୍ ପରିବର୍ତ୍ତନ କରନ୍ତୁ"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ୱାଲପେପର ରଙ୍ଗଗୁଡ଼ିକ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ଆଇକନ, ଟେକ୍ସଟ ଓ ଅନେକ କିଛି ୱାଲପେପରରେ ରଙ୍ଗ ସହ ମେଳ ହୁଏ"</string>

diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index a7dad4a..d5e79cc 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"ਮੌਜੂਦਾ ਵਾਲਪੇਪਰ ਬਰਕਰਾਰ ਰੱਖੋ"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"ਸਟਾਈਲ ਦੀ ਪੂਰਵ-ਝਲਕ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ਗ੍ਰਿਡ ਪੂਰਵ-ਝਲਕ"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"ਥੀਮਾਂ ਦੀ ਪੂਰਵ-ਝਲਕ"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"ਫ਼ੌਂਟ ਦੀ ਪੂਰਵ-ਝਲਕ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"ਪ੍ਰਤੀਕ ਦੀ ਪੂਰਵ-ਝਲਕ"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"ਰੰਗ ਦੀ ਪੂਰਵ-ਝਲਕ"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"ਗੂੜ੍ਹਾ ਥੀਮ"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ਬੈਟਰੀ ਸੇਵਰ ਕਰਕੇ ਕੁਝ ਸਮੇਂ ਲਈ ਬੰਦ ਕੀਤਾ ਗਿਆ"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"ਥੀਮ ਵਾਲੇ ਪ੍ਰਤੀਕ"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"ਥੀਮ"</string>
     <string name="beta_title" msgid="8703819523760746458">"ਬੀਟਾ"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel ਥੀਮਾਂ ਨੂੰ ਖੋਜੋ"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ਐਪ ਗ੍ਰਿਡ ਬਦਲੋ"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"ਵਾਲਪੇਪਰ ਦੇ ਰੰਗ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ਵਾਲਪੇਪਰ ਵਿੱਚ ਪ੍ਰਤੀਕਾਂ, ਲਿਖਤ ਅਤੇ ਹੋਰ ਚੀਜ਼ਾਂ ਦੇ ਮੇਲ ਖਾਂਦੇ ਰੰਗ"</string>

diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 4b6a863..5857cd6 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Pozostaw bieżącą tapetę"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Podgląd stylu"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Podgląd siatki"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Podgląd czcionki"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Podgląd ikony"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Podgląd koloru"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Ciemny motyw"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Tymczasowo wyłączono z powodu oszczędzania baterii"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ikony z motywem"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Zmień siatkę aplikacji"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Kolory tapety"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikony, tekst i inne elementy pasują do koloru tapety"</string>

diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index e53dc55..ebcd378 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Manter a imagem de fundo atual"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Pré-visualização do estilo"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Pré-visualização da grelha"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Pré-visualização de temas"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Pré-visualiz. do tipo de letra"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Pré-visualização do ícone"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Pré-visualização da cor"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema escuro"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Temporariamente desativado devido à Poupança de bateria"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ícones temáticos"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Temas"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Descubra temas do Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Altere a grelha de apps"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Cores do fundo"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ícones, texto, etc. condizem com a imagem de fundo"</string>

diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index b0b1db7..87f4f3f 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Manter o plano de fundo atual"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Visualização do estilo"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Visualização da grade"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Visualização da fonte"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Visualização do ícone"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Visualização da cor"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema escuro"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Desativado temporariamente pela Economia de bateria"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ícones com tema"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Mudar a grade de apps"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Cores do plano de fundo"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ícones, texto e mais para combinar com o plano de fundo"</string>

diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 577eb55..94867c8 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Păstrează imaginea de fundal actuală"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Previzualizarea stilului"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Previzualizarea grilei"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Previzualizarea fontului"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Previzualizarea pictogramei"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Previzualizarea culorii"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Temă întunecată"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Dezactivat temporar de Economisirea bateriei"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Pictograme tematice"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Schimbă grila de aplicații"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Culori de fundal"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Pictograme, text etc. în culoarea imaginii de fundal"</string>

diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 1beebb5..2e6e253 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Использовать текущие обои"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Предварительный просмотр стиля"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Предварительный просмотр сетки"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Предпросмотр тем"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Предпросмотр шрифта"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Предпросмотр значка"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Предпросмотр цвета"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Тёмная тема"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Временно отключено из-за режима энергосбережения"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Тематические значки"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Темы"</string>
     <string name="beta_title" msgid="8703819523760746458">"Бета"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Темы Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Настроить сетку приложений"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Цвета обоев"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Значки, текст и др. будут сочетаться по цвету с обоями."</string>

diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index d0a6381..1b17ffb 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"වත්මන් බිතුපත තබා ගන්න"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"විලාස පෙරදසුන"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"ජාලක පෙරදසුන"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"තේමා පෙරදසුන"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"ෆොන්ට පෙරදසුන"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"නිරූපක පෙරදසුන"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"වර්ණ පෙරදසුන"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"අඳුරු තේමාව"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"බැටරි සුරැකුම හේතුවෙන් තාවකාලිකව අබල කරන ලදි"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"තේමාගත නිරූපක"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"තේමා"</string>
     <string name="beta_title" msgid="8703819523760746458">"බීටා"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel තේමා සොයා ගන්න"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"යෙදුම් ජාලකය වෙනස් කරන්න"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"වෝල්පේපර වර්ණ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ඔබේ වෝල්පේපරයේ නිරූපක, පෙළ, සහ තවත් ගැළපුම් වර්ණ"</string>

diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index d64e589..eb77e25 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Ponechať aktuálnu tapetu"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Ukážka štýlu"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Ukážka mriežky"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Ukážka písma"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Ukážka ikony"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Ukážka farby"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tmavý motív"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Dočasne vypnuté šetričom batérie"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ikony s motívom"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Zmeniť mriežku aplikácií"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Farby tapety"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikony, text a iné položky zodpovedajú farbami tapete"</string>

diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 674fdc8..0321972 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Obdrži trenutno ozadje"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Predogled sloga"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Predogled mreže"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Predogled tem"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Predogled pisave"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Predogled ikone"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Predogled barve"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Temna tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Začasno onemogočeno zaradi varčevanja z energijo baterije."</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ikone s temo"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Teme"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Odkrijte teme za Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Spreminjanje mreže aplikacij."</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Barve zaslon. ozadja"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikone, besedilo in drugo se ujemajo z barvami zaslonskega ozadja"</string>

diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 58462b9..0afaf81 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Mbaj imazhin aktual të sfondit"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Pamja paraprake e stilit"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Pamja paraprake e rrjetës"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Pamja paraprake e fontit"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Pamja paraprake e ikonës"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Pamja paraprake e ngjyrave"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Tema e errët"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Çaktivizuar për shkak të \"Kursyesit të baterisë\""</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ikona me temë"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Ndrysho rrjetën e aplikacioneve"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Ngjyra imazhi sfondi"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Imazhi i sfondit: ikona, tekst dhe ngjyra të përputhura"</string>

diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 91dbcda..29c5253 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Задржи актуелну позадину"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Преглед стила"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Преглед мреже"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Преглед тема"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Преглед фонта"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Преглед иконе"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Преглед боје"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Тамна тема"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Привремено је онемогућено због уштеде батерије"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Тематске иконе"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Теме"</string>
     <string name="beta_title" msgid="8703819523760746458">"Бета"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Откријте теме за Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Промените мрежу апликација"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Боје позадине"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Иконе, текст и друго уклапају се са бојама позадине"</string>

diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 87970de..9a8f2f4 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Behåll befintlig bakgrund"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Förhandsgranska stilen"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Förhandsgranska rutnätet"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Förhandsgranska teckensnitt"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Förhandsgranska ikoner"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Förhandsgranska färger"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Mörkt tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Tillfälligt inaktiverat i batterisparläge"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Ikoner med tema"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Ändra rutnät för appar"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Bakgrundsfärger"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Ikoner, text med mera matchar bakgrundens färger"</string>

diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 0656501..fb4105a 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Tumia mandhari ya sasa"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Onyesho la kukagua muundo"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Onyesho la kukagua gridi"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Onyesho la kukagua fonti"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Onyesho la kukagua aikoni"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Onyesho la kukagua rangi"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Mandhari meusi"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Imezimwa kwa muda kwa sababu ya Kiokoa Betri"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Aikoni zenye mitindo"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Badilisha gridi ya programu"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Rangi za mandhari"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Aikoni, maandishi na rangi zaidi zinazolingana kwenye mandhari yako"</string>

diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index e05df19..d06fc0e 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"தற்போதைய வால்பேப்பரே இருக்கட்டும்"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"ஸ்டைல் மாதிரிக்காட்சி"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"கட்ட மாதிரிக்காட்சி"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"எழுத்துரு மாதிரிக்காட்சி"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"ஐகான் மாதிரிக்காட்சி"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"வண்ண மாதிரிக்காட்சி"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"டார்க் தீம்"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"பேட்டரிச் சேமிப்பான் காரணமாகத் தற்காலிகமாக முடக்கப்பட்டுள்ளது"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"தீம் ஐகான்கள்"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"பீட்டா"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ஆப்ஸ் கட்டக் காட்சியை மாற்றும்"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"வால்பேப்பர் நிறங்கள்"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ஐகான், உரை மற்றும் பலவற்றின் வண்ணம் வால்பேப்பருடன் பொருந்தும்"</string>

diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 71d1966..ed1c54a 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"ప్రస్తుత వాల్‌పేపర్‌ను అలాగే ఉంచండి"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"స్టైల్ ప్రివ్యూ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"గ్రిడ్ ప్రివ్యూ"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"థీమ్‌ల ప్రివ్యూ"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"ఫాంట్ ప్రివ్యూ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"చిహ్నం ప్రివ్యూ"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"రంగు ప్రివ్యూ"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"డార్క్ థీమ్‌"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"బ్యాటరీ సేవర్ కారణంగా తాత్కాలికంగా డిజేబుల్‌ చేయబడింది"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"థీమ్‌కు తగిన చిహ్నాలు"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"థీమ్‌లు"</string>
     <string name="beta_title" msgid="8703819523760746458">"బీటా"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel థీమ్‌లను కనుగొనండి"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"యాప్ గ్రిడ్‌ను మార్చండి"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"వాల్‌పేపర్ కలర్స్‌"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ఐకాన్స్, టెక్స్ట్&amp;మరిన్ని వాల్‌పేపర్ రంగులకు సరిపోతాయి."</string>

diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index cae0417..29e7fa2 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"ใช้วอลเปเปอร์ปัจจุบัน"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"พรีวิวรูปแบบ"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"พรีวิวตารางกริด"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"ตัวอย่างธีม"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"พรีวิวแบบอักษร"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"พรีวิวไอคอน"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"พรีวิวสี"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"ธีมมืด"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"ปิดใช้ชั่วคราวเนื่องจากอยู่ในโหมดประหยัดแบตเตอรี่"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"ไอคอนตามธีม"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"ธีม"</string>
     <string name="beta_title" msgid="8703819523760746458">"เบต้า"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"ธีม Discover Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"เปลี่ยนแปลงตารางกริดสำหรับแอป"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"สีวอลเปเปอร์"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"ไอคอน ข้อความ และอื่นๆ จะมีสีที่เข้ากับวอลเปเปอร์"</string>

diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index e967ca4..00f6dfb 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Gamitin ang kasalukuyang wallpaper"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Preview ng istilo"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Preview ng grid"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Preview ng mga tema"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Preview ng font"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Preview ng icon"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Preview ng kulay"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Madilim na tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Pansamantalang na-disable dahil sa Pantipid ng Baterya"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Mga may temang icon"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Mga Tema"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Tuklasin ang mga tema ng Pixel"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Baguhin ang grid ng app"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Kulay ng wallpaper"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Icon, text, higit pang tumutugmang kulay sa wallpaper"</string>

diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 3edfd5f..b8c6f88 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Geçerli duvar kağıdını sakla"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Stil önizleme"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Izgara önizleme"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Yazı tipi önizleme"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Simge önizleme"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Renk önizleme"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Koyu tema"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Pil Tasarrufu nedeniyle geçici olarak devre dışı bırakıldı"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Temalı simgeler"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Uygulama ızgarasını değiştirin"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Duvar kağıdı renkleri"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Simge ve metinler gibi öğelerin renkleri, duvar kağıdınızla eşleşir"</string>

diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f15bc48..704dc66 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Зберегти поточний фоновий малюнок"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Попередній перегляд теми"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Попередній перегляд сітки"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Попередній перегляд шрифту"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Попередній перегляд значка"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Попередній перегляд кольору"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Темна тема"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Тимчасово вимкнено, оскільки працює режим енергозбереження"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Тематичні значки"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Бета"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Змінити сітку додатків"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Кольори фону"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Значки, текст тощо під кольори фонового малюнка"</string>

diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 3833ceb..f6a3911 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"حالیہ وال پیپر رکھیں"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"طرز کا پیش منظر"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"گرڈ کا پیش منظر"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"فونٹ کا پیش منظر"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"آئیکن کا پیش منظر"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"رنگ کا پیش منظر"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"گہری تھیم"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"بیٹری سیور کی وجہ سے عارضی طور پر غیر فعال ہے"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"تھیم کردہ آئیکنز"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"بی ٹا"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"ایپ گرڈ تبدیل کریں"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"وال پیپر کے رنگ"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"آئیکنز، ٹیکسٹ اور مزید آپ کے وال پیپر سے مماثل رنگ"</string>

diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index bb31666..0884f36 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml

@@ -56,6 +56,7 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Joriy fon rasmini saqlab qolish"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Dizaynga razm solish"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Kataklarga razm solish"</string>
+    <string name="pack_theme_preview_card_content_description" msgid="2964867375123559641">"Mavzularga razm solish"</string>
     <string name="font_preview_content_description" msgid="128230439293337891">"Shriftga nazar solish"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Belgiga razm solish"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Ranglarga razm solish"</string>
@@ -116,7 +117,9 @@
     <string name="mode_title" msgid="2394873501427436055">"Tungi mavzu"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Quvvat tejash maqsadida vaqtinchalik faolsizlantirilgan"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Mavzuga oid ikonkalar"</string>
+    <string name="pack_theme_title" msgid="3052703041673623611">"Mavzular"</string>
     <string name="beta_title" msgid="8703819523760746458">"Beta"</string>
+    <string name="theme_packs_description" msgid="4647233199054882039">"Pixel mavzularini kashf eting"</string>
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Ilovalar jadvalini oʻzgartirish"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Fon ranglari"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Belgilar, matn va boshqalar rangi fon rasmiga moslanadi"</string>

diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index 83347ad..58faed4 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Giữ hình nền hiện tại"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Xem trước kiểu"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Xem trước lưới"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Xem trước phông chữ"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Xem trước biểu tượng"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Xem trước màu"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Giao diện tối"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Tạm thời tắt do tính năng của Trình tiết kiệm pin"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Biểu tượng theo chủ đề"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Thử nghiệm"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Thay đổi lưới ứng dụng"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Màu hình nền"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Biểu tượng, văn bản, v.v. phù hợp với màu trên hình nền"</string>

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index a1a88e8..f9d1866 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"保留当前壁纸"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"样式预览"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"网格预览"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"字体预览"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"图标预览"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"颜色预览"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"深色主题"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"因省电模式已开启，该功能被暂时停用了"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"图标匹配主题"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta 版"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"更改应用网格"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"壁纸颜色"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"为图标、文字等内容选择与壁纸相配的颜色"</string>

diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 5fde2ff..f1a323c 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"保留目前桌布"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"預覽樣式"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"預覽網格"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"字型預覽"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"圖示預覽"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"顏色預覽"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"深色主題背景"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"因「慳電模式」而暫時停用"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"主題圖示"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta 版本"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"變更應用程式網格"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"桌布顏色"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"為圖示、文字等選擇與桌布相配的顏色"</string>

diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index cf2c528..61a12e8 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"繼續使用目前的桌布"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"樣式預覽"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"網格預覽"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"字型預覽"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"圖示預覽"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"顏色預覽"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"深色主題"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"因省電模式而暫時停用"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"圖示套用主題色"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"Beta 版"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"變更應用程式排列顯示"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"桌布顏色"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"為圖示、文字和其他項目選擇與桌布相襯的顏色"</string>

diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 6f0a83b..965df93 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml

@@ -56,6 +56,8 @@
     <string name="keep_my_wallpaper" msgid="8012385376769568517">"Gcina isithombe sangemuva samanje"</string>
     <string name="theme_preview_card_content_description" msgid="5989222908619535533">"Ukubuka kuqala kwesitayela"</string>
     <string name="grid_preview_card_content_description" msgid="8449383777584714842">"Ukubuka kuqala kwe-grid"</string>
+    <!-- no translation found for pack_theme_preview_card_content_description (2964867375123559641) -->
+    <skip />
     <string name="font_preview_content_description" msgid="128230439293337891">"Ukubuka kuqala ifonti"</string>
     <string name="icon_preview_content_description" msgid="7761101284351952890">"Ukubuka kuqala isithonjana"</string>
     <string name="color_preview_content_description" msgid="4879120462082058124">"Ukubuka kuqala umbala"</string>
@@ -116,7 +118,12 @@
     <string name="mode_title" msgid="2394873501427436055">"Itimu emnyama"</string>
     <string name="mode_disabled_msg" msgid="9196245518435936512">"Kukhutshaziwe okwesikhashana ngenxa Yesilondolozi Sebhethri"</string>
     <string name="themed_icon_title" msgid="7312460430471956558">"Izithonjana ezinetimu"</string>
+    <!-- no translation found for pack_theme_title (3052703041673623611) -->
+    <!-- no translation found for pack_theme_title (4305612684940220645) -->
+    <skip />
     <string name="beta_title" msgid="8703819523760746458">"I-beta"</string>
+    <!-- no translation found for theme_packs_description (4647233199054882039) -->
+    <skip />
     <string name="gird_picker_entry_content_description" msgid="9087651470212293439">"Shintsha igridi ye-app"</string>
     <string name="wallpaper_color_tab" msgid="1447926591721403840">"Imibala yesithombe sangemuva"</string>
     <string name="wallpaper_color_subheader" msgid="4044464573669965670">"Izithonjana, umbhalo, neminye imibala efana nesithombe sakho sangemuva"</string>

diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d335636..531523b 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml

@@ -182,8 +182,6 @@
     <!-- Floating sheet dimensions -->
     <dimen name="floating_sheet_content_vertical_padding">20dp</dimen>
     <dimen name="floating_sheet_content_horizontal_padding">20dp</dimen>
-    <dimen name="floating_sheet_clock_style_content_top_padding">2dp</dimen>
-    <dimen name="floating_sheet_clock_style_content_bottom_padding">20dp</dimen>
     <dimen name="floating_sheet_horizontal_padding">16dp</dimen>
     <dimen name="floating_sheet_tab_toolbar_vertical_margin">8dp</dimen>
     <dimen name="floating_sheet_tab_clock_font_toolbar_top_margin">16dp</dimen>
@@ -191,14 +189,10 @@
     <dimen name="floating_sheet_list_item_horizontal_space">4dp</dimen>
     <dimen name="floating_sheet_grid_list_item_horizontal_space">10dp</dimen>
     <dimen name="floating_sheet_list_item_vertical_space">4dp</dimen>
-    <dimen name="floating_sheet_clock_style_option_list_margin_bottom">8dp</dimen>
-    <dimen name="floating_sheet_clock_style_option_width">80dp</dimen>
-    <dimen name="floating_sheet_clock_style_option_height">98dp</dimen>
-    <dimen name="floating_sheet_clock_style_option_background_size">80dp</dimen>
+    <dimen name="floating_sheet_clock_style_option_size">80dp</dimen>
     <dimen name="floating_sheet_clock_style_option_thumbnail_size">56dp</dimen>
     <dimen name="floating_sheet_clock_edit_icon_size">48dp</dimen>
     <dimen name="floating_sheet_clock_edit_icon_margin">-18dp</dimen>
-    <dimen name="floating_sheet_clock_style_thumbnail_margin_bottom">12dp</dimen>
     <dimen name="floating_sheet_clock_style_clock_size_text_margin_end">16dp</dimen>
     <dimen name="floating_sheet_color_option_size">54dp</dimen>
     <dimen name="floating_sheet_color_option_stroke_width">3dp</dimen>

diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt
index fa71fc2..feebf43 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepository.kt

@@ -52,7 +52,7 @@
 
     suspend fun setClockSize(size: ClockSize)
 
-    suspend fun setClockFontAxes(axisSettings: ClockAxisStyle)
+    suspend fun setClockAxisStyle(axisStyle: ClockAxisStyle)
 
     fun isReactiveToTone(clockId: ClockId): Boolean?
 }

diff --git a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
index 9342ab5..fd0cd11 100644
--- a/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt
+++ b/src/com/android/customization/picker/clock/data/repository/ClockPickerRepositoryImpl.kt

@@ -22,8 +22,8 @@
 import androidx.annotation.IntRange
 import com.android.customization.picker.clock.shared.ClockSize
 import com.android.customization.picker.clock.shared.model.ClockMetadataModel
+import com.android.systemui.plugins.clocks.AxisPresetConfig
 import com.android.systemui.plugins.clocks.ClockAxisStyle
-import com.android.systemui.plugins.clocks.ClockFontAxis
 import com.android.systemui.plugins.clocks.ClockId
 import com.android.systemui.plugins.clocks.ClockMetadata
 import com.android.systemui.shared.clocks.ClockRegistry
@@ -73,7 +73,7 @@
                                     description = clockConfig.description,
                                     thumbnail = clockConfig.thumbnail,
                                     isReactiveToTone = clockConfig.isReactiveToTone,
-                                    fontAxes = clockConfig.axes,
+                                    axisPresetConfig = clockConfig.presetConfig,
                                 )
                             } else {
                                 null
@@ -85,6 +85,10 @@
 
                 val listener =
                     object : ClockRegistry.ClockChangeListener {
+                        override fun onCurrentClockChanged() {
+                            send()
+                        }
+
                         override fun onAvailableClocksChanged() {
                             send()
                         }
@@ -119,7 +123,7 @@
                                     description = it.description,
                                     thumbnail = it.thumbnail,
                                     isReactiveToTone = it.isReactiveToTone,
-                                    fontAxes = it.axes,
+                                    axisPresetConfig = it.presetConfig,
                                     selectedColorId = metadata?.getSelectedColorId(),
                                     colorTone =
                                         metadata?.getColorTone()
@@ -191,9 +195,9 @@
         )
     }
 
-    override suspend fun setClockFontAxes(axisSettings: ClockAxisStyle) {
+    override suspend fun setClockAxisStyle(axisStyle: ClockAxisStyle) {
         registry.mutateSetting { oldSettings ->
-            val newSettings = oldSettings.copy(axes = axisSettings)
+            val newSettings = oldSettings.copy(axes = axisStyle)
             newSettings.metadata = oldSettings.metadata
             newSettings
         }
@@ -224,7 +228,7 @@
         description: String,
         thumbnail: Drawable,
         isReactiveToTone: Boolean,
-        fontAxes: List<ClockFontAxis>,
+        axisPresetConfig: AxisPresetConfig?,
         selectedColorId: String? = null,
         @IntRange(from = 0, to = 100) colorTone: Int = 0,
         @ColorInt seedColor: Int? = null,
@@ -235,7 +239,7 @@
             description = description,
             thumbnail = thumbnail,
             isReactiveToTone = isReactiveToTone,
-            fontAxes = fontAxes,
+            axisPresetConfig = axisPresetConfig,
             selectedColorId = selectedColorId,
             colorToneProgress = colorTone,
             seedColor = seedColor,

diff --git a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt
index acff6e8..b962652 100644
--- a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt
+++ b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractor.kt

@@ -61,9 +61,7 @@
     val seedColor: Flow<Int?> = repository.selectedClock.map { clock -> clock.seedColor }
 
     val axisSettings: Flow<ClockAxisStyle?> =
-        repository.selectedClock.map { clock ->
-            if (clock.fontAxes.isEmpty()) null else ClockAxisStyle(clock.fontAxes)
-        }
+        repository.selectedClock.map { it.axisPresetConfig?.current?.style }
 
     val selectedClockSize: Flow<ClockSize> = repository.selectedClockSize
 
@@ -136,7 +134,7 @@
             )
         }
         clockSnapshotModel.clockId?.let { repository.setSelectedClock(it) }
-        clockSnapshotModel.axisSettings?.let { repository.setClockFontAxes(it) }
+        clockSnapshotModel.axisSettings?.let { repository.setClockAxisStyle(it) }
     }
 
     private suspend fun storeCurrentClockOption(clockSnapshotModel: ClockSnapshotModel) {

diff --git a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerSnapshotRestorer.kt b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerSnapshotRestorer.kt
index 41e82eb..62e6d16 100644
--- a/src/com/android/customization/picker/clock/domain/interactor/ClockPickerSnapshotRestorer.kt
+++ b/src/com/android/customization/picker/clock/domain/interactor/ClockPickerSnapshotRestorer.kt

@@ -60,7 +60,7 @@
                 seedColor = repository.selectedClock.map { clock -> clock.seedColor }.firstOrNull(),
                 axisSettings =
                     repository.selectedClock
-                        .map { clock -> ClockAxisStyle(clock.fontAxes) }
+                        .map { clock -> clock.axisPresetConfig?.current?.style ?: ClockAxisStyle() }
                         .firstOrNull(),
             )
         return snapshot(originalOption)
@@ -97,7 +97,7 @@
                 )
             }
             optionToRestore.clockId?.let { repository.setSelectedClock(it) }
-            optionToRestore.axisSettings?.let { repository.setClockFontAxes(it) }
+            optionToRestore.axisSettings?.let { repository.setClockAxisStyle(it) }
         }
     }
 

diff --git a/src/com/android/customization/picker/clock/shared/model/ClockMetadataModel.kt b/src/com/android/customization/picker/clock/shared/model/ClockMetadataModel.kt
index 8414960..c2274a7 100644
--- a/src/com/android/customization/picker/clock/shared/model/ClockMetadataModel.kt
+++ b/src/com/android/customization/picker/clock/shared/model/ClockMetadataModel.kt

@@ -20,7 +20,7 @@
 import android.graphics.drawable.Drawable
 import androidx.annotation.ColorInt
 import androidx.annotation.IntRange
-import com.android.systemui.plugins.clocks.ClockFontAxis
+import com.android.systemui.plugins.clocks.AxisPresetConfig
 
 /** Model for clock metadata. */
 data class ClockMetadataModel(
@@ -29,7 +29,7 @@
     val description: String,
     val thumbnail: Drawable,
     val isReactiveToTone: Boolean,
-    val fontAxes: List<ClockFontAxis>,
+    val axisPresetConfig: AxisPresetConfig?, // Null indicates the preset list should be disabled.
     val selectedColorId: String?,
     @IntRange(from = 0, to = 100) val colorToneProgress: Int,
     @ColorInt val seedColor: Int?,

diff --git a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
index 764c671..3d1e32f 100644
--- a/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt
+++ b/src/com/android/customization/picker/clock/ui/binder/ClockSettingsBinder.kt

@@ -207,10 +207,14 @@
                                     ClockSize.DYNAMIC -> clockViewFactory.getLargeView(clockId)
                                     ClockSize.SMALL -> clockViewFactory.getSmallView(clockId)
                                 }
-                            // The clock view might still be attached to an existing parent.
-                            // Detach before adding to another parent.
-                            (clockView.parent as? ViewGroup)?.removeView(clockView)
-                            clockHostView.addView(clockView)
+
+                            // Wait for previous removeAllViews to finish, and add the clockView
+                            clockHostView.post {
+                                // The clock view might still be attached to an existing parent.
+                                // Detach before adding to another parent.
+                                (clockView.parent as? ViewGroup)?.removeView(clockView)
+                                clockHostView.addView(clockView)
+                            }
 
                             when (size) {
                                 ClockSize.DYNAMIC -> {

diff --git a/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt b/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
index eb02974..a0aa38b 100644
--- a/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt
+++ b/src/com/android/customization/picker/clock/ui/view/ThemePickerClockViewFactory.kt

@@ -137,7 +137,10 @@
     }
 
     override fun updateFontAxes(clockId: String, settings: ClockAxisStyle) {
-        getController(clockId)?.let { it.events.onFontAxesChanged(settings) }
+        getController(clockId)?.let {
+            it.largeClock.animations.onFontAxesChanged(settings)
+            it.smallClock.animations.onFontAxesChanged(settings)
+        }
     }
 
     override fun updateRegionDarkness() {

diff --git a/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
index 09a55e9..275b25a 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ClockFloatingSheetBinder.kt

@@ -25,7 +25,6 @@
 import android.view.View
 import android.view.ViewGroup
 import android.view.ViewTreeObserver.OnGlobalLayoutListener
-import android.widget.FrameLayout
 import android.widget.ImageView
 import android.widget.TextView
 import androidx.core.graphics.drawable.DrawableCompat
@@ -42,13 +41,9 @@
 import com.android.customization.picker.color.ui.view.ColorOptionIconView2
 import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel
 import com.android.customization.picker.common.ui.view.SingleRowListItemSpacing
-import com.android.systemui.plugins.clocks.AxisType
 import com.android.themepicker.R
 import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption.CLOCK
-import com.android.wallpaper.customization.ui.view.ClockFontSliderViewHolder
-import com.android.wallpaper.customization.ui.view.ClockFontSwitchViewHolder
 import com.android.wallpaper.customization.ui.viewmodel.ClockFloatingSheetHeightsViewModel
-import com.android.wallpaper.customization.ui.viewmodel.ClockPickerViewModel
 import com.android.wallpaper.customization.ui.viewmodel.ClockPickerViewModel.ClockStyleModel
 import com.android.wallpaper.customization.ui.viewmodel.ClockPickerViewModel.Tab
 import com.android.wallpaper.customization.ui.viewmodel.ThemePickerCustomizationOptionsViewModel
@@ -60,6 +55,7 @@
 import com.google.android.material.materialswitch.MaterialSwitch
 import com.google.android.material.slider.LabelFormatter
 import com.google.android.material.slider.Slider
+import com.google.android.material.slider.Slider.OnSliderTouchListener
 import java.lang.ref.WeakReference
 import kotlin.math.roundToInt
 import kotlinx.coroutines.DisposableHandle
@@ -90,7 +86,7 @@
         val appContext = view.context.applicationContext
         val isFloatingSheetActive = { optionsViewModel.selectedOption.value == CLOCK }
 
-        val tabs = view.requireViewById<FloatingToolbar>(R.id.floating_toolbar)
+        val tabs: FloatingToolbar = view.requireViewById(R.id.floating_toolbar)
         val tabContainer =
             tabs.findViewById<ViewGroup>(com.android.wallpaper.R.id.floating_toolbar_tab_container)
         ColorUpdateBinder.bind(
@@ -108,8 +104,8 @@
                 )
                 .also { tabs.setAdapter(it) }
 
-        val floatingSheetContainer =
-            view.requireViewById<ViewGroup>(R.id.floating_sheet_content_container)
+        val floatingSheetContainer: ViewGroup =
+            view.requireViewById(R.id.floating_sheet_content_container)
         ColorUpdateBinder.bind(
             setColor = { color ->
                 DrawableCompat.setTint(
@@ -123,9 +119,7 @@
         )
 
         // Clock style
-        val clockStyleContent = view.requireViewById<View>(R.id.clock_floating_sheet_style_content)
-        val clockSizeSwitch =
-            clockStyleContent.requireViewById<MaterialSwitch>(R.id.clock_style_clock_size_switch)
+        val clockStyleContent: View = view.requireViewById(R.id.clock_floating_sheet_style_content)
         val isClockStyleActive = {
             isFloatingSheetActive() && viewModel.selectedTab.value == Tab.STYLE
         }
@@ -135,66 +129,14 @@
                 shouldAnimateColor = isClockStyleActive,
                 lifecycleOwner = lifecycleOwner,
             )
-        val clockStyleList =
-            view.requireViewById<RecyclerView>(R.id.clock_style_list).apply {
-                initStyleList(appContext, clockStyleAdapter)
-            }
-        ColorUpdateBinder.bind(
-            setColor = { color ->
-                clockStyleContent
-                    .requireViewById<TextView>(R.id.clock_style_clock_size_title)
-                    .setTextColor(color)
-            },
-            color = colorUpdateViewModel.colorOnSurface,
-            shouldAnimate = isClockStyleActive,
-            lifecycleOwner = lifecycleOwner,
-        )
-        ColorUpdateBinder.bind(
-            setColor = { color ->
-                clockStyleContent
-                    .requireViewById<TextView>(R.id.clock_style_clock_size_description)
-                    .setTextColor(color)
-            },
-            color = colorUpdateViewModel.colorOnSurfaceVariant,
-            shouldAnimate = isClockStyleActive,
-            lifecycleOwner = lifecycleOwner,
-        )
-
-        // Clock font editor
-        val clockFontContent =
-            view.requireViewById<ViewGroup>(R.id.clock_floating_sheet_font_content)
-        val clockFontToolbar = view.requireViewById<ViewGroup>(R.id.clock_font_toolbar)
-        clockFontToolbar.requireViewById<View>(R.id.clock_font_revert).setOnClickListener {
-            viewModel.cancelFontAxes()
-        }
-        clockFontToolbar.requireViewById<View>(R.id.clock_font_apply).setOnClickListener {
-            viewModel.confirmFontAxes()
-        }
-        val isClockFontActive = {
-            isFloatingSheetActive() && viewModel.selectedTab.value == Tab.FONT
-        }
-        ColorUpdateBinder.bind(
-            setColor = { color ->
-                clockFontContent
-                    .requireViewById<TextView>(R.id.clock_axis_slider_name1)
-                    .setTextColor(color)
-                clockFontContent
-                    .requireViewById<TextView>(R.id.clock_axis_slider_name2)
-                    .setTextColor(color)
-                clockFontContent
-                    .requireViewById<TextView>(R.id.clock_axis_switch_name1)
-                    .setTextColor(color)
-                clockFontContent
-                    .requireViewById<TextView>(R.id.clock_axis_switch_name2)
-                    .setTextColor(color)
-            },
-            color = colorUpdateViewModel.colorOnSurface,
-            shouldAnimate = isClockFontActive,
-            lifecycleOwner = lifecycleOwner,
-        )
+        val clockStyleList: RecyclerView = view.requireViewById(R.id.clock_style_list)
+        clockStyleList.initStyleList(appContext, clockStyleAdapter)
+        val axisPresetSlider: Slider =
+            clockStyleContent.requireViewById(R.id.clock_axis_preset_slider)
 
         // Clock color
-        val clockColorContent = view.requireViewById<View>(R.id.clock_floating_sheet_color_content)
+        val clockColorContent: View = view.requireViewById(R.id.clock_floating_sheet_color_content)
+
         val clockColorAdapter =
             createClockColorOptionItemAdapter(
                 uiMode = view.resources.configuration.uiMode,
@@ -202,21 +144,19 @@
                 shouldAnimateColor = isFloatingSheetActive,
                 lifecycleOwner = lifecycleOwner,
             )
-        val clockColorList =
-            view.requireViewById<RecyclerView>(R.id.clock_color_list).apply {
-                adapter = clockColorAdapter
-                layoutManager =
-                    LinearLayoutManager(appContext, LinearLayoutManager.HORIZONTAL, false)
-            }
-        val clockColorSlider: Slider =
-            view.requireViewById<Slider>(R.id.clock_color_slider).also {
-                SliderColorBinder.bind(
-                    slider = it,
-                    colorUpdateViewModel = colorUpdateViewModel,
-                    shouldAnimateColor = isFloatingSheetActive,
-                    lifecycleOwner = lifecycleOwner,
-                )
-            }
+        val clockColorList: RecyclerView = view.requireViewById(R.id.clock_color_list)
+        clockColorList.adapter = clockColorAdapter
+        clockColorList.layoutManager =
+            LinearLayoutManager(appContext, LinearLayoutManager.HORIZONTAL, false)
+
+        val clockColorSlider: Slider = view.requireViewById(R.id.clock_color_slider)
+        SliderColorBinder.bind(
+            slider = clockColorSlider,
+            colorUpdateViewModel = colorUpdateViewModel,
+            shouldAnimateColor = isFloatingSheetActive,
+            lifecycleOwner = lifecycleOwner,
+        )
+
         clockColorSlider.apply {
             valueFrom = ClockMetadataModel.MIN_COLOR_TONE_PROGRESS.toFloat()
             valueTo = ClockMetadataModel.MAX_COLOR_TONE_PROGRESS.toFloat()
@@ -251,16 +191,44 @@
             lifecycleOwner = lifecycleOwner,
         )
 
+        // Clock size
+        val clockSizeContent: View = view.requireViewById(R.id.clock_floating_sheet_size_content)
+        val clockSizeSwitch: MaterialSwitch =
+            clockSizeContent.requireViewById(R.id.clock_style_clock_size_switch)
+        ColorUpdateBinder.bind(
+            setColor = { color ->
+                clockSizeContent
+                    .requireViewById<TextView>(R.id.clock_style_clock_size_title)
+                    .setTextColor(color)
+            },
+            color = colorUpdateViewModel.colorOnSurface,
+            shouldAnimate = isClockStyleActive,
+            lifecycleOwner = lifecycleOwner,
+        )
+        ColorUpdateBinder.bind(
+            setColor = { color ->
+                clockSizeContent
+                    .requireViewById<TextView>(R.id.clock_style_clock_size_description)
+                    .setTextColor(color)
+            },
+            color = colorUpdateViewModel.colorOnSurfaceVariant,
+            shouldAnimate = isClockStyleActive,
+            lifecycleOwner = lifecycleOwner,
+        )
+
         clockStyleContent.viewTreeObserver.addOnGlobalLayoutListener(
             object : OnGlobalLayoutListener {
                 override fun onGlobalLayout() {
                     if (
                         clockStyleContent.height != 0 &&
+                            axisPresetSlider.height != 0 &&
+                            _clockFloatingSheetHeights.value.axisPresetSliderHeight == null &&
                             _clockFloatingSheetHeights.value.clockStyleContentHeight == null
                     ) {
                         _clockFloatingSheetHeights.value =
                             _clockFloatingSheetHeights.value.copy(
-                                clockStyleContentHeight = clockStyleContent.height
+                                clockStyleContentHeight = clockStyleContent.height,
+                                axisPresetSliderHeight = axisPresetSlider.height,
                             )
                         clockStyleContent.viewTreeObserver.removeOnGlobalLayoutListener(this)
                     }
@@ -285,82 +253,100 @@
             }
         )
 
-        clockFontContent.viewTreeObserver.addOnGlobalLayoutListener(
+        clockSizeContent.viewTreeObserver.addOnGlobalLayoutListener(
             object : OnGlobalLayoutListener {
                 override fun onGlobalLayout() {
                     if (
-                        clockFontContent.height != 0 &&
-                            _clockFloatingSheetHeights.value.clockFontContentHeight == null
+                        clockSizeContent.height != 0 &&
+                            _clockFloatingSheetHeights.value.clockSizeContentHeight == null
                     ) {
                         _clockFloatingSheetHeights.value =
                             _clockFloatingSheetHeights.value.copy(
-                                clockFontContentHeight = clockFontContent.height
+                                clockSizeContentHeight = clockSizeContent.height
                             )
-                        clockColorContent.viewTreeObserver.removeOnGlobalLayoutListener(this)
+                        clockSizeContent.viewTreeObserver.removeOnGlobalLayoutListener(this)
                     }
                 }
             }
         )
 
         lifecycleOwner.lifecycleScope.launch {
-            var currentContent: View = clockStyleContent
+            var currentTab: Tab = Tab.STYLE
             lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 launch { viewModel.tabs.collect { tabAdapter.submitList(it) } }
 
                 launch {
-                    combine(clockFloatingSheetHeights, viewModel.selectedTab, ::Pair).collect {
-                        (heights, selectedTab) ->
-                        val (
-                            clockStyleContentHeight,
-                            clockColorContentHeight,
-                            clockFontContentHeight) =
-                            heights
-                        clockStyleContentHeight ?: return@collect
-                        clockColorContentHeight ?: return@collect
-                        clockFontContentHeight ?: return@collect
+                    combine(
+                            clockFloatingSheetHeights,
+                            viewModel.selectedTab,
+                            viewModel.shouldShowPresetSlider,
+                            ::Triple,
+                        )
+                        .collect { (heights, selectedTab, shouldShowPresetSlider) ->
+                            val (
+                                clockStyleContentHeight,
+                                clockColorContentHeight,
+                                clockSizeContentHeight,
+                                axisPresetSliderHeight) =
+                                heights
+                            clockStyleContentHeight ?: return@collect
+                            clockColorContentHeight ?: return@collect
+                            clockSizeContentHeight ?: return@collect
+                            axisPresetSliderHeight ?: return@collect
 
-                        val fromHeight = floatingSheetContainer.height
-                        val toHeight =
-                            when (selectedTab) {
-                                Tab.STYLE -> clockStyleContentHeight
-                                Tab.COLOR -> clockColorContentHeight
-                                Tab.FONT -> clockFontContentHeight
-                            }
-                        // Start to animate the content height
-                        ValueAnimator.ofInt(fromHeight, toHeight)
-                            .apply {
-                                addUpdateListener { valueAnimator ->
-                                    val value = valueAnimator.animatedValue as Int
-                                    floatingSheetContainer.layoutParams =
-                                        floatingSheetContainer.layoutParams.apply { height = value }
-                                    currentContent.alpha = getAlpha(fromHeight, toHeight, value)
+                            val fromHeight = floatingSheetContainer.height
+                            val toHeight =
+                                when (selectedTab) {
+                                    Tab.STYLE ->
+                                        if (shouldShowPresetSlider) clockStyleContentHeight
+                                        else clockStyleContentHeight - axisPresetSliderHeight
+                                    Tab.COLOR -> clockColorContentHeight
+                                    Tab.SIZE -> clockSizeContentHeight
                                 }
-                                duration = ANIMATION_DURATION
-                                addListener(
-                                    object : AnimatorListenerAdapter() {
-                                        override fun onAnimationEnd(animation: Animator) {
-                                            clockStyleContent.isVisible = selectedTab == Tab.STYLE
-                                            clockStyleContent.alpha = 1f
-                                            clockColorContent.isVisible = selectedTab == Tab.COLOR
-                                            clockColorContent.alpha = 1f
-                                            clockFontContent.isVisible = selectedTab == Tab.FONT
-                                            clockFontContent.alpha = 1f
-                                            currentContent =
-                                                when (selectedTab) {
-                                                    Tab.STYLE -> clockStyleContent
-                                                    Tab.COLOR -> clockColorContent
-                                                    Tab.FONT -> clockFontContent
-                                                }
-                                            // Also update the floating toolbar when the height
-                                            // animation ends.
-                                            tabs.isVisible = selectedTab != Tab.FONT
-                                            clockFontToolbar.isVisible = selectedTab == Tab.FONT
+                            val currentContent: View =
+                                when (currentTab) {
+                                    Tab.STYLE -> clockStyleContent
+                                    Tab.COLOR -> clockColorContent
+                                    Tab.SIZE -> clockSizeContent
+                                }
+                            val shouldCurrentContentFadeOut = currentTab != selectedTab
+                            // Start to animate the content height
+                            ValueAnimator.ofInt(fromHeight, toHeight)
+                                .apply {
+                                    addUpdateListener { valueAnimator ->
+                                        val value = valueAnimator.animatedValue as Int
+                                        floatingSheetContainer.layoutParams =
+                                            floatingSheetContainer.layoutParams.apply {
+                                                height = value
+                                            }
+                                        if (shouldCurrentContentFadeOut) {
+                                            currentContent.alpha =
+                                                getAlpha(fromHeight, toHeight, value)
                                         }
                                     }
-                                )
-                            }
-                            .start()
-                    }
+                                    duration = ANIMATION_DURATION
+                                    addListener(
+                                        object : AnimatorListenerAdapter() {
+                                            override fun onAnimationEnd(animation: Animator) {
+                                                clockStyleContent.isVisible =
+                                                    selectedTab == Tab.STYLE
+                                                clockStyleContent.alpha = 1f
+                                                clockColorContent.isVisible =
+                                                    selectedTab == Tab.COLOR
+                                                clockColorContent.alpha = 1f
+                                                clockSizeContent.isVisible = selectedTab == Tab.SIZE
+                                                clockSizeContent.alpha = 1f
+                                            }
+                                        }
+                                    )
+                                }
+                                .start()
+                            currentTab = selectedTab
+                        }
+                }
+
+                launch {
+                    viewModel.shouldShowPresetSlider.collect { axisPresetSlider.isVisible = it }
                 }
 
                 launch {
@@ -429,120 +415,30 @@
                         }
                     }
                 }
-            }
-        }
 
-        bindClockFontContent(
-            clockFontContent = clockFontContent,
-            viewModel = viewModel,
-            colorUpdateViewModel = colorUpdateViewModel,
-            shouldAnimateColor = isClockFontActive,
-            lifecycleOwner = lifecycleOwner,
-        )
-    }
-
-    private fun bindClockFontContent(
-        clockFontContent: View,
-        viewModel: ClockPickerViewModel,
-        colorUpdateViewModel: ColorUpdateViewModel,
-        shouldAnimateColor: () -> Boolean,
-        lifecycleOwner: LifecycleOwner,
-    ) {
-        val slider1 =
-            clockFontContent.requireViewById<Slider>(R.id.clock_axis_slider1).also {
-                SliderColorBinder.bind(
-                    slider = it,
-                    colorUpdateViewModel = colorUpdateViewModel,
-                    shouldAnimateColor = shouldAnimateColor,
-                    lifecycleOwner = lifecycleOwner,
-                )
-            }
-        val slider2 =
-            clockFontContent.requireViewById<Slider>(R.id.clock_axis_slider2).also {
-                SliderColorBinder.bind(
-                    slider = it,
-                    colorUpdateViewModel = colorUpdateViewModel,
-                    shouldAnimateColor = shouldAnimateColor,
-                    lifecycleOwner = lifecycleOwner,
-                )
-            }
-        val sliderViewList =
-            listOf(
-                ClockFontSliderViewHolder(
-                    name = clockFontContent.requireViewById(R.id.clock_axis_slider_name1),
-                    slider = slider1,
-                ),
-                ClockFontSliderViewHolder(
-                    name = clockFontContent.requireViewById(R.id.clock_axis_slider_name2),
-                    slider = slider2,
-                ),
-            )
-        val switchViewList =
-            listOf(
-                ClockFontSwitchViewHolder(
-                    name = clockFontContent.requireViewById(R.id.clock_axis_switch_name1),
-                    switch = clockFontContent.requireViewById(R.id.clock_axis_switch1),
-                ),
-                ClockFontSwitchViewHolder(
-                    name = clockFontContent.requireViewById(R.id.clock_axis_switch_name2),
-                    switch = clockFontContent.requireViewById(R.id.clock_axis_switch2),
-                ),
-            )
-        val sliderViewMap: MutableMap<String, ClockFontSliderViewHolder> = mutableMapOf()
-        val switchViewMap: MutableMap<String, ClockFontSwitchViewHolder> = mutableMapOf()
-
-        lifecycleOwner.lifecycleScope.launch {
-            lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 launch {
-                    viewModel.previewingClockFontAxes.filterNotNull().collect { fontAxes ->
-                        // This data flow updates only when a new clock style is selected. We
-                        // initiate the clock font content with regard to that clock style.
-                        sliderViewMap.clear()
-                        switchViewMap.clear()
+                    viewModel.axisPresetsSliderViewModel.collect {
+                        val axisPresetsSliderViewModel = it ?: return@collect
+                        axisPresetSlider.valueFrom = axisPresetsSliderViewModel.valueFrom
+                        axisPresetSlider.valueTo = axisPresetsSliderViewModel.valueTo
+                        axisPresetSlider.stepSize = axisPresetsSliderViewModel.stepSize
+                        axisPresetSlider.clearOnSliderTouchListeners()
+                        axisPresetSlider.addOnSliderTouchListener(
+                            object : OnSliderTouchListener {
+                                override fun onStartTrackingTouch(slider: Slider) {}
 
-                        // Initiate the slider views
-                        val floatAxisList = fontAxes.filter { it.type == AxisType.Float }
-                        sliderViewList.forEachIndexed { i, viewHolder ->
-                            val floatAxis = floatAxisList.getOrNull(i)
-                            viewHolder.setIsVisible(floatAxis != null)
-                            floatAxis?.let {
-                                sliderViewMap[floatAxis.key] = viewHolder
-                                viewHolder.initView(it) { value ->
-                                    viewModel.updatePreviewFontAxis(floatAxis.key, value)
+                                override fun onStopTrackingTouch(slider: Slider) {
+                                    axisPresetsSliderViewModel.onSliderStopTrackingTouch(
+                                        slider.value
+                                    )
                                 }
                             }
-                        }
-
-                        // Initiate the switch views
-                        val booleanAxisList = fontAxes.filter { it.type == AxisType.Boolean }
-                        switchViewList.forEachIndexed { i, viewHolder ->
-                            val booleanAxis = booleanAxisList.getOrNull(i)
-                            viewHolder.setIsVisible(booleanAxis != null)
-                            booleanAxis?.let {
-                                switchViewMap[it.key] = viewHolder
-                                viewHolder.initView(
-                                    clockFontAxis = booleanAxis,
-                                    onFontAxisValueUpdated = { value ->
-                                        viewModel.updatePreviewFontAxis(booleanAxis.key, value)
-                                    },
-                                    colorUpdateViewModel = colorUpdateViewModel,
-                                    shouldAnimateColor = shouldAnimateColor,
-                                    lifecycleOwner = lifecycleOwner,
-                                )
-                            }
-                        }
+                        )
                     }
                 }
 
                 launch {
-                    viewModel.previewingClockFontAxisMap.collect { axisMap ->
-                        // This data flow updates when user configures the sliders and switches
-                        // in the clock font content.
-                        axisMap.forEach { (key, value) ->
-                            sliderViewMap[key]?.setValue(value)
-                            switchViewMap[key]?.setValue(value)
-                        }
-                    }
+                    viewModel.axisPresetsSliderSelectedValue.collect { axisPresetSlider.value = it }
                 }
             }
         }
@@ -560,29 +456,7 @@
                 view
                     .findViewById<ImageView>(R.id.foreground)
                     ?.setImageDrawable(styleModel.thumbnail)
-                val job =
-                    lifecycleOwner.lifecycleScope.launch {
-                        lifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
-                            styleModel.showEditButton.collect {
-                                view.findViewById<FrameLayout>(R.id.edit_icon)?.isVisible = it
-                            }
-                        }
-                    }
-                val binding =
-                    ColorUpdateBinder.bind(
-                        setColor = { color ->
-                            view.findViewById<ImageView>(R.id.edit_icon_background)?.drawable?.let {
-                                DrawableCompat.setTint(DrawableCompat.wrap(it), color)
-                            }
-                        },
-                        color = colorUpdateViewModel.colorOnPrimaryFixedVariant,
-                        shouldAnimate = shouldAnimateColor,
-                        lifecycleOwner = lifecycleOwner,
-                    )
-                return@OptionItemAdapter2 DisposableHandle {
-                    job.cancel()
-                    binding.destroy()
-                }
+                return@OptionItemAdapter2 null
             },
             colorUpdateViewModel = WeakReference(colorUpdateViewModel),
             shouldAnimateColor = shouldAnimateColor,
@@ -616,10 +490,8 @@
             layoutResourceId = R.layout.color_option2,
             lifecycleOwner = lifecycleOwner,
             bindPayload = { itemView: View, colorIcon: ColorOptionIconViewModel ->
-                val colorOptionIconView =
-                    itemView.requireViewById<ColorOptionIconView2>(
-                        com.android.wallpaper.R.id.background
-                    )
+                val colorOptionIconView: ColorOptionIconView2 =
+                    itemView.requireViewById(com.android.wallpaper.R.id.background)
                 val night = uiMode and UI_MODE_NIGHT_MASK == UI_MODE_NIGHT_YES
                 val binding =
                     ColorOptionIconBinder2.bind(

diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
index 5736e0e..09bb692 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt

@@ -81,6 +81,7 @@
         navigateToMoreLockScreenSettingsActivity: () -> Unit,
         navigateToColorContrastSettingsActivity: () -> Unit,
         navigateToLockScreenNotificationsSettingsActivity: () -> Unit,
+        navigateToPackThemeActivity: () -> Unit,
     ) {
         defaultCustomizationOptionsBinder.bind(
             view,
@@ -93,6 +94,7 @@
             navigateToMoreLockScreenSettingsActivity,
             navigateToColorContrastSettingsActivity,
             navigateToLockScreenNotificationsSettingsActivity,
+            navigateToPackThemeActivity,
         )
 
         val isComposeRefactorEnabled = BaseFlags.get().isComposeRefactorEnabled()
@@ -179,15 +181,18 @@
         var optionPackThemeIconLock: ImageView? = null
 
         if (BaseFlags.get().isPackThemeEnabled()) {
-            val optionPackThemeHome: View =
+            val optionPackThemeHome =
                 homeScreenCustomizationOptionEntries
                     .first { it.first == ThemePickerHomeCustomizationOption.PACK_THEME }
                     .second
+            optionPackThemeHome.setOnClickListener { navigateToPackThemeActivity.invoke() }
             optionPackThemeIconHome = optionPackThemeHome.requireViewById(R.id.option_entry_icon)
-            val optionPackThemeLock: View =
-                homeScreenCustomizationOptionEntries
+
+            val optionPackThemeLock =
+                lockScreenCustomizationOptionEntries
                     .first { it.first == ThemePickerHomeCustomizationOption.PACK_THEME }
                     .second
+            optionPackThemeLock.setOnClickListener { navigateToPackThemeActivity.invoke() }
             optionPackThemeIconLock = optionPackThemeLock.requireViewById(R.id.option_entry_icon)
         }
 
@@ -416,6 +421,7 @@
     override fun bindClockPreview(
         context: Context,
         clockHostView: View,
+        clockFaceClickDelegateView: View,
         viewModel: CustomizationPickerViewModel2,
         colorUpdateViewModel: ColorUpdateViewModel,
         lifecycleOwner: LifecycleOwner,
@@ -486,20 +492,38 @@
                     combine(
                             clockPickerViewModel.previewingSeedColor,
                             clockPickerViewModel.previewingClock,
-                            clockPickerViewModel.previewingClockFontAxisMap,
+                            clockPickerViewModel.previewingClockPresetIndexedStyle,
                             colorUpdateViewModel.systemColorsUpdated,
                             ::Quadruple,
                         )
                         .collect { quadruple ->
-                            val (color, clock, axisMap, _) = quadruple
+                            val (color, clock, clockPresetIndexedStyle, _) = quadruple
                             clockViewFactory.updateColor(clock.clockId, color)
-                            clockViewFactory.updateFontAxes(clock.clockId, ClockAxisStyle(axisMap))
+                            clockViewFactory.updateFontAxes(
+                                clock.clockId,
+                                clockPresetIndexedStyle?.style ?: ClockAxisStyle(),
+                            )
                         }
                 }
 
                 launch {
                     viewModel.lockPreviewAnimateToAlpha.collect { clockHostView.animateToAlpha(it) }
                 }
+
+                launch {
+                    combine(
+                            viewModel.customizationOptionsViewModel.selectedOption,
+                            clockPickerViewModel.onClockFaceClicked,
+                            ::Pair,
+                        )
+                        .collect { (selectedOption, onClockFaceClicked) ->
+                            clockFaceClickDelegateView.isVisible =
+                                selectedOption == ThemePickerLockCustomizationOption.CLOCK
+                            clockFaceClickDelegateView.setOnClickListener {
+                                onClockFaceClicked.invoke()
+                            }
+                        }
+                }
             }
         }
     }

diff --git a/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt b/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt
index cb4ab57..f818ff8 100644
--- a/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt
+++ b/src/com/android/wallpaper/customization/ui/binder/ThemePickerToolbarBinder.kt

@@ -16,8 +16,6 @@
 
 package com.android.wallpaper.customization.ui.binder
 
-import android.animation.ValueAnimator
-import android.view.ViewTreeObserver.OnGlobalLayoutListener
 import android.widget.Button
 import android.widget.FrameLayout
 import android.widget.Toolbar
@@ -35,7 +33,6 @@
 import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption.CLOCK
 import com.android.wallpaper.customization.ui.util.ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption.SHORTCUTS
 import com.android.wallpaper.customization.ui.viewmodel.ThemePickerCustomizationOptionsViewModel
-import com.android.wallpaper.customization.ui.viewmodel.ToolbarHeightsViewModel
 import com.android.wallpaper.picker.customization.ui.binder.ColorUpdateBinder
 import com.android.wallpaper.picker.customization.ui.binder.DefaultToolbarBinder
 import com.android.wallpaper.picker.customization.ui.binder.ToolbarBinder
@@ -43,7 +40,6 @@
 import com.android.wallpaper.picker.customization.ui.viewmodel.CustomizationOptionsViewModel
 import javax.inject.Inject
 import javax.inject.Singleton
-import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.launch
 
@@ -61,8 +57,6 @@
         lifecycleOwner: LifecycleOwner,
         onNavBack: () -> Unit,
     ) {
-        val toolbarHeights: MutableStateFlow<ToolbarHeightsViewModel?> = MutableStateFlow(null)
-
         defaultToolbarBinder.bind(
             navButton,
             toolbar,
@@ -79,45 +73,6 @@
             )
         }
 
-        navButton.viewTreeObserver.addOnGlobalLayoutListener(
-            object : OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    if (navButton.height != 0) {
-                        toolbarHeights.value =
-                            toolbarHeights.value?.copy(navButtonHeight = navButton.height)
-                                ?: ToolbarHeightsViewModel(navButtonHeight = navButton.height)
-                    }
-                    navButton.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                }
-            }
-        )
-
-        toolbar.viewTreeObserver.addOnGlobalLayoutListener(
-            object : OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    if (toolbar.height != 0) {
-                        toolbarHeights.value =
-                            toolbarHeights.value?.copy(toolbarHeight = toolbar.height)
-                                ?: ToolbarHeightsViewModel(toolbarHeight = toolbar.height)
-                    }
-                    navButton.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                }
-            }
-        )
-
-        applyButton.viewTreeObserver.addOnGlobalLayoutListener(
-            object : OnGlobalLayoutListener {
-                override fun onGlobalLayout() {
-                    if (applyButton.height != 0) {
-                        toolbarHeights.value =
-                            toolbarHeights.value?.copy(applyButtonHeight = applyButton.height)
-                                ?: ToolbarHeightsViewModel(applyButtonHeight = applyButton.height)
-                    }
-                    applyButton.viewTreeObserver.removeOnGlobalLayoutListener(this)
-                }
-            }
-        )
-
         ColorUpdateBinder.bind(
             setColor = { color ->
                 DrawableCompat.setTint(DrawableCompat.wrap(applyButton.background), color)
@@ -177,53 +132,6 @@
                         toolbar.title = toolbar.resources.getString(stringResId)
                     }
                 }
-
-                launch {
-                    combine(toolbarHeights, viewModel.isToolbarCollapsed, ::Pair).collect {
-                        (toolbarHeights, isToolbarCollapsed) ->
-                        val (navButtonHeight, toolbarHeight, applyButtonHeight) =
-                            toolbarHeights ?: return@collect
-                        navButtonHeight ?: return@collect
-                        toolbarHeight ?: return@collect
-                        applyButtonHeight ?: return@collect
-
-                        val navButtonToHeight = if (isToolbarCollapsed) 0 else navButtonHeight
-                        val toolbarToHeight = if (isToolbarCollapsed) 0 else toolbarHeight
-                        val applyButtonToHeight = if (isToolbarCollapsed) 0 else applyButtonHeight
-                        ValueAnimator.ofInt(navButton.height, navButtonToHeight)
-                            .apply {
-                                addUpdateListener { valueAnimator ->
-                                    val value = valueAnimator.animatedValue as Int
-                                    navButton.layoutParams =
-                                        navButton.layoutParams.apply { height = value }
-                                }
-                                duration = ANIMATION_DURATION
-                            }
-                            .start()
-
-                        ValueAnimator.ofInt(toolbar.height, toolbarToHeight)
-                            .apply {
-                                addUpdateListener { valueAnimator ->
-                                    val value = valueAnimator.animatedValue as Int
-                                    toolbar.layoutParams =
-                                        toolbar.layoutParams.apply { height = value }
-                                }
-                                duration = ANIMATION_DURATION
-                            }
-                            .start()
-
-                        ValueAnimator.ofInt(applyButton.height, applyButtonToHeight)
-                            .apply {
-                                addUpdateListener { valueAnimator ->
-                                    val value = valueAnimator.animatedValue as Int
-                                    applyButton.layoutParams =
-                                        applyButton.layoutParams.apply { height = value }
-                                }
-                                duration = ANIMATION_DURATION
-                            }
-                            .start()
-                    }
-                }
             }
         }
     }

diff --git a/src/com/android/wallpaper/customization/ui/view/ClockFontSliderViewHolder.kt b/src/com/android/wallpaper/customization/ui/view/ClockFontSliderViewHolder.kt
deleted file mode 100644
index fb14342..0000000
--- a/src/com/android/wallpaper/customization/ui/view/ClockFontSliderViewHolder.kt
+++ /dev/null

@@ -1,50 +0,0 @@
-/*
- * Copyright (C) 2024 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.
- */
-
-package com.android.wallpaper.customization.ui.view
-
-import android.widget.TextView
-import androidx.core.view.isInvisible
-import com.android.systemui.plugins.clocks.ClockFontAxis
-import com.google.android.material.slider.LabelFormatter
-import com.google.android.material.slider.Slider
-
-class ClockFontSliderViewHolder(val name: TextView, val slider: Slider) {
-
-    fun setIsVisible(isVisible: Boolean) {
-        name.isInvisible = !isVisible
-        slider.isInvisible = !isVisible
-    }
-
-    fun initView(clockFontAxis: ClockFontAxis, onFontAxisValueUpdated: (value: Float) -> Unit) {
-        name.text = clockFontAxis.name
-        slider.apply {
-            valueFrom = clockFontAxis.minValue
-            valueTo = clockFontAxis.maxValue
-            value = clockFontAxis.currentValue
-            labelBehavior = LabelFormatter.LABEL_GONE
-            addOnChangeListener { _, value, fromUser ->
-                if (fromUser) {
-                    onFontAxisValueUpdated.invoke(value)
-                }
-            }
-        }
-    }
-
-    fun setValue(value: Float) {
-        slider.value = value
-    }
-}

diff --git a/src/com/android/wallpaper/customization/ui/view/ClockFontSwitchViewHolder.kt b/src/com/android/wallpaper/customization/ui/view/ClockFontSwitchViewHolder.kt
deleted file mode 100644
index fcf70d3..0000000
--- a/src/com/android/wallpaper/customization/ui/view/ClockFontSwitchViewHolder.kt
+++ /dev/null

@@ -1,75 +0,0 @@
-/*
- * Copyright (C) 2024 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.
- */
-
-package com.android.wallpaper.customization.ui.view
-
-import android.widget.TextView
-import androidx.core.view.isVisible
-import androidx.lifecycle.LifecycleOwner
-import com.android.systemui.plugins.clocks.ClockFontAxis
-import com.android.wallpaper.customization.ui.binder.SwitchColorBinder
-import com.android.wallpaper.picker.customization.ui.viewmodel.ColorUpdateViewModel
-import com.google.android.material.materialswitch.MaterialSwitch
-import kotlin.math.abs
-
-class ClockFontSwitchViewHolder(val name: TextView, val switch: MaterialSwitch) {
-
-    private var switchMaxValue: Float? = null
-
-    fun setIsVisible(isVisible: Boolean) {
-        name.isVisible = isVisible
-        switch.isVisible = isVisible
-    }
-
-    fun initView(
-        clockFontAxis: ClockFontAxis,
-        onFontAxisValueUpdated: (value: Float) -> Unit,
-        colorUpdateViewModel: ColorUpdateViewModel,
-        shouldAnimateColor: () -> Boolean,
-        lifecycleOwner: LifecycleOwner,
-    ) {
-        switchMaxValue = clockFontAxis.maxValue
-        name.text = clockFontAxis.name
-        switch.apply {
-            isChecked = abs(clockFontAxis.currentValue - clockFontAxis.maxValue) < 0.01f
-            var binding: SwitchColorBinder.Binding =
-                SwitchColorBinder.bind(
-                    switch = switch,
-                    isChecked = isChecked,
-                    colorUpdateViewModel = colorUpdateViewModel,
-                    shouldAnimateColor = shouldAnimateColor,
-                    lifecycleOwner = lifecycleOwner,
-                )
-            setOnCheckedChangeListener { v, _ ->
-                binding.destroy()
-                binding =
-                    SwitchColorBinder.bind(
-                        switch = switch,
-                        isChecked = v.isChecked,
-                        colorUpdateViewModel = colorUpdateViewModel,
-                        shouldAnimateColor = shouldAnimateColor,
-                        lifecycleOwner = lifecycleOwner,
-                    )
-                val value = if (v.isChecked) clockFontAxis.maxValue else clockFontAxis.minValue
-                onFontAxisValueUpdated.invoke(value)
-            }
-        }
-    }
-
-    fun setValue(value: Float) {
-        switchMaxValue?.let { switch.isChecked = abs(value - it) < 0.01f }
-    }
-}

diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ClockAxisPresetSliderViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ClockAxisPresetSliderViewModel.kt
new file mode 100644
index 0000000..d11044a
--- /dev/null
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ClockAxisPresetSliderViewModel.kt

@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2025 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.
+ */
+
+package com.android.wallpaper.customization.ui.viewmodel
+
+/** Data class representing [com.google.android.material.slider]'s configuration. */
+data class ClockAxisPresetSliderViewModel(
+    val valueFrom: Float,
+    val valueTo: Float,
+    val stepSize: Float,
+    val onSliderStopTrackingTouch: (value: Float) -> Unit,
+)

diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ClockFloatingSheetHeightsViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ClockFloatingSheetHeightsViewModel.kt
index 249f862..fcfec5f 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ClockFloatingSheetHeightsViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ClockFloatingSheetHeightsViewModel.kt

@@ -19,5 +19,6 @@
 data class ClockFloatingSheetHeightsViewModel(
     val clockStyleContentHeight: Int? = null,
     val clockColorContentHeight: Int? = null,
-    val clockFontContentHeight: Int? = null,
+    val clockSizeContentHeight: Int? = null,
+    val axisPresetSliderHeight: Int? = null,
 )

diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
index dca361f..cff9e08 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModel.kt

@@ -28,6 +28,8 @@
 import com.android.customization.picker.clock.ui.viewmodel.ClockColorViewModel
 import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor2
 import com.android.customization.picker.color.ui.viewmodel.ColorOptionIconViewModel
+import com.android.systemui.plugins.clocks.AxisPresetConfig
+import com.android.systemui.plugins.clocks.AxisPresetConfig.IndexedStyle
 import com.android.systemui.plugins.clocks.ClockAxisStyle
 import com.android.themepicker.R
 import com.android.wallpaper.picker.common.icon.ui.viewmodel.Icon
@@ -40,6 +42,7 @@
 import dagger.assisted.AssistedInject
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.android.scopes.ViewModelScoped
+import kotlin.math.roundToInt
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -74,7 +77,7 @@
     enum class Tab {
         STYLE,
         COLOR,
-        FONT,
+        SIZE,
     }
 
     private val colorMap = ClockColorViewModel.getPresetColorMap(context.resources)
@@ -92,9 +95,9 @@
                             contentDescription = Text.Resource(R.string.clock_style),
                         ),
                     text = context.getString(R.string.clock_style),
-                    isSelected = it == Tab.STYLE || it == Tab.FONT,
+                    isSelected = it == Tab.STYLE,
                     onClick =
-                        if (it == Tab.STYLE || it == Tab.FONT) null
+                        if (it == Tab.STYLE) null
                         else {
                             { _selectedTab.value = Tab.STYLE }
                         },
@@ -113,29 +116,41 @@
                             { _selectedTab.value = Tab.COLOR }
                         },
                 ),
+                FloatingToolbarTabViewModel(
+                    icon =
+                        Icon.Resource(
+                            res = R.drawable.ic_font_size_filled_24px,
+                            contentDescription = Text.Resource(R.string.clock_size),
+                        ),
+                    text = context.getString(R.string.clock_size),
+                    isSelected = it == Tab.SIZE,
+                    onClick =
+                        if (it == Tab.SIZE) null
+                        else {
+                            { _selectedTab.value = Tab.SIZE }
+                        },
+                ),
             )
         }
 
     // Clock style
     private val overridingClock = MutableStateFlow<ClockMetadataModel?>(null)
-    private val isClockEdited =
-        combine(overridingClock, clockPickerInteractor.selectedClock) {
-            overridingClock,
-            selectedClock ->
-            overridingClock != null && overridingClock.clockId != selectedClock.clockId
-        }
     val selectedClock = clockPickerInteractor.selectedClock
     val previewingClock =
         combine(overridingClock, selectedClock) { overridingClock, selectedClock ->
                 (overridingClock ?: selectedClock)
             }
             .shareIn(viewModelScope, SharingStarted.WhileSubscribed(), 1)
+    private val isClockEdited =
+        combine(overridingClock, selectedClock) { overridingClock, selectedClock ->
+            overridingClock != null && overridingClock.clockId != selectedClock.clockId
+        }
 
     suspend fun getIsShadeLayoutWide() = clockPickerInteractor.getIsShadeLayoutWide()
 
     suspend fun getUdfpsLocation() = clockPickerInteractor.getUdfpsLocation()
 
-    data class ClockStyleModel(val thumbnail: Drawable, val showEditButton: StateFlow<Boolean>)
+    data class ClockStyleModel(val thumbnail: Drawable)
 
     @OptIn(ExperimentalCoroutinesApi::class)
     val clockStyleOptions: StateFlow<List<OptionItemViewModel2<ClockStyleModel>>> =
@@ -143,7 +158,7 @@
             .mapLatest { allClocks ->
                 // Delay to avoid the case that the full list of clocks is not initiated.
                 delay(CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
-                val allClockMap = allClocks.groupBy { it.fontAxes.isNotEmpty() }
+                val allClockMap = allClocks.groupBy { it.axisPresetConfig != null }
                 buildList {
                     allClockMap[true]?.map { add(it.toOption(resources)) }
                     allClockMap[false]?.map { add(it.toOption(resources)) }
@@ -155,83 +170,107 @@
             .flowOn(backgroundDispatcher.limitedParallelism(1))
             .stateIn(viewModelScope, SharingStarted.Eagerly, emptyList())
 
+    // Clock font presets
+    private val overridingClockPresetIndexedStyle: MutableStateFlow<IndexedStyle?> =
+        MutableStateFlow(null)
+    private val selectedClockPresetIndexedStyle: Flow<IndexedStyle?> =
+        previewingClock
+            .map { it.axisPresetConfig?.current }
+            .shareIn(viewModelScope, SharingStarted.WhileSubscribed(), 1)
+    val previewingClockPresetIndexedStyle: Flow<IndexedStyle?> =
+        combine(overridingClockPresetIndexedStyle, selectedClockPresetIndexedStyle) {
+            overridingClockPresetIndexedStyle,
+            selectedClockPresetIndexedStyle ->
+            overridingClockPresetIndexedStyle ?: selectedClockPresetIndexedStyle
+        }
+    private val isClockAxisStyleEdited: Flow<Boolean> =
+        combine(overridingClockPresetIndexedStyle, selectedClockPresetIndexedStyle) {
+            overridingClockPresetIndexedStyle,
+            selectedClockPresetIndexedStyle ->
+            overridingClockPresetIndexedStyle != null &&
+                (overridingClockPresetIndexedStyle.style != selectedClockPresetIndexedStyle?.style)
+        }
+
+    private val groups: Flow<List<AxisPresetConfig.Group>?> =
+        previewingClock.map { it.axisPresetConfig?.groups }
+    private val previewingClockPresetGroupIndex: Flow<Int> =
+        previewingClockPresetIndexedStyle.map { it?.groupIndex ?: 0 }.distinctUntilChanged()
+    val shouldShowPresetSlider: Flow<Boolean> = previewingClock.map { it.axisPresetConfig != null }
+    val axisPresetsSliderViewModel: Flow<ClockAxisPresetSliderViewModel?> =
+        combine(groups, previewingClockPresetGroupIndex) { groups, previewingClockPresetGroupIndex
+            ->
+            if (groups.isNullOrEmpty()) {
+                null
+            } else {
+                val group = groups[previewingClockPresetGroupIndex]
+                ClockAxisPresetSliderViewModel(
+                    valueFrom = 0F,
+                    valueTo = (group.presets.size - 1).toFloat(),
+                    stepSize = 1F,
+                    onSliderStopTrackingTouch = { value ->
+                        val presetIndex = value.roundToInt()
+                        overridingClockPresetIndexedStyle.value =
+                            IndexedStyle(
+                                groupIndex = previewingClockPresetGroupIndex,
+                                presetIndex = presetIndex,
+                                style = group.presets[presetIndex],
+                            )
+                    },
+                )
+            }
+        }
+    val axisPresetsSliderSelectedValue: Flow<Float> =
+        previewingClockPresetIndexedStyle.map { it?.presetIndex?.toFloat() }.filterNotNull()
+    val onClockFaceClicked: Flow<() -> Unit> =
+        combine(groups, previewingClockPresetIndexedStyle) { groups, previewingIndexedStyle ->
+            if (groups.isNullOrEmpty()) {
+                {}
+            } else {
+                val groupCount = groups.size
+                if (groupCount == 1) {
+                    {}
+                } else {
+                    val currentGroupIndex = previewingIndexedStyle?.groupIndex ?: 0
+                    val nextGroupIndex = (currentGroupIndex + 1) % groupCount
+                    val nextPresetIndex = previewingIndexedStyle?.presetIndex ?: (groupCount / 2)
+                    val nextGroup = groups[nextGroupIndex]
+                    {
+                        overridingClockPresetIndexedStyle.value =
+                            IndexedStyle(
+                                groupIndex = nextGroupIndex,
+                                presetIndex = nextPresetIndex,
+                                style = nextGroup.presets[nextPresetIndex],
+                            )
+                    }
+                }
+            }
+        }
+
     private suspend fun ClockMetadataModel.toOption(
         resources: Resources
     ): OptionItemViewModel2<ClockStyleModel> {
         val isSelectedFlow = previewingClock.map { it.clockId == clockId }.stateIn(viewModelScope)
-        val isEditable = fontAxes.isNotEmpty()
-        val showEditButton = isSelectedFlow.map { it && isEditable }.stateIn(viewModelScope)
         val contentDescription =
             resources.getString(R.string.select_clock_action_description, description)
         return OptionItemViewModel2<ClockStyleModel>(
             key = MutableStateFlow(clockId) as StateFlow<String>,
-            payload = ClockStyleModel(thumbnail = thumbnail, showEditButton = showEditButton),
+            payload = ClockStyleModel(thumbnail = thumbnail),
             text = Text.Loaded(contentDescription),
             isTextUserVisible = false,
             isSelected = isSelectedFlow,
             onClicked =
                 isSelectedFlow.map { isSelected ->
-                    if (isSelected && isEditable) {
-                        fun() {
-                            _selectedTab.value = Tab.FONT
-                        }
+                    if (isSelected) {
+                        null
                     } else {
                         fun() {
                             overridingClock.value = this
-                            overrideClockFontAxisMap.value = emptyMap()
                         }
                     }
                 },
         )
     }
 
-    // Clock font axis
-    private val overrideClockFontAxisMap = MutableStateFlow<Map<String, Float>>(emptyMap())
-    val previewingClockFontAxes =
-        previewingClock
-            .map { clock -> clock.fontAxes }
-            .shareIn(viewModelScope, SharingStarted.WhileSubscribed(), 1)
-    private val selectedClockFontAxisMap =
-        selectedClock
-            .map { clock -> clock.fontAxes.associate { it.key to it.currentValue } }
-            .shareIn(viewModelScope, SharingStarted.WhileSubscribed(), 1)
-    private val isFontAxisMapEdited =
-        combine(overrideClockFontAxisMap, selectedClockFontAxisMap) {
-            overrideClockFontAxisMap,
-            selectedClockFontAxisMap ->
-            !overrideClockFontAxisMap.all { (key, value) -> selectedClockFontAxisMap[key] == value }
-        }
-    val previewingClockFontAxisMap =
-        combine(overrideClockFontAxisMap, selectedClockFontAxisMap.filterNotNull()) {
-                overrideAxisMap,
-                selectedAxisMap ->
-                if (overrideAxisMap.isEmpty()) {
-                    selectedAxisMap
-                } else {
-                    overrideAxisMap.let {
-                        val mutableMap = selectedAxisMap.toMutableMap()
-                        overrideAxisMap.forEach { (key, value) -> mutableMap[key] = value }
-                        mutableMap.toMap()
-                    }
-                }
-            }
-            .stateIn(viewModelScope, SharingStarted.Eagerly, emptyMap())
-
-    fun updatePreviewFontAxis(key: String, value: Float) {
-        val axisMap = overrideClockFontAxisMap.value.toMutableMap()
-        axisMap[key] = value
-        overrideClockFontAxisMap.value = axisMap.toMap()
-    }
-
-    fun confirmFontAxes() {
-        _selectedTab.value = Tab.STYLE
-    }
-
-    fun cancelFontAxes() {
-        overrideClockFontAxisMap.value = emptyMap()
-        _selectedTab.value = Tab.STYLE
-    }
-
     // Clock size
     private val overridingClockSize = MutableStateFlow<ClockSize?>(null)
     private val isClockSizeEdited =
@@ -415,18 +454,18 @@
     private val isEdited =
         combine(
             isClockEdited,
-            isFontAxisMapEdited,
+            isClockAxisStyleEdited,
             isClockSizeEdited,
             isClockColorIdEdited,
             isSliderProgressEdited,
         ) {
             isClockEdited,
-            isFontAxisMapEdited,
+            isClockAxisStyleEdited,
             isClockSizeEdited,
             isClockColorEdited,
             isSliderProgressEdited ->
             isClockEdited ||
-                isFontAxisMapEdited ||
+                isClockAxisStyleEdited ||
                 isClockSizeEdited ||
                 isClockColorEdited ||
                 isSliderProgressEdited
@@ -440,7 +479,7 @@
             previewingClockSize,
             previewingClockColorId,
             previewingSliderProgress,
-            previewingClockFontAxisMap,
+            previewingClockPresetIndexedStyle,
         ) { array ->
             val onApplyClicked: Boolean = array[0] as Boolean
             val isEdited: Boolean = array[1] as Boolean
@@ -448,7 +487,8 @@
             val size: ClockSize = array[3] as ClockSize
             val previewingColorId: String = array[4] as String
             val previewProgress: Int = array[5] as Int
-            val axisMap: Map<String, Float> = array[6] as Map<String, Float>
+            val clockAxisStyle: ClockAxisStyle =
+                (array[6] as? IndexedStyle)?.style ?: ClockAxisStyle()
             if (isEdited && !onApplyClicked) {
                 {
                     this.onApplyClicked.value = true
@@ -464,7 +504,7 @@
                                     colorTone = it.getColorTone(previewProgress),
                                 )
                             },
-                        axisSettings = ClockAxisStyle(axisMap),
+                        axisSettings = clockAxisStyle,
                     )
                 }
             } else {
@@ -477,7 +517,7 @@
         overridingClockSize.value = null
         overridingClockColorId.value = null
         overridingSliderProgress.value = null
-        overrideClockFontAxisMap.value = emptyMap()
+        overridingClockPresetIndexedStyle.value = null
         _selectedTab.value = Tab.STYLE
         onApplyClicked.value = false
     }

diff --git a/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt b/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
index 95f55c0..9414cc7 100644
--- a/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt
+++ b/src/com/android/wallpaper/customization/ui/viewmodel/ThemePickerCustomizationOptionsViewModel.kt

@@ -32,7 +32,6 @@
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.flatMapLatest
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
@@ -77,16 +76,6 @@
         defaultCustomizationOptionsViewModel.discardChangesDialogViewModel
 
     override fun handleBackPressed(): Boolean {
-
-        if (
-            defaultCustomizationOptionsViewModel.selectedOption.value ==
-                ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption.CLOCK &&
-                clockPickerViewModel.selectedTab.value == ClockPickerViewModel.Tab.FONT
-        ) {
-            clockPickerViewModel.cancelFontAxes()
-            return true
-        }
-
         if (isApplyButtonEnabled.value) {
             defaultCustomizationOptionsViewModel.showDiscardChangesDialogViewModel()
             return true
@@ -212,14 +201,6 @@
 
     val isApplyButtonVisible: Flow<Boolean> = selectedOption.map { it != null }
 
-    val isToolbarCollapsed: Flow<Boolean> =
-        combine(selectedOption, clockPickerViewModel.selectedTab) { selectedOption, selectedTab ->
-                selectedOption ==
-                    ThemePickerCustomizationOptionUtil.ThemePickerLockCustomizationOption.CLOCK &&
-                    selectedTab == ClockPickerViewModel.Tab.FONT
-            }
-            .distinctUntilChanged()
-
     @ViewModelScoped
     @AssistedFactory
     interface Factory : CustomizationOptionsViewModelFactory {

diff --git a/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt b/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
index 41b8099..95992fa 100644
--- a/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt
+++ b/src_override/com/android/wallpaper/modules/ThemePickerAppModule.kt

@@ -61,6 +61,8 @@
 import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultCuratedPhotosInteractorImpl
 import com.android.wallpaper.picker.category.domain.interactor.implementations.DefaultOnDeviceWallpapersInteractor
 import com.android.wallpaper.picker.category.domain.interactor.implementations.ThirdPartyCategoryInteractorImpl
+import com.android.wallpaper.picker.category.ui.binder.BannerProvider
+import com.android.wallpaper.picker.category.ui.binder.DefaultBannerProvider
 import com.android.wallpaper.picker.category.ui.view.providers.IndividualPickerFactory
 import com.android.wallpaper.picker.category.ui.view.providers.implementation.DefaultIndividualPickerFactory
 import com.android.wallpaper.picker.category.wrapper.DefaultWallpaperCategoryWrapper
@@ -89,6 +91,8 @@
 @InstallIn(SingletonComponent::class)
 abstract class ThemePickerAppModule {
 
+    @Binds @Singleton abstract fun bindBannerProvider(impl: DefaultBannerProvider): BannerProvider
+
     @Binds
     @Singleton
     abstract fun bindClockPickerRepository(impl: ClockPickerRepositoryImpl): ClockPickerRepository

diff --git a/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt b/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
index fd2c801..7728218 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/data/repository/FakeClockPickerRepository.kt

@@ -22,16 +22,16 @@
 import com.android.customization.picker.clock.data.repository.FakeClockPickerRepository.Companion.fakeClocks
 import com.android.customization.picker.clock.shared.ClockSize
 import com.android.customization.picker.clock.shared.model.ClockMetadataModel
+import com.android.systemui.plugins.clocks.AxisPresetConfig
+import com.android.systemui.plugins.clocks.AxisPresetConfig.Group
 import com.android.systemui.plugins.clocks.AxisType
 import com.android.systemui.plugins.clocks.ClockAxisStyle
 import com.android.systemui.plugins.clocks.ClockFontAxis
-import com.android.systemui.plugins.clocks.ClockFontAxis.Companion.merge
 import com.android.systemui.plugins.clocks.ClockId
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.combine
-import kotlinx.coroutines.flow.update
 
 /** By default [FakeClockPickerRepository] uses [fakeClocks]. */
 open class FakeClockPickerRepository(clocks: List<ClockMetadataModel> = fakeClocks) :
@@ -43,16 +43,16 @@
     private val colorTone: MutableStateFlow<Int> =
         MutableStateFlow(ClockMetadataModel.DEFAULT_COLOR_TONE_PROGRESS)
     @ColorInt private val seedColor: MutableStateFlow<Int?> = MutableStateFlow(null)
-    private val fontAxes: MutableStateFlow<List<ClockFontAxis>> =
-        MutableStateFlow(listOf(buildFakeAxis(0)))
+    private val clockListFlow: MutableStateFlow<List<ClockMetadataModel>> =
+        MutableStateFlow(fakeClocks)
     override val selectedClock: Flow<ClockMetadataModel> =
-        combine(selectedClockId, selectedColorId, colorTone, seedColor, fontAxes) {
+        combine(clockListFlow, selectedClockId, selectedColorId, colorTone, seedColor) {
+            clockList,
             selectedClockId,
             selectedColor,
             colorTone,
-            seedColor,
-            fontAxes ->
-            val selectedClock = fakeClocks.find { clock -> clock.clockId == selectedClockId }
+            seedColor ->
+            val selectedClock = clockList.find { clock -> clock.clockId == selectedClockId }
             checkNotNull(selectedClock)
             ClockMetadataModel(
                 clockId = selectedClock.clockId,
@@ -60,7 +60,7 @@
                 description = "description",
                 thumbnail = ColorDrawable(0),
                 isReactiveToTone = selectedClock.isReactiveToTone,
-                fontAxes = fontAxes,
+                axisPresetConfig = selectedClock.axisPresetConfig,
                 selectedColorId = selectedColor,
                 colorToneProgress = colorTone,
                 seedColor = seedColor,
@@ -88,16 +88,31 @@
         _selectedClockSize.value = size
     }
 
-    override suspend fun setClockFontAxes(axisSettings: ClockAxisStyle) {
-        fontAxes.update { fontAxes -> fontAxes.merge(axisSettings) }
+    override suspend fun setClockAxisStyle(axisStyle: ClockAxisStyle) {
+        val clockList = clockListFlow.value
+        val newClockList = clockList.toMutableList()
+        for ((index, clock) in clockList.withIndex()) {
+            val presetConfig = clock.axisPresetConfig
+            val style = presetConfig?.findStyle(axisStyle)
+            if (presetConfig != null && style != null) {
+                newClockList[index] =
+                    clock.copy(axisPresetConfig = presetConfig.copy(current = style))
+            }
+        }
+
+        clockListFlow.value = newClockList.toList()
     }
 
     override fun isReactiveToTone(clockId: ClockId): Boolean? = true
 
     companion object {
-        fun buildFakeAxis(i: Int): ClockFontAxis {
+        fun buildFakeClockAxisStyle(i: Int): ClockAxisStyle {
+            return ClockAxisStyle(listOf(buildFakeAxis(i)))
+        }
+
+        private fun buildFakeAxis(i: Int): ClockFontAxis {
             return ClockFontAxis(
-                key = "key",
+                key = "key#$i",
                 type = AxisType.Float,
                 maxValue = 0f,
                 minValue = 1000f,
@@ -107,10 +122,36 @@
             )
         }
 
+        private val fakeClockAxisStyle0 = ClockAxisStyle(listOf(buildFakeAxis(0)))
+        val fakeClockAxisStyle1 = ClockAxisStyle(listOf(buildFakeAxis(1)))
+        private val fakeClockAxisStyle2 = ClockAxisStyle(listOf(buildFakeAxis(2)))
+        private val fakeClockAxisStyle3 = ClockAxisStyle(listOf(buildFakeAxis(3)))
+        private val fakeAxisPresetConfig: AxisPresetConfig =
+            AxisPresetConfig(
+                groups =
+                    listOf(
+                        AxisPresetConfig.Group(
+                            presets = listOf(fakeClockAxisStyle0, fakeClockAxisStyle1),
+                            icon = ColorDrawable(Color.BLUE),
+                        ),
+                        AxisPresetConfig.Group(
+                            presets = listOf(fakeClockAxisStyle2, fakeClockAxisStyle3),
+                            icon = ColorDrawable(Color.YELLOW),
+                        ),
+                    ),
+                current =
+                    AxisPresetConfig.IndexedStyle(
+                        groupIndex = 0,
+                        presetIndex = 0,
+                        style = fakeClockAxisStyle0,
+                    ),
+            )
+
         const val CLOCK_ID_0 = "clock0"
         const val CLOCK_ID_1 = "clock1"
         const val CLOCK_ID_2 = "clock2"
         const val CLOCK_ID_3 = "clock3"
+
         val fakeClocks =
             listOf(
                 ClockMetadataModel(
@@ -119,7 +160,7 @@
                     "description0",
                     ColorDrawable(0),
                     true,
-                    listOf(buildFakeAxis(0)),
+                    fakeAxisPresetConfig,
                     null,
                     50,
                     null,
@@ -130,7 +171,7 @@
                     "description1",
                     ColorDrawable(0),
                     true,
-                    listOf(buildFakeAxis(1)),
+                    null,
                     null,
                     50,
                     null,
@@ -141,7 +182,7 @@
                     "description2",
                     ColorDrawable(0),
                     true,
-                    listOf(buildFakeAxis(2)),
+                    null,
                     null,
                     50,
                     null,
@@ -152,7 +193,7 @@
                     "description3",
                     ColorDrawable(0),
                     false,
-                    listOf(buildFakeAxis(3)),
+                    null,
                     null,
                     50,
                     null,

diff --git a/tests/robotests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt b/tests/robotests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt
index 484d810..67c2e46 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/domain/interactor/ClockPickerInteractorTest.kt

@@ -3,7 +3,6 @@
 import androidx.test.filters.SmallTest
 import com.android.customization.picker.clock.data.repository.FakeClockPickerRepository
 import com.android.customization.picker.clock.shared.ClockSize
-import com.android.systemui.plugins.clocks.ClockAxisStyle
 import com.android.systemui.shared.customization.data.content.FakeCustomizationProviderClient
 import com.android.wallpaper.picker.customization.data.repository.CustomizationRuntimeValuesRepository
 import com.android.wallpaper.testing.FakeSnapshotStore
@@ -89,7 +88,7 @@
     @Test
     fun setFontAxisSettings() = runTest {
         val axisSettings = collectLastValue(underTest.axisSettings)
-        val fakeSettings = ClockAxisStyle(listOf(FakeClockPickerRepository.buildFakeAxis(10)))
+        val fakeSettings = FakeClockPickerRepository.fakeClockAxisStyle1
 
         underTest.setClockFontAxes(fakeSettings)
 

diff --git a/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModelTest.kt b/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModelTest.kt
index 0386c85..07d7cbf 100644
--- a/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModelTest.kt
+++ b/tests/robotests/src/com/android/customization/picker/clock/ui/viewmodel/ClockCarouselViewModelTest.kt

@@ -60,7 +60,7 @@
                     description = "description",
                     thumbnail = ColorDrawable(0),
                     isReactiveToTone = true,
-                    fontAxes = listOf(),
+                    axisPresetConfig = null,
                     selectedColorId = null,
                     colorToneProgress = ClockMetadataModel.DEFAULT_COLOR_TONE_PROGRESS,
                     seedColor = null,

diff --git a/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModelTest.kt b/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModelTest.kt
index 482af7e..132133e 100644
--- a/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModelTest.kt
+++ b/tests/robotests/src/com/android/wallpaper/customization/ui/viewmodel/ClockPickerViewModelTest.kt

@@ -28,6 +28,7 @@
 import com.android.customization.picker.clock.ui.viewmodel.ClockSettingsViewModel
 import com.android.customization.picker.color.data.repository.FakeColorPickerRepository2
 import com.android.customization.picker.color.domain.interactor.ColorPickerInteractor2
+import com.android.systemui.plugins.clocks.AxisPresetConfig.IndexedStyle
 import com.android.systemui.shared.customization.data.content.FakeCustomizationProviderClient
 import com.android.themepicker.R
 import com.android.wallpaper.customization.ui.viewmodel.ClockPickerViewModel.Tab
@@ -114,48 +115,13 @@
         Dispatchers.resetMain()
     }
 
-    @Test
-    fun selectedTab_whenClickOnTabStyle() = runTest {
-        val tabs = collectLastValue(underTest.tabs)
-        val selectedTab = collectLastValue(underTest.selectedTab)
-
-        tabs()?.get(0)?.onClick?.invoke()
-
-        assertThat(selectedTab()).isEqualTo(Tab.STYLE)
-    }
-
-    @Test
-    fun selectedTab_whenClickOnTabColor() = runTest {
-        val tabs = collectLastValue(underTest.tabs)
-        val selectedTab = collectLastValue(underTest.selectedTab)
-
-        tabs()?.get(1)?.onClick?.invoke()
-
-        assertThat(selectedTab()).isEqualTo(Tab.COLOR)
-    }
-
-    @Test
-    fun selectedTab_fontEditorWhenClickSelectedClock() = runTest {
-        val clockStyleOptions = collectLastValue(underTest.clockStyleOptions)
-        val selectedTab = collectLastValue(underTest.selectedTab)
-        // Advance CLOCKS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from clockStyleOptions
-        advanceTimeBy(ClockPickerViewModel.CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
-        assertThat(selectedTab()).isEqualTo(Tab.STYLE)
-
-        val firstClock = clockStyleOptions()!![0]
-        val onClicked = collectLastValue(firstClock.onClicked)
-        if (!firstClock.isSelected.value) onClicked()?.invoke()
-        onClicked()?.invoke()
-
-        assertThat(selectedTab()).isEqualTo(Tab.FONT)
-    }
-
+    //// Tabs
     @Test
     fun tabs_whenInitialState() = runTest {
         val tabs = collectLastValue(underTest.tabs)
 
         val resultTabs = checkNotNull(tabs())
-        assertThat(resultTabs).hasSize(2)
+        assertThat(resultTabs).hasSize(3)
         resultTabs.forEachIndexed { index, floatingToolbarTabViewModel ->
             when (index) {
                 0 -> {
@@ -184,6 +150,19 @@
                         isOnClickNull = false,
                     )
                 }
+                2 -> {
+                    assertFloatingToolbarTabViewModel(
+                        viewModel = floatingToolbarTabViewModel,
+                        icon =
+                            Icon.Resource(
+                                res = R.drawable.ic_font_size_filled_24px,
+                                contentDescription = Text.Resource(R.string.clock_size),
+                            ),
+                        text = context.getString(R.string.clock_size),
+                        isSelected = false,
+                        isOnClickNull = false,
+                    )
+                }
             }
         }
     }
@@ -207,6 +186,37 @@
     }
 
     @Test
+    fun selectedTab_whenClickOnTabStyle() = runTest {
+        val tabs = collectLastValue(underTest.tabs)
+        val selectedTab = collectLastValue(underTest.selectedTab)
+
+        tabs()?.get(0)?.onClick?.invoke()
+
+        assertThat(selectedTab()).isEqualTo(Tab.STYLE)
+    }
+
+    @Test
+    fun selectedTab_whenClickOnTabColor() = runTest {
+        val tabs = collectLastValue(underTest.tabs)
+        val selectedTab = collectLastValue(underTest.selectedTab)
+
+        tabs()?.get(1)?.onClick?.invoke()
+
+        assertThat(selectedTab()).isEqualTo(Tab.COLOR)
+    }
+
+    @Test
+    fun selectedTab_whenClickOnTabSize() = runTest {
+        val tabs = collectLastValue(underTest.tabs)
+        val selectedTab = collectLastValue(underTest.selectedTab)
+
+        tabs()?.get(2)?.onClick?.invoke()
+
+        assertThat(selectedTab()).isEqualTo(Tab.SIZE)
+    }
+
+    //// Clock style
+    @Test
     fun selectedClock_whenClickOnStyleOptions() = runTest {
         val selectedClock = collectLastValue(underTest.selectedClock)
 
@@ -241,7 +251,7 @@
         val option1OnClicked = collectLastValue(clockStyleOptions()!![1].onClicked)
 
         assertThat(option0IsSelected()).isTrue()
-        assertThat(option0OnClicked()).isNotNull()
+        assertThat(option0OnClicked()).isNull()
 
         option1OnClicked()?.invoke()
         // Advance CLOCKS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from clockColorOptions
@@ -249,9 +259,117 @@
 
         assertThat(option0IsSelected()).isFalse()
         assertThat(option1IsSelected()).isTrue()
-        assertThat(option1OnClicked()).isNotNull()
+        assertThat(option1OnClicked()).isNull()
     }
 
+    //// Clock font
+    @Test
+    fun previewingClockPresetIndexedStyle_whenInitialState() = runTest {
+        val previewingClockPresetIndexedStyle =
+            collectLastValue(underTest.previewingClockPresetIndexedStyle)
+
+        assertThat(previewingClockPresetIndexedStyle())
+            .isEqualTo(FakeClockPickerRepository.fakeClocks[0].axisPresetConfig?.current)
+    }
+
+    @Test
+    fun previewingClockPresetIndexedStyle_whenClickOnSliderStep() = runTest {
+        val previewingClockPresetIndexedStyle =
+            collectLastValue(underTest.previewingClockPresetIndexedStyle)
+        val axisPresetsSliderViewModel = collectLastValue(underTest.axisPresetsSliderViewModel)
+        val onSlierStopTrackingTouch = axisPresetsSliderViewModel()?.onSliderStopTrackingTouch
+        checkNotNull(onSlierStopTrackingTouch)
+
+        onSlierStopTrackingTouch.invoke(1F)
+
+        assertThat(previewingClockPresetIndexedStyle())
+            .isEqualTo(
+                IndexedStyle(
+                    groupIndex = 0,
+                    presetIndex = 1,
+                    style = FakeClockPickerRepository.fakeClockAxisStyle1,
+                )
+            )
+    }
+
+    @Test
+    fun shouldShowPresetSlider_true_whenDefault() = runTest {
+        val shouldShowPresetSlider = collectLastValue(underTest.shouldShowPresetSlider)
+
+        assertThat(shouldShowPresetSlider()).isTrue()
+    }
+
+    @Test
+    fun shouldShowPresetSlider_false_whenSelectClockWithNullAxisPresetConfig() = runTest {
+        val shouldShowPresetSlider = collectLastValue(underTest.shouldShowPresetSlider)
+        val clockStyleOptions = collectLastValue(underTest.clockStyleOptions)
+        // Advance CLOCKS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from clockStyleOptions
+        advanceTimeBy(ClockPickerViewModel.CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
+        val onClockOption1Clicked =
+            clockStyleOptions()?.get(1)?.onClicked?.let { collectLastValue(it) }
+        checkNotNull(onClockOption1Clicked)
+
+        onClockOption1Clicked()?.invoke()
+
+        assertThat(shouldShowPresetSlider()).isFalse()
+    }
+
+    @Test
+    fun axisPresetsSliderViewModel_initialState() = runTest {
+        val axisPresetsSliderViewModel = collectLastValue(underTest.axisPresetsSliderViewModel)
+
+        val expectedPresetSize =
+            FakeClockPickerRepository.fakeClocks[0].axisPresetConfig?.groups?.get(0)?.presets?.size
+        checkNotNull(expectedPresetSize)
+        val resultAxisPresetsSliderViewModel = axisPresetsSliderViewModel()
+        assertThat(resultAxisPresetsSliderViewModel?.valueFrom).isEqualTo(0F)
+        assertThat(resultAxisPresetsSliderViewModel?.valueTo)
+            .isEqualTo((expectedPresetSize - 1).toFloat())
+        assertThat(resultAxisPresetsSliderViewModel?.stepSize).isEqualTo(1F)
+    }
+
+    @Test
+    fun axisPresetsSliderSelectedValue_update_whenClickOnSliderStep() = runTest {
+        val axisPresetsSliderSelectedValue =
+            collectLastValue(underTest.axisPresetsSliderSelectedValue)
+        val axisPresetsSliderViewModel = collectLastValue(underTest.axisPresetsSliderViewModel)
+        val onSlierStopTrackingTouch = axisPresetsSliderViewModel()?.onSliderStopTrackingTouch
+        checkNotNull(onSlierStopTrackingTouch)
+
+        onSlierStopTrackingTouch.invoke(1F)
+
+        val expectedResult =
+            FakeClockPickerRepository.fakeClocks[0]
+                .axisPresetConfig
+                ?.groups
+                ?.get(0)
+                ?.presets
+                ?.get(1)
+        checkNotNull(expectedResult)
+        assertThat(axisPresetsSliderSelectedValue()).isEqualTo(1F)
+    }
+
+    @Test
+    fun previewingClockPresetIndexedStyle_whenOnClockFaceClicked() = runTest {
+        val previewingClockPresetIndexedStyle =
+            collectLastValue(underTest.previewingClockPresetIndexedStyle)
+        val onClockFaceClicked = collectLastValue(underTest.onClockFaceClicked)
+
+        onClockFaceClicked()?.invoke()
+
+        val expectedResult =
+            FakeClockPickerRepository.fakeClocks[0]
+                .axisPresetConfig
+                ?.groups
+                ?.get(1)
+                ?.presets
+                ?.get(0)
+        checkNotNull(expectedResult)
+        assertThat(previewingClockPresetIndexedStyle())
+            .isEqualTo(IndexedStyle(groupIndex = 1, presetIndex = 0, style = expectedResult))
+    }
+
+    //// Clock size
     @Test
     fun previewingClockSize_whenCallingOnClockSizeSwitchChecked() = runTest {
         val previewingClockSize = collectLastValue(underTest.previewingClockSize)
@@ -265,76 +383,7 @@
         assertThat(previewingClockSize()).isEqualTo(ClockSize.SMALL)
     }
 
-    @Test
-    fun previewingFontAxes_defaultWhenNoOverrides() = runTest {
-        val previewingFontAxes = collectLastValue(underTest.previewingClockFontAxisMap)
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 50f))
-    }
-
-    @Test
-    fun previewingFontAxes_updateAxisChangesSetting() = runTest {
-        val previewingFontAxes = collectLastValue(underTest.previewingClockFontAxisMap)
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 50f))
-
-        underTest.updatePreviewFontAxis("key", 100f)
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 100f))
-
-        underTest.updatePreviewFontAxis("extra", 10f)
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 100f, "extra" to 10f))
-    }
-
-    @Test
-    fun previewingFontAxes_applyFontEditorExitsTab_keepsPreviewAxis() = runTest {
-        val previewingFontAxes = collectLastValue(underTest.previewingClockFontAxisMap)
-        val clockStyleOptions = collectLastValue(underTest.clockStyleOptions)
-        val selectedTab = collectLastValue(underTest.selectedTab)
-        // Advance CLOCKS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from clockStyleOptions
-        advanceTimeBy(ClockPickerViewModel.CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
-
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 50f))
-        assertThat(selectedTab()).isEqualTo(Tab.STYLE)
-
-        val firstClock = clockStyleOptions()!![0]
-        val onClicked = collectLastValue(firstClock.onClicked)
-        if (!firstClock.isSelected.value) onClicked()?.invoke()
-        onClicked()?.invoke()
-        underTest.updatePreviewFontAxis("key", 100f)
-
-        assertThat(selectedTab()).isEqualTo(Tab.FONT)
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 100f))
-
-        underTest.confirmFontAxes()
-
-        assertThat(selectedTab()).isEqualTo(Tab.STYLE)
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 100f))
-    }
-
-    @Test
-    fun previewingFontAxes_revertFontEditorExitsTab_revertsPreviewAxis() = runTest {
-        val previewingFontAxes = collectLastValue(underTest.previewingClockFontAxisMap)
-        val clockStyleOptions = collectLastValue(underTest.clockStyleOptions)
-        val selectedTab = collectLastValue(underTest.selectedTab)
-        // Advance CLOCKS_EVENT_UPDATE_DELAY_MILLIS since there is a delay from clockStyleOptions
-        advanceTimeBy(ClockPickerViewModel.CLOCKS_EVENT_UPDATE_DELAY_MILLIS)
-
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 50f))
-        assertThat(selectedTab()).isEqualTo(Tab.STYLE)
-
-        val firstClock = clockStyleOptions()!![0]
-        val onClicked = collectLastValue(firstClock.onClicked)
-        if (!firstClock.isSelected.value) onClicked()?.invoke()
-        onClicked()?.invoke()
-        underTest.updatePreviewFontAxis("key", 100f)
-
-        assertThat(selectedTab()).isEqualTo(Tab.FONT)
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 100f))
-
-        underTest.cancelFontAxes()
-
-        assertThat(selectedTab()).isEqualTo(Tab.STYLE)
-        assertThat(previewingFontAxes()).isEqualTo(mapOf("key" to 50f))
-    }
-
+    //// Clock color
     @Test
     fun sliderProgress_whenOnSliderProgressChanged() = runTest {
         val sliderProgress = collectLastValue(underTest.previewingSliderProgress)
@@ -488,25 +537,6 @@
     }
 
     @Test
-    fun apply_notNullWhenFontAxisChanged() = runTest {
-        val onApply = collectLastValue(underTest.onApply)
-
-        underTest.updatePreviewFontAxis("key", 100f)
-
-        assertThat(onApply()).isNotNull()
-    }
-
-    @Test
-    fun apply_nullAfterApplyingFontAxis() = runTest {
-        val onApply = collectLastValue(underTest.onApply)
-
-        underTest.updatePreviewFontAxis("key", 100f)
-        onApply()?.invoke()
-
-        assertThat(onApply()).isNull()
-    }
-
-    @Test
     fun apply_notNullWhenClockSizeChanged() = runTest {
         val onApply = collectLastValue(underTest.onApply)
         val onClockSizeSwitchCheckedChange =
commit	27cccd8673cd3e29e506e8620781bb3a34429465	[log] [tgz]
author	Catherine Liang <cathliang@google.com>	Thu Mar 20 08:38:19 2025 -0700
committer	Android (Google) Code Review <android-gerrit@google.com>	Thu Mar 20 08:38:19 2025 -0700
tree	22fab55b04b306fc4b0ad87353481c665018113a
parent	b8520b1549aa3f7166e7d5910e9e416452d366d2 [diff]
parent	fa76527f7556c92250e89dd0f0498ecbb59ec06b [diff]