m3: guard wear material3 UI change for Button (7673e94f) · Commits · e / os / android_frameworks_base

core/java/android/widget/Button.java

+44 −2

Original line number	Original line	Diff line number	Diff line
	@@ -16,17 +16,22 @@

	package android.widget;		package android.widget;

	import static android.view.flags.Flags.enableArrowIconOnHoverWhenClickable;
	import static android.view.flags.Flags.FLAG_ENABLE_ARROW_ICON_ON_HOVER_WHEN_CLICKABLE;		import static android.view.flags.Flags.FLAG_ENABLE_ARROW_ICON_ON_HOVER_WHEN_CLICKABLE;
			import static android.view.flags.Flags.enableArrowIconOnHoverWhenClickable;

	import android.annotation.FlaggedApi;		import android.annotation.FlaggedApi;
			import android.app.compat.CompatChanges;
			import android.compat.annotation.ChangeId;
			import android.compat.annotation.EnabledSince;
	import android.content.Context;		import android.content.Context;
			import android.content.pm.PackageManager;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	import android.view.InputDevice;		import android.view.InputDevice;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
	import android.view.MotionEvent;		import android.view.MotionEvent;
	import android.view.PointerIcon;		import android.view.PointerIcon;
	import android.widget.RemoteViews.RemoteView;		import android.widget.RemoteViews.RemoteView;
			import android.widget.flags.Flags;

	/**		/**
	* A user interface element the user can tap or click to perform an action.		* A user interface element the user can tap or click to perform an action.
	@@ -88,6 +93,12 @@ import android.widget.RemoteViews.RemoteView;
	@RemoteView		@RemoteView
	public class Button extends TextView {		public class Button extends TextView {

			@ChangeId
			@EnabledSince(targetSdkVersion = 36)
			private static final long WEAR_MATERIAL3_BUTTON = 376561342L;

			private static Boolean sUseWearMaterial3Style;

	/**		/**
	* Simple constructor to use when creating a button from code.		* Simple constructor to use when creating a button from code.
	*		*
	@@ -118,7 +129,18 @@ public class Button extends TextView {
	* @see android.view.View#View(Context, AttributeSet)		* @see android.view.View#View(Context, AttributeSet)
	*/		*/
	public Button(Context context, AttributeSet attrs) {		public Button(Context context, AttributeSet attrs) {
	this(context, attrs, com.android.internal.R.attr.buttonStyle);		// Starting sdk 36+, wear devices will use a specific material3
			// design. The new design will be applied when all of following conditions are met:
			// 1. app target sdk is 36 or above.
			// 2. feature flag rolled-out.
			// 3. device is a watch.
			// getButtonDefaultStyleAttr and getButtonDefaultStyleRes works together to alter the UI
			// while considering the conditions above.
			// Their results are mutual exclusive. i.e. when conditions above are all true,
			// getButtonDefaultStyleRes returns non-zero value(new wear material3), abd
			// getButtonDefaultStyleAttr returns 0. Otherwise, getButtonDefaultStyleAttr returns system
			// attr com.android.internal.R.attr.buttonStyle and getButtonDefaultStyleRes returns 0.
			this(context, attrs, getButtonDefaultStyleAttr(context), getButtonDefaultStyleRes());
	}		}

	/**		/**
	@@ -189,4 +211,24 @@ public class Button extends TextView {
	}		}
	return super.onResolvePointerIcon(event, pointerIndex);		return super.onResolvePointerIcon(event, pointerIndex);
	}		}

			private static int getButtonDefaultStyleAttr(Context context) {
			sUseWearMaterial3Style = useWearMaterial3Style(context);
			if (sUseWearMaterial3Style) {
			return 0;
			}
			return com.android.internal.R.attr.buttonStyle;
			}

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

			private static boolean useWearMaterial3Style(Context context) {
			return Flags.useWearMaterial3Ui() && CompatChanges.isChangeEnabled(WEAR_MATERIAL3_BUTTON)
			&& context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_WATCH);
			}
	}		}

core/java/android/widget/flags/flags.aconfig

+9 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,3 +9,11 @@ flag {
	purpose: PURPOSE_BUGFIX		purpose: PURPOSE_BUGFIX
	}		}
	}		}

			flag {
			name: "use_wear_material3_ui"
			namespace: "wear_frameworks"
			description: "Whether enable material3 style for wear frameworks' widgets."
			is_exported: true
			bug: "369480667"
			}

core/res/res/drawable-watch-v36/btn_background_material_filled.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@
	<item>		<item>
	<shape android:shape="rectangle">		<shape android:shape="rectangle">
	<solid android:color="@color/btn_material_filled_background_color"/>		<solid android:color="@color/btn_material_filled_background_color"/>
	<corners android:radius="?android:attr/buttonCornerRadius"/>		<corners android:radius="@dimen/config_wearMaterial3_buttonCornerRadius"/>
	<size		<size
	android:width="@dimen/btn_material_width"		android:width="@dimen/btn_material_width"
	android:height="@dimen/btn_material_height" />		android:height="@dimen/btn_material_height" />

core/res/res/drawable-watch-v36/btn_background_material_filled_tonal.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -19,7 +19,7 @@
	<item>		<item>
	<shape android:shape="rectangle">		<shape android:shape="rectangle">
	<solid android:color="@color/btn_material_filled_tonal_background_color"/>		<solid android:color="@color/btn_material_filled_tonal_background_color"/>
	<corners android:radius="?android:attr/buttonCornerRadius"/>		<corners android:radius="@dimen/config_wearMaterial3_buttonCornerRadius"/>
	<size		<size
	android:width="@dimen/btn_material_width"		android:width="@dimen/btn_material_width"
	android:height="@dimen/btn_material_height" />		android:height="@dimen/btn_material_height" />

core/res/res/values-watch-v36/config.xml

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,6 @@
	-->		-->

	<resources>		<resources>
	<!-- Overrides system value -->		<dimen name="config_wearMaterial3_buttonCornerRadius">26dp</dimen>
	<dimen name="config_buttonCornerRadius">26dp</dimen>
	<dimen name="config_bottomDialogCornerRadius">18dp</dimen>		<dimen name="config_bottomDialogCornerRadius">18dp</dimen>
	</resources>		</resources>