Merge "Change strings in MetricStyle to CharSequence" into main (dbc94800) · Commits · e / os / android_frameworks_base

core/api/current.txt

+11 −11

Original line number	Diff line number	Diff line
		@@ -6994,8 +6994,8 @@ package android.app {
		}

		@FlaggedApi("android.app.api_metric_style") public static final class Notification.Metric {
		ctor public Notification.Metric(@NonNull android.app.Notification.Metric.MetricValue, @NonNull String);
		method @NonNull public String getLabel();
		ctor public Notification.Metric(@NonNull android.app.Notification.Metric.MetricValue, @NonNull CharSequence);
		method @NonNull public CharSequence getLabel();
		method @NonNull public android.app.Notification.Metric.MetricValue getValue();
		}

		@@ -7011,26 +7011,26 @@ package android.app {

		public static final class Notification.Metric.FixedFloat extends android.app.Notification.Metric.MetricValue {
		ctor public Notification.Metric.FixedFloat(float);
		ctor public Notification.Metric.FixedFloat(float, @Nullable String);
		ctor public Notification.Metric.FixedFloat(float, @Nullable String, @IntRange(from=0x0, to=0x6) int, @IntRange(from=0x0, to=0x6) int);
		ctor public Notification.Metric.FixedFloat(float, @Nullable CharSequence);
		ctor public Notification.Metric.FixedFloat(float, @Nullable CharSequence, @IntRange(from=0x0, to=0x6) int, @IntRange(from=0x0, to=0x6) int);
		method @IntRange(from=0x0, to=0x6) public int getMaxFractionDigits();
		method @IntRange(from=0x0, to=0x6) public int getMinFractionDigits();
		method @Nullable public String getUnit();
		method @Nullable public CharSequence getUnit();
		method public float getValue();
		}

		public static final class Notification.Metric.FixedInt extends android.app.Notification.Metric.MetricValue {
		ctor public Notification.Metric.FixedInt(int);
		ctor public Notification.Metric.FixedInt(int, @Nullable String);
		method @Nullable public String getUnit();
		ctor public Notification.Metric.FixedInt(int, @Nullable CharSequence);
		method @Nullable public CharSequence getUnit();
		method public int getValue();
		}

		public static final class Notification.Metric.FixedString extends android.app.Notification.Metric.MetricValue {
		ctor public Notification.Metric.FixedString(@NonNull String);
		ctor public Notification.Metric.FixedString(@NonNull String, @Nullable String);
		method @Nullable public String getUnit();
		method @NonNull public String getValue();
		ctor public Notification.Metric.FixedString(@NonNull CharSequence);
		ctor public Notification.Metric.FixedString(@NonNull CharSequence, @Nullable CharSequence);
		method @Nullable public CharSequence getUnit();
		method @NonNull public CharSequence getValue();
		}

		public static final class Notification.Metric.FixedTime extends android.app.Notification.Metric.MetricValue {

core/java/android/app/Notification.java

+26 −17

Original line number	Diff line number	Diff line
		@@ -3510,6 +3510,15 @@ public class Notification implements Parcelable
		return str;
		}

		/**
		* Convert the CharSequence to a string and meke it is safe to put into a bundle.
		* @hide
		*/
		public static String safeCharSequenceToString(CharSequence cs) {
		if (cs == null) return null;
		return safeString(cs.toString());
		}

		/**
		* Make sure this CharSequence is safe to put into a bundle, which basically
		* means it had better not be some custom Parcelable implementation.
		@@ -11821,7 +11830,7 @@ public class Notification implements Parcelable
		final Metric.MetricValue.ValueString valueString = metricValue.toValueString(
		mBuilder.mContext);

		final String metricLabel;
		final CharSequence metricLabel;
		if (isExpandedView) {
		if (Flags.metricStyleUnitInLabel()
		&& !TextUtils.isEmpty(valueString.subtext())) {
		@@ -11933,9 +11942,9 @@ public class Notification implements Parcelable
		* @param value one of the subclasses of {@link MetricValue}, such as {@link FixedInt}
		* @param label metric label -- should be 10 characters or fewer
		*/
		public Metric(@NonNull MetricValue value, @NonNull String label) {
		public Metric(@NonNull MetricValue value, @NonNull CharSequence label) {
		mValue = requireNonNull(value);
		mLabel = safeString(requireNonNull(label));
		mLabel = safeCharSequenceToString(requireNonNull(label));
		checkArgument(!mLabel.isBlank(), "Metric label is required");
		}

		@@ -11995,7 +12004,7 @@ public class Notification implements Parcelable
		* notification, but it's recommended to keep this to 10 characters or fewer.
		*/
		@NonNull
		public String getLabel() {
		public CharSequence getLabel() {
		return mLabel;
		}

		@@ -12621,9 +12630,9 @@ public class Notification implements Parcelable
		*
		* @param unit optional unit for the value. Limit this to a few characters.
		*/
		public FixedInt(int value, @Nullable String unit) {
		public FixedInt(int value, @Nullable CharSequence unit) {
		mValue = value;
		mUnit = safeString(unit);
		mUnit = safeCharSequenceToString(unit);
		}

		@NonNull
		@@ -12673,7 +12682,7 @@ public class Notification implements Parcelable
		* this to just a few characters.
		*/
		@Nullable
		public String getUnit() {
		public CharSequence getUnit() {
		return mUnit;
		}

		@@ -12716,7 +12725,7 @@ public class Notification implements Parcelable
		* Creates a {@link FixedFloat} instance with 0 minimum and 2 maximum fractional digits.
		* @param unit optional unit for the value. Limit this to a few characters.
		*/
		public FixedFloat(float value, @Nullable String unit) {
		public FixedFloat(float value, @Nullable CharSequence unit) {
		this(value, unit, DEFAULT_MIN_FRACTION_DIGITS, DEFAULT_MAX_FRACTION_DIGITS);
		}

		@@ -12729,13 +12738,13 @@ public class Notification implements Parcelable
		* @throws IllegalArgumentException if {@code minFractionDigits} or {@code
		* maxFractionDigits} do not respect the specified constraints
		*/
		public FixedFloat(float value, @Nullable String unit,
		public FixedFloat(float value, @Nullable CharSequence unit,
		@IntRange(from = LOWER_BOUND_FRACTION_DIGITS, to =
		UPPER_BOUND_FRACTION_DIGITS) int minFractionDigits,
		@IntRange(from = LOWER_BOUND_FRACTION_DIGITS, to =
		UPPER_BOUND_FRACTION_DIGITS) int maxFractionDigits) {
		mValue = value;
		mUnit = safeString(unit);
		mUnit = safeCharSequenceToString(unit);

		checkArgument(minFractionDigits >= LOWER_BOUND_FRACTION_DIGITS
		&& minFractionDigits <= UPPER_BOUND_FRACTION_DIGITS,
		@@ -12807,7 +12816,7 @@ public class Notification implements Parcelable
		* just a few characters.
		*/
		@Nullable
		public String getUnit() {
		public CharSequence getUnit() {
		return mUnit;
		}

		@@ -12848,7 +12857,7 @@ public class Notification implements Parcelable
		/**
		* Creates a {@link FixedString} instance with the specified String.
		*/
		public FixedString(@NonNull String value) {
		public FixedString(@NonNull CharSequence value) {
		this(value, null);
		}

		@@ -12857,9 +12866,9 @@ public class Notification implements Parcelable
		*
		* @param unit optional unit for the value. Limit this to a few characters.
		*/
		public FixedString(@NonNull String value, @Nullable String unit) {
		mValue = safeString(requireNonNull(value));
		mUnit = safeString(unit);
		public FixedString(@NonNull CharSequence value, @Nullable CharSequence unit) {
		mValue = safeCharSequenceToString(requireNonNull(value));
		mUnit = safeCharSequenceToString(unit);
		}

		@NonNull
		@@ -12899,7 +12908,7 @@ public class Notification implements Parcelable

		/** The string value. */
		@NonNull
		public String getValue() {
		public CharSequence getValue() {
		return mValue;
		}

		@@ -12912,7 +12921,7 @@ public class Notification implements Parcelable
		* this to just a few characters.
		*/
		@Nullable
		public String getUnit() {
		public CharSequence getUnit() {
		return mUnit;
		}