Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0a6aaae authored by Matías Hernández's avatar Matías Hernández
Browse files

Change strings in MetricStyle to CharSequence 

While still converting them to strings internally, dropping any and all spans. This leaves us the possibility of actually using rich formatting in the future, without breaking the API.

Bug: 415827681
Test: atest NotificationMetricStyleTest
Flag: android.app.api_metric_style
Change-Id: I9a06cce762d67396180c28df877cdc9cdd770405
parent 0e8f3fd3

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())) {










@@ -11931,9 +11940,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");















        }
























@@ -11993,7 +12002,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;















        }
























@@ -12619,9 +12628,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










@@ -12671,7 +12680,7 @@ public class Notification implements Parcelable













             * this to just a few characters.















             */















            @Nullable













            public String getUnit() {













            public CharSequence getUnit() {















                return mUnit;















            }
























@@ -12714,7 +12723,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);















            }























@@ -12727,13 +12736,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,










@@ -12805,7 +12814,7 @@ public class Notification implements Parcelable













             * just a few characters.















             */















            @Nullable













            public String getUnit() {













            public CharSequence getUnit() {















                return mUnit;















            }
























@@ -12846,7 +12855,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);















            }























@@ -12855,9 +12864,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










@@ -12897,7 +12906,7 @@ public class Notification implements Parcelable



























            /** The string value. */















            @NonNull













            public String getValue() {













            public CharSequence getValue() {















                return mValue;















            }























@@ -12910,7 +12919,7 @@ public class Notification implements Parcelable













             * this to just a few characters.















             */















            @Nullable













            public String getUnit() {













            public CharSequence getUnit() {















                return mUnit;















            }