From 1fecccd439fbc301257ddfac275baac67d56229e Mon Sep 17 00:00:00 2001
From: Abhijit Adsule <adsule@google.com>
Date: Mon, 2 Dec 2024 18:45:50 +0000
Subject: Revert "m3: Refine AlertDialog style"

This reverts commit 66c04410260b1f21bc113b59ca37d7a63365477c.

Reason for revert: b/381450700

Change-Id: I27158f982ef6c862e3b8287ab650ac031c160d55
---
 .../alert_dialog_title_material.xml                |  48 ++++---
 .../alert_dialog_wear_material3.xml                | 145 +++++++++------------
 core/res/res/values-w192dp/dimens_material.xml     |   4 -
 core/res/res/values-w195dp/dimens_material.xml     |   4 -
 core/res/res/values-w198dp/dimens_material.xml     |   4 -
 .../values-w204dp-round-watch/dimens_material.xml  |   4 -
 core/res/res/values-w205dp/dimens_material.xml     |   4 -
 core/res/res/values-w208dp/dimens_material.xml     |   4 -
 .../values-w210dp-round-watch/dimens_material.xml  |   8 --
 core/res/res/values-w211dp/dimens_material.xml     |   4 -
 core/res/res/values-w213dp/dimens_material.xml     |   4 -
 core/res/res/values-w216dp/dimens_material.xml     |  24 ----
 core/res/res/values-w225dp/dimens_material.xml     |   4 -
 core/res/res/values-w227dp/dimens_material.xml     |   4 -
 core/res/res/values-w228dp/dimens_material.xml     |   4 -
 core/res/res/values-w240dp/dimens_material.xml     |   4 -
 core/res/res/values-watch-v36/dimens_material.xml  |  15 ---
 core/res/res/values-watch-v36/styles_material.xml  |  21 ---
 18 files changed, 82 insertions(+), 227 deletions(-)
 delete mode 100644 core/res/res/values-w216dp/dimens_material.xml

diff --git a/core/res/res/layout-round-watch/alert_dialog_title_material.xml b/core/res/res/layout-round-watch/alert_dialog_title_material.xml
index 75fe7601317b..dac1e324be81 100644
--- a/core/res/res/layout-round-watch/alert_dialog_title_material.xml
+++ b/core/res/res/layout-round-watch/alert_dialog_title_material.xml
@@ -14,34 +14,30 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License
   -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:gravity="top|center_horizontal">
-
-    <FrameLayout
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:adjustViewBounds="true">
-
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="wrap_content"
+        android:paddingBottom="8dp"
+        android:orientation="vertical"
+        android:gravity="top|center_horizontal">
+    <FrameLayout
+            android:adjustViewBounds="true"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginBottom="8dp"
-            android:maxHeight="32dp"
-            android:maxWidth="32dp"
-            android:src="@null" />
+            android:minHeight="@dimen/screen_percentage_15">
+        <ImageView android:id="@+id/icon"
+                android:adjustViewBounds="true"
+                android:maxHeight="24dp"
+                android:maxWidth="24dp"
+                android:layout_marginTop="@dimen/screen_percentage_10"
+                android:layout_gravity="center_horizontal"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@null" />
     </FrameLayout>
-
-    <TextView
-        android:id="@+id/alertTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/alertDialog_material_side_margin_title"
-        android:layout_marginEnd="@dimen/alertDialog_material_side_margin_title"
-        android:textAppearance="@style/TextAppearance.AlertDialog.Title"
-        android:gravity="center" />
+    <TextView android:id="@+id/alertTitle"
+            style="?android:attr/windowTitleStyle"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
 </LinearLayout>
diff --git a/core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml b/core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml
index af30f1bd164c..8f7545690142 100644
--- a/core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml
+++ b/core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml
@@ -16,123 +16,98 @@
 
 <!-- This layout is the AlertDialog template. It overrides the system layout with the same name.
     Make sure to include all the existing id of the overridden alert_dialog_material.-->
-<com.android.internal.widget.WatchListDecorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<com.android.internal.widget.WatchListDecorLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/parentPanel"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
-
     <ScrollView
         android:id="@+id/scrollView"
+        android:fillViewport="true"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true">
-
-        <requestFocus />
-
+        android:layout_height="match_parent">
         <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginStart="@dimen/alertDialog_material_side_margin"
-            android:layout_marginEnd="@dimen/alertDialog_material_side_margin"
-            android:gravity="center_vertical">
-
-            <!-- Top Spacer -->
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/alertDialog_material_top_margin" />
-
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
             <!-- Top Panel -->
             <FrameLayout
-                android:id="@+id/topPanel"
+                android:paddingLeft="?dialogPreferredPadding"
+                android:paddingRight="?dialogPreferredPadding"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:id="@+id/topPanel"
                 android:minHeight="@dimen/dialog_list_padding_top_no_title">
-
-                <include
-                    android:id="@+id/title_template"
-                    layout="@layout/alert_dialog_title_material"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+                <include android:id="@+id/title_template"
+                         android:layout_width="match_parent"
+                         android:layout_height="wrap_content"
+                         layout="@layout/alert_dialog_title_material"/>
             </FrameLayout>
 
             <!-- Content Panel -->
-            <FrameLayout
-                android:id="@+id/contentPanel"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:paddingTop="12dp">
-
-                <TextView
-                    android:id="@+id/message"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="@dimen/alertDialog_material_side_margin_body"
-                    android:layout_marginEnd="@dimen/alertDialog_material_side_margin_body"
-                    android:textAppearance="@style/TextAppearance.AlertDialog.Body1"
-                    android:gravity="center_horizontal|top" />
+            <FrameLayout android:id="@+id/contentPanel"
+                         android:layout_width="match_parent"
+                         android:layout_height="wrap_content"
+                         android:clipToPadding="false">
+                <TextView android:id="@+id/message"
+                          android:layout_width="match_parent"
+                          android:layout_height="wrap_content"
+                          android:gravity="center_horizontal|top"
+                          android:textAppearance="@style/TextAppearance.DeviceDefault.Body1"
+                          android:paddingStart="?dialogPreferredPadding"
+                          android:paddingEnd="?dialogPreferredPadding"
+                          android:paddingTop="8dip"
+                          android:paddingBottom="8dip"/>
             </FrameLayout>
 
             <!-- Custom Panel, to replace content panel if needed -->
-            <FrameLayout
-                android:id="@+id/customPanel"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:minHeight="64dp">
-
-                <FrameLayout
-                    android:id="@+android:id/custom"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
+            <FrameLayout android:id="@+id/customPanel"
+                         android:layout_width="match_parent"
+                         android:layout_height="match_parent"
+                         android:minHeight="64dp">
+                <FrameLayout android:id="@+android:id/custom"
+                             android:layout_width="match_parent"
+                             android:layout_height="wrap_content" />
             </FrameLayout>
 
             <!-- Button Panel -->
             <FrameLayout
                 android:id="@+id/buttonPanel"
+                android:minHeight="@dimen/dialog_list_padding_bottom_no_buttons"
+                android:layout_weight="1"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:minHeight="@dimen/dialog_list_padding_bottom_no_buttons">
-
+                android:layout_gravity="center">
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
                     android:layout_gravity="bottom"
-                    android:orientation="vertical">
-
-                    <Button
-                        android:id="@+id/button1"
-                        style="@*android:style/Widget.DeviceDefault.Button.Filled"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:layout_gravity="center"
-                        android:gravity="center" />
-
-                    <Button
-                        android:id="@+id/button2"
-                        style="@*android:style/Widget.DeviceDefault.Button.WearMaterial3"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
-                        android:layout_gravity="center"
-                        android:gravity="center" />
-
-                    <Button
-                        android:id="@+id/button3"
-                        style="?android:attr/buttonBarButtonStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:gravity="center" />
+                    android:orientation="vertical"
+                    android:paddingBottom="?dialogPreferredPadding"
+                    android:measureWithLargestChild="true">
+                    <Button android:id="@+id/button2"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:layout_weight="1"
+                            style="@*android:style/Widget.DeviceDefault.Button.WearMaterial3"/>
+                    <Button android:id="@+id/button3"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:layout_weight="1"
+                            style="?android:attr/buttonBarButtonStyle"/>
+                    <Button android:id="@+id/button1"
+                            android:layout_width="match_parent"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:gravity="center"
+                            android:layout_weight="1"
+                            style="@*android:style/Widget.DeviceDefault.Button.Filled"/>
                 </LinearLayout>
             </FrameLayout>
-
-            <!-- Bottom Spacer -->
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/alertDialog_material_bottom_margin" />
-
         </LinearLayout>
     </ScrollView>
 </com.android.internal.widget.WatchListDecorLayout>
diff --git a/core/res/res/values-w192dp/dimens_material.xml b/core/res/res/values-w192dp/dimens_material.xml
index a11eb7f96f45..797bf5a4c717 100644
--- a/core/res/res/values-w192dp/dimens_material.xml
+++ b/core/res/res/values-w192dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">7.99dp</dimen>
     <dimen name="screen_percentage_05">9.6dp</dimen>
-    <dimen name="screen_percentage_052">9.98dp</dimen>
     <dimen name="screen_percentage_10">19.2dp</dimen>
-    <dimen name="screen_percentage_12">23.04dp</dimen>
     <dimen name="screen_percentage_15">28.8dp</dimen>
-    <dimen name="screen_percentage_3646">69.99dp</dimen>
 </resources>
diff --git a/core/res/res/values-w195dp/dimens_material.xml b/core/res/res/values-w195dp/dimens_material.xml
index 346066f27349..7f3ad29f5505 100644
--- a/core/res/res/values-w195dp/dimens_material.xml
+++ b/core/res/res/values-w195dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">8.11dp</dimen>
     <dimen name="screen_percentage_05">9.75dp</dimen>
-    <dimen name="screen_percentage_052">10.14dp</dimen>
     <dimen name="screen_percentage_10">19.5dp</dimen>
-    <dimen name="screen_percentage_12">23.4dp</dimen>
     <dimen name="screen_percentage_15">29.25dp</dimen>
-    <dimen name="screen_percentage_3646">71.09dp</dimen>
 </resources>
diff --git a/core/res/res/values-w198dp/dimens_material.xml b/core/res/res/values-w198dp/dimens_material.xml
index 4c88f0520a71..a8aed2541c57 100644
--- a/core/res/res/values-w198dp/dimens_material.xml
+++ b/core/res/res/values-w198dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">8.24dp</dimen>
     <dimen name="screen_percentage_05">9.9dp</dimen>
-    <dimen name="screen_percentage_052">10.3dp</dimen>
     <dimen name="screen_percentage_10">19.8dp</dimen>
-    <dimen name="screen_percentage_12">23.76dp</dimen>
     <dimen name="screen_percentage_15">29.7dp</dimen>
-    <dimen name="screen_percentage_3646">72.1dp</dimen>
 </resources>
diff --git a/core/res/res/values-w204dp-round-watch/dimens_material.xml b/core/res/res/values-w204dp-round-watch/dimens_material.xml
index 54bb0c9c292e..c07d5c47e2e1 100644
--- a/core/res/res/values-w204dp-round-watch/dimens_material.xml
+++ b/core/res/res/values-w204dp-round-watch/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">8.48dp</dimen>
     <dimen name="screen_percentage_05">10.2dp</dimen>
-    <dimen name="screen_percentage_052">10.61dp</dimen>
     <dimen name="screen_percentage_10">20.4dp</dimen>
-    <dimen name="screen_percentage_12">24.48dp</dimen>
     <dimen name="screen_percentage_15">30.6dp</dimen>
-    <dimen name="screen_percentage_3646">74.42dp</dimen>
 </resources>
diff --git a/core/res/res/values-w205dp/dimens_material.xml b/core/res/res/values-w205dp/dimens_material.xml
index 60f65bb5863a..94907ee51dcc 100644
--- a/core/res/res/values-w205dp/dimens_material.xml
+++ b/core/res/res/values-w205dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">8.52dp</dimen>
     <dimen name="screen_percentage_05">10.25dp</dimen>
-    <dimen name="screen_percentage_052">10.66dp</dimen>
     <dimen name="screen_percentage_10">20.5dp</dimen>
-    <dimen name="screen_percentage_12">24.6dp</dimen>
     <dimen name="screen_percentage_15">30.75dp</dimen>
-    <dimen name="screen_percentage_3646">74.78dp</dimen>
 </resources>
diff --git a/core/res/res/values-w208dp/dimens_material.xml b/core/res/res/values-w208dp/dimens_material.xml
index 7f4ccd9d15cb..069eeb0ad753 100644
--- a/core/res/res/values-w208dp/dimens_material.xml
+++ b/core/res/res/values-w208dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">8.65dp</dimen>
     <dimen name="screen_percentage_05">10.4dp</dimen>
-    <dimen name="screen_percentage_052">10.82dp</dimen>
     <dimen name="screen_percentage_10">20.8dp</dimen>
-    <dimen name="screen_percentage_12">24.96dp</dimen>
     <dimen name="screen_percentage_15">31.2dp</dimen>
-    <dimen name="screen_percentage_3646">75.65dp</dimen>
 </resources>
diff --git a/core/res/res/values-w210dp-round-watch/dimens_material.xml b/core/res/res/values-w210dp-round-watch/dimens_material.xml
index ca0889e2c73b..79acf84b7e3f 100644
--- a/core/res/res/values-w210dp-round-watch/dimens_material.xml
+++ b/core/res/res/values-w210dp-round-watch/dimens_material.xml
@@ -14,14 +14,6 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">8.73dp</dimen>
-    <dimen name="screen_percentage_05">10.5dp</dimen>
-    <dimen name="screen_percentage_052">10.92dp</dimen>
-    <dimen name="screen_percentage_10">21dp</dimen>
-    <dimen name="screen_percentage_12">25.2dp</dimen>
-    <dimen name="screen_percentage_15">31.5dp</dimen>
-    <dimen name="screen_percentage_3646">76.57dp</dimen>
-
     <dimen name="text_size_display_4_material">80sp</dimen>
     <dimen name="text_size_display_3_material">50sp</dimen>
     <dimen name="text_size_display_2_material">40sp</dimen>
diff --git a/core/res/res/values-w211dp/dimens_material.xml b/core/res/res/values-w211dp/dimens_material.xml
index c483e455c5c3..bd7ca9aa9164 100644
--- a/core/res/res/values-w211dp/dimens_material.xml
+++ b/core/res/res/values-w211dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">8.77dp</dimen>
     <dimen name="screen_percentage_05">10.55dp</dimen>
-    <dimen name="screen_percentage_052">10.97dp</dimen>
     <dimen name="screen_percentage_10">21.1dp</dimen>
-    <dimen name="screen_percentage_12">25.32dp</dimen>
     <dimen name="screen_percentage_15">31.65dp</dimen>
-    <dimen name="screen_percentage_3646">76.93dp</dimen>
 </resources>
diff --git a/core/res/res/values-w213dp/dimens_material.xml b/core/res/res/values-w213dp/dimens_material.xml
index 093c298e1ac9..8a4e3a08ea13 100644
--- a/core/res/res/values-w213dp/dimens_material.xml
+++ b/core/res/res/values-w213dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">8.85dp</dimen>
     <dimen name="screen_percentage_05">10.65dp</dimen>
-    <dimen name="screen_percentage_052">11.07dp</dimen>
     <dimen name="screen_percentage_10">21.3dp</dimen>
-    <dimen name="screen_percentage_12">25.56dp</dimen>
     <dimen name="screen_percentage_15">31.95dp</dimen>
-    <dimen name="screen_percentage_3646">77.66dp</dimen>
 </resources>
diff --git a/core/res/res/values-w216dp/dimens_material.xml b/core/res/res/values-w216dp/dimens_material.xml
deleted file mode 100644
index 71dbf727480e..000000000000
--- a/core/res/res/values-w216dp/dimens_material.xml
+++ /dev/null
@@ -1,24 +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.
--->
-<resources>
-    <dimen name="screen_percentage_0416">8.99dp</dimen>
-    <dimen name="screen_percentage_05">10.8dp</dimen>
-    <dimen name="screen_percentage_052">11.23dp</dimen>
-    <dimen name="screen_percentage_10">21.6dp</dimen>
-    <dimen name="screen_percentage_12">25.92dp</dimen>
-    <dimen name="screen_percentage_15">32.4dp</dimen>
-    <dimen name="screen_percentage_3646">78.77dp</dimen>
-</resources>
diff --git a/core/res/res/values-w225dp/dimens_material.xml b/core/res/res/values-w225dp/dimens_material.xml
index 6df34a5bb0ea..aa822a32c975 100644
--- a/core/res/res/values-w225dp/dimens_material.xml
+++ b/core/res/res/values-w225dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">9.36dp</dimen>
     <dimen name="screen_percentage_05">11.25dp</dimen>
-    <dimen name="screen_percentage_052">11.7dp</dimen>
     <dimen name="screen_percentage_10">22.5dp</dimen>
-    <dimen name="screen_percentage_12">27dp</dimen>
     <dimen name="screen_percentage_15">33.75dp</dimen>
-    <dimen name="screen_percentage_3646">82.46dp</dimen>
 </resources>
diff --git a/core/res/res/values-w227dp/dimens_material.xml b/core/res/res/values-w227dp/dimens_material.xml
index bbf4924ccc23..eb4df8a225d6 100644
--- a/core/res/res/values-w227dp/dimens_material.xml
+++ b/core/res/res/values-w227dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">9.44dp</dimen>
     <dimen name="screen_percentage_05">11.35dp</dimen>
-    <dimen name="screen_percentage_052">11.8dp</dimen>
     <dimen name="screen_percentage_10">22.7dp</dimen>
-    <dimen name="screen_percentage_12">27.24dp</dimen>
     <dimen name="screen_percentage_15">34.05dp</dimen>
-    <dimen name="screen_percentage_3646">83.19dp</dimen>
 </resources>
diff --git a/core/res/res/values-w228dp/dimens_material.xml b/core/res/res/values-w228dp/dimens_material.xml
index 24bbb4c219ba..a2009754d95b 100644
--- a/core/res/res/values-w228dp/dimens_material.xml
+++ b/core/res/res/values-w228dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">9.48dp</dimen>
     <dimen name="screen_percentage_05">11.4dp</dimen>
-    <dimen name="screen_percentage_052">11.86dp</dimen>
     <dimen name="screen_percentage_10">22.8dp</dimen>
-    <dimen name="screen_percentage_12">27.36dp</dimen>
     <dimen name="screen_percentage_15">34.2dp</dimen>
-    <dimen name="screen_percentage_3646">83.55dp</dimen>
 </resources>
diff --git a/core/res/res/values-w240dp/dimens_material.xml b/core/res/res/values-w240dp/dimens_material.xml
index bd26c8bf84df..a4b58fa95c50 100644
--- a/core/res/res/values-w240dp/dimens_material.xml
+++ b/core/res/res/values-w240dp/dimens_material.xml
@@ -14,11 +14,7 @@
      limitations under the License.
 -->
 <resources>
-    <dimen name="screen_percentage_0416">9.98dp</dimen>
     <dimen name="screen_percentage_05">12dp</dimen>
-    <dimen name="screen_percentage_052">12.48dp</dimen>
     <dimen name="screen_percentage_10">24dp</dimen>
-    <dimen name="screen_percentage_12">28.8dp</dimen>
     <dimen name="screen_percentage_15">36dp</dimen>
-    <dimen name="screen_percentage_3646">87.5dp</dimen>
 </resources>
diff --git a/core/res/res/values-watch-v36/dimens_material.xml b/core/res/res/values-watch-v36/dimens_material.xml
index c80884439d69..7232786d92c9 100644
--- a/core/res/res/values-watch-v36/dimens_material.xml
+++ b/core/res/res/values-watch-v36/dimens_material.xml
@@ -22,26 +22,11 @@
     <dimen name="btn_lineHeight">18sp</dimen>
     <dimen name="btn_textSize">15sp</dimen>
 
-    <!-- values for material3 AlertDialog Title -->
-    <dimen name="alertDialog_material_line_height_title">18sp</dimen>
-    <dimen name="alertDialog_material_text_size_title">16sp</dimen>
-    <item name="alertDialog_material_letter_spacing_title" format="float" type="dimen">0.0125</item>
-    <dimen name="alertDialog_material_side_margin_title">@dimen/screen_percentage_12</dimen>
-
-    <!-- values for material3 AlertDialog Body -->
-    <dimen name="alertDialog_material_line_height_body_1">16sp</dimen>
-    <dimen name="alertDialog_material_text_size_body_1">14sp</dimen>
-    <item name="alertDialog_material_letter_spacing_body_1" format="float" type="dimen">0.0286</item>
-    <dimen name="alertDialog_material_side_margin_body">@dimen/screen_percentage_0416</dimen>
-
     <!-- values for material3 AlertDialog -->
     <dimen name="dialog_btn_negative_width">60dp</dimen>
     <dimen name="dialog_btn_negative_height">60dp</dimen>
     <dimen name="dialog_btn_confirm_width">62dp</dimen>
     <dimen name="dialog_btn_confirm_height">60dp</dimen>
-    <dimen name="alertDialog_material_side_margin">@dimen/screen_percentage_052</dimen>
-    <dimen name="alertDialog_material_top_margin">@dimen/screen_percentage_10</dimen>
-    <dimen name="alertDialog_material_bottom_margin">@dimen/screen_percentage_3646</dimen>
 
     <!-- Opacity factor for disabled material3 widget -->
     <dimen name="disabled_alpha_device_default">0.12</dimen>
diff --git a/core/res/res/values-watch-v36/styles_material.xml b/core/res/res/values-watch-v36/styles_material.xml
index 9f779990987e..fc9f669becc7 100644
--- a/core/res/res/values-watch-v36/styles_material.xml
+++ b/core/res/res/values-watch-v36/styles_material.xml
@@ -92,25 +92,4 @@
         <item name="maxHeight">@dimen/progress_bar_height</item>
         <item name="mirrorForRtl">true</item>
     </style>
-
-    <!-- TextAppearance for material3 AlertDialog Body  -->
-    <style name="TextAppearance.AlertDialog.Body1" parent="TextAppearance.Material.Body1">
-        <item name="android:fontFamily">font-family-flex-device-default</item>
-        <item name="android:fontVariationSettings">"'wdth' 90, 'wght' 450, 'ROND' 100, 'GRAD' 0"</item>
-        <item name="android:textSize">@dimen/alertDialog_material_text_size_body_1</item>
-        <item name="android:lineHeight">@dimen/alertDialog_material_line_height_body_1</item>
-        <item name="android:letterSpacing">@dimen/alertDialog_material_letter_spacing_body_1</item>
-    </style>
-
-    <!-- TextAppearance for material3 AlertDialog Title  -->
-    <style name="TextAppearance.AlertDialog.Title" parent="TextAppearance.Material.Title">
-        <item name="android:fontFamily">font-family-flex-device-default</item>
-        <item name="android:fontVariationSettings">"'wdth' 100, 'wght' 550, 'ROND' 100, 'GRAD' 0"</item>
-        <item name="android:textSize">@dimen/alertDialog_material_text_size_title</item>
-        <item name="android:lineHeight">@dimen/alertDialog_material_line_height_title</item>
-        <item name="android:letterSpacing">@dimen/alertDialog_material_letter_spacing_title</item>
-        <item name="android:maxLines">2</item>
-        <item name="android:shadowRadius">0</item>
-        <item name="android:ellipsize">end</item>
-    </style>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.3-59-g8ed1b