Merge "[AnimatedAction] Rename the new smart actions to "animated action" ." into main (2a20688d) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -1983,7 +1983,7 @@ public class Notification implements Parcelable
		* treatment.
		* @hide
		*/
		public static final String EXTRA_IS_MAGIC = "android.extra.IS_MAGIC";
		public static final String EXTRA_IS_ANIMATED = "android.extra.IS_ANIMATED";

		private final Bundle mExtras;
		@UnsupportedAppUsage(maxTargetSdk = Build.VERSION_CODES.P, trackingBug = 115609023)

+7 −0

Original line number	Diff line number	Diff line
		@@ -2000,6 +2000,13 @@ flag {
		bug: "383567383"
		}

		flag {
		name: "notification_animated_actions_treatment"
		namespace: "systemui"
		description: "Special UI treatment for animated actions and replys"
		bug: "383567383"
		}

		flag {
		name: "show_audio_sharing_slider_in_volume_panel"
		namespace: "cross_device_experiences"

+2 −2

Original line number	Diff line number	Diff line
		@@ -10,10 +10,10 @@
		android:insetRight="0dp"
		android:insetTop="8dp">
		<shape android:shape="rectangle">
		<corners android:radius="@dimen/magic_action_button_corner_radius" />
		<corners android:radius="@dimen/animated_action_button_corner_radius" />
		<solid android:color="@androidprv:color/materialColorPrimaryContainer" />
		<stroke
		android:width="@dimen/magic_action_button_outline_stroke_width"
		android:width="@dimen/animated_action_button_outline_stroke_width"
		android:color="@androidprv:color/materialColorOutlineVariant" />
		</shape>
		</inset>

+17 −0

Original line number	Diff line number	Diff line
		<com.android.systemui.statusbar.notification.row.MagicActionButton
		<com.android.systemui.statusbar.notification.row.AnimatedActionButton
		xmlns:android="http://schemas.android.com/apk/res/android"
		style="@android:style/Widget.Material.Button"
		android:layout_width="wrap_content"
		android:layout_height="@dimen/magic_action_button_touch_target_height"
		android:background="@drawable/magic_action_button_background"
		android:drawablePadding="@dimen/magic_action_button_drawable_padding"
		android:layout_height="@dimen/animated_action_button_touch_target_height"
		android:background="@drawable/animated_action_button_background"
		android:drawablePadding="@dimen/animated_action_button_drawable_padding"
		android:ellipsize="none"
		android:fontFamily="google-sans-flex-medium"
		android:gravity="center"
		android:minWidth="0dp"
		android:paddingHorizontal="@dimen/magic_action_button_padding_horizontal"
		android:paddingVertical="@dimen/magic_action_button_inset_vertical"
		android:paddingHorizontal="@dimen/animated_action_button_padding_horizontal"
		android:paddingVertical="@dimen/animated_action_button_inset_vertical"
		android:stateListAnimator="@null"
		android:textColor="@color/magic_action_button_text_color"
		android:textSize="@dimen/magic_action_button_font_size"
		android:textColor="@color/animated_action_button_text_color"
		android:textSize="@dimen/animated_action_button_font_size"
		android:textStyle="normal" />

+3 −3

Original line number	Diff line number	Diff line
		@@ -145,9 +145,9 @@
		<color name="smart_reply_button_background">#ffffffff</color>
		<color name="smart_reply_button_stroke">@*android:color/accent_device_default</color>

		<!-- Magic Action colors -->
		<color name="magic_action_button_text_color">@androidprv:color/materialColorOnSurface</color>
		<color name="magic_action_button_stroke_color">@androidprv:color/materialColorOnSurface</color>
		<!-- Animated Action colors -->
		<color name="animated_action_button_text_color">@androidprv:color/materialColorOnSurface</color>
		<color name="animated_action_button_stroke_color">@androidprv:color/materialColorOnSurface</color>

		<!-- Biometric dialog colors -->
		<color name="biometric_dialog_gray">#ff757575</color>