Merge "m3: move WearMaterial3 to Material3 to be more generic" into main (aa97128b) · Commits · e / os / android_frameworks_base

core/java/android/widget/Button.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -223,7 +223,7 @@ public class Button extends TextView {

	private static int getButtonDefaultStyleRes() {		private static int getButtonDefaultStyleRes() {
	if (sUseWearMaterial3Style != null && sUseWearMaterial3Style) {		if (sUseWearMaterial3Style != null && sUseWearMaterial3Style) {
	return com.android.internal.R.style.Widget_DeviceDefault_Button_WearMaterial3;		return com.android.internal.R.style.Widget_Material3_Button;
	}		}
	return 0;		return 0;
	}		}

core/java/com/android/internal/app/AlertController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -258,7 +258,7 @@ public class AlertController {

	private int getAlertDialogDefStyleRes() {		private int getAlertDialogDefStyleRes() {
	if (sUseWearMaterial3Style) {		if (sUseWearMaterial3Style) {
	return com.android.internal.R.style.AlertDialog_DeviceDefault_WearMaterial3;		return com.android.internal.R.style.AlertDialog_Material3;
	}		}
	return 0;		return 0;
	}		}

core/res/res/layout/alert_dialog_watch.xml

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -103,7 +103,7 @@
	<!-- Positive Button -->		<!-- Positive Button -->
	<Button		<Button
	android:id="@+id/button1"		android:id="@+id/button1"
	style="@*android:style/Widget.DeviceDefault.Button.Filled"		style="@*android:style/Widget.Material3.Button.Filled"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="match_parent"		android:layout_height="match_parent"
	android:layout_gravity="center"		android:layout_gravity="center"
	@@ -111,7 +111,7 @@
	<!--Neutral Button -->		<!--Neutral Button -->
	<Button		<Button
	android:id="@+id/button3"		android:id="@+id/button3"
	style="@*android:style/Widget.DeviceDefault.Button.WearMaterial3"		style="@*android:style/Widget.Material3.Button"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_gravity="center"		android:layout_gravity="center"
	@@ -119,7 +119,7 @@
	<!-- Negative Button -->		<!-- Negative Button -->
	<Button		<Button
	android:id="@+id/button2"		android:id="@+id/button2"
	style="@*android:style/Widget.DeviceDefault.Button.WearMaterial3"		style="@*android:style/Widget.Material3.Button"
	android:layout_width="wrap_content"		android:layout_width="wrap_content"
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:layout_marginTop="4dp"		android:layout_marginTop="4dp"

core/res/res/values-watch/styles_device_defaults.xml

+0 −49

Original line number	Original line	Diff line number	Diff line
	@@ -37,55 +37,6 @@
	<item name="layout">@layout/watch_base_error_dialog</item>		<item name="layout">@layout/watch_base_error_dialog</item>
	</style>		</style>

	<!-- Button Styles -->
	<!-- Material Button - Filled (primary colored) -->
	<style name="Widget.DeviceDefault.Button.Filled" parent="Widget.DeviceDefault.Button.WearMaterial3">
	<item name="android:background">@drawable/btn_background_material_filled_watch</item>
	<item name="textAppearance">@style/TextAppearance.Widget.Button.Material.Filled</item>
	</style>

	<!-- Material Button - Filled Tonal (Override system default button styles) -->
	<style name="Widget.DeviceDefault.Button.WearMaterial3">
	<item name="background">@drawable/btn_background_material_filled_tonal_watch</item>
	<item name="textAppearance">@style/TextAppearance.Widget.Button.Material</item>
	<item name="minHeight">@dimen/btn_material_height</item>
	<item name="maxWidth">@dimen/btn_material_width</item>
	<item name="android:paddingStart">@dimen/btn_horizontal_edge_padding</item>
	<item name="android:paddingEnd">@dimen/btn_horizontal_edge_padding</item>
	<item name="android:drawablePadding">@dimen/btn_drawable_padding</item>
	<item name="android:maxLines">2</item>
	<item name="android:ellipsize">end</item>
	<item name="android:breakStrategy">simple</item>
	<item name="stateListAnimator">@anim/button_state_list_anim_material</item>
	<item name="focusable">true</item>
	<item name="clickable">true</item>
	<item name="gravity">center_vertical</item>
	</style>

	<!-- Wear Material3 Button - Outlined -->
	<style name="Widget.DeviceDefault.Button.Outlined" parent="Widget.DeviceDefault.Button.WearMaterial3">
	<item name="android:background">@drawable/btn_background_material_outlined_watch</item>
	</style>

	<!-- Wear Material3 Button - Text -->
	<style name="Widget.DeviceDefault.Button.Text" parent="Widget.DeviceDefault.Button.WearMaterial3">
	<item name="android:background">@drawable/btn_background_material_text_watch</item>
	</style>

	<!-- Wear Material3 AlertDialog Styles -->
	<style name="AlertDialog.DeviceDefault.WearMaterial3">
	<item name="layout">@layout/alert_dialog_watch</item>
	</style>

	<!-- Wear Material3 Progress Bar style: progressed ring.-->
	<style name="Widget.DeviceDefault.ProgressBar.WearMaterial3">
	<item name="indeterminateOnly">false</item>
	<item name="progressDrawable">@drawable/progress_ring_watch</item>
	<item name="minHeight">@dimen/progress_bar_height</item>
	<item name="maxHeight">@dimen/progress_bar_height</item>
	<item name="mirrorForRtl">true</item>
	</style>

	<style name="Widget.DeviceDefault.ProgressBar" parent="Widget.Material.ProgressBar">		<style name="Widget.DeviceDefault.ProgressBar" parent="Widget.Material.ProgressBar">
	<!-- Allow determinate option -->		<!-- Allow determinate option -->
	<item name="indeterminateOnly">false</item>		<item name="indeterminateOnly">false</item>

core/res/res/values-watch/styles_material3.xml

0 → 100644

+61 −0

Original line number	Original line	Diff line number	Diff line
			<!--
			~ 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>
			<style name="Widget.Material3" parent="Widget.DeviceDefault"/>

			<!-- Wear Material3 Button Styles -->
			<style name="Widget.Material3.Button">
			<item name="background">@drawable/btn_background_material_filled_tonal_watch</item>
			<item name="textAppearance">@style/TextAppearance.Widget.Material3.Button</item>
			<item name="minHeight">@dimen/btn_material_height</item>
			<item name="maxWidth">@dimen/btn_material_width</item>
			<item name="android:paddingStart">@dimen/btn_horizontal_edge_padding</item>
			<item name="android:paddingEnd">@dimen/btn_horizontal_edge_padding</item>
			<item name="android:drawablePadding">@dimen/btn_drawable_padding</item>
			<item name="android:maxLines">2</item>
			<item name="android:ellipsize">end</item>
			<item name="android:breakStrategy">simple</item>
			<item name="stateListAnimator">@anim/button_state_list_anim_material</item>
			<item name="focusable">true</item>
			<item name="clickable">true</item>
			<item name="gravity">center_vertical</item>
			</style>

			<!-- Wear Material3 Button - Filled (primary colored) -->
			<style name="Widget.Material3.Button.Filled">
			<item name="android:background">@drawable/btn_background_material_filled_watch</item>
			<item name="textAppearance">@style/TextAppearance.Widget.Material3.Button.Filled</item>
			</style>

			<!-- Wear Material3 Button - Filled Tonal (Override system default button styles) -->
			<style name="Widget.Material3.Button.FilledTonal"/>

			<!-- Wear Material3 Button - Outlined -->
			<style name="Widget.Material3.Button.Outlined">
			<item name="android:background">@drawable/btn_background_material_outlined_watch</item>
			</style>

			<!-- Wear Material3 Button - Text -->
			<style name="Widget.Material3.Button.Text">
			<item name="android:background">@drawable/btn_background_material_text_watch</item>
			</style>

			<!-- Wear Material3 AlertDialog Styles -->
			<style name="AlertDialog.Material3">
			<item name="layout">@layout/alert_dialog_watch</item>
			</style>
			</resources>
			No newline at end of file