Merge "Revert "m3: Refine AlertDialog style"" into main (052197cc) · Commits · e / os / android_frameworks_base

core/res/res/layout-round-watch/alert_dialog_title_material.xml

+22 −26

Original line number	Diff line number	Diff line
		@@ -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"
		<LinearLayout
		xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="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:adjustViewBounds="true">

		<ImageView
		android:id="@+id/icon"
		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:layout_gravity="center_horizontal"
		android:layout_marginBottom="8dp"
		android:maxHeight="32dp"
		android:maxWidth="32dp"
		android:src="@null" />
		</FrameLayout>

		<TextView
		android:id="@+id/alertTitle"
		<TextView android:id="@+id/alertTitle"
		style="?android:attr/windowTitleStyle"
		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" />
		android:layout_height="wrap_content" />
		</LinearLayout>

core/res/res/layout-watch-v36/alert_dialog_wear_material3.xml

+60 −85

Original line number	Diff line number	Diff line
		@@ -16,72 +16,56 @@

		<!-- 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_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"
		<include android:id="@+id/title_template"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		android:layout_height="wrap_content"
		layout="@layout/alert_dialog_title_material"/>
		</FrameLayout>

		<!-- Content Panel -->
		<FrameLayout
		android:id="@+id/contentPanel"
		<FrameLayout android:id="@+id/contentPanel"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:paddingTop="12dp">

		<TextView
		android:id="@+id/message"
		android:clipToPadding="false">
		<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" />
		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"
		<FrameLayout android:id="@+id/customPanel"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:minHeight="64dp">

		<FrameLayout
		android:id="@+android:id/custom"
		<FrameLayout android:id="@+android:id/custom"
		android:layout_width="match_parent"
		android:layout_height="wrap_content" />
		</FrameLayout>
		@@ -89,50 +73,41 @@
		<!-- 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: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_marginTop="4dp"
		android:layout_gravity="center"
		android:gravity="center" />

		<Button
		android:id="@+id/button3"
		style="?android:attr/buttonBarButtonStyle"
		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: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>

core/res/res/values-w192dp/dimens_material.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -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>

core/res/res/values-w195dp/dimens_material.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -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>

core/res/res/values-w198dp/dimens_material.xml

+0 −4

Original line number	Diff line number	Diff line
		@@ -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>