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

Commit 4b5ffe3d authored by Matías Hernández's avatar Matías Hernández Committed by Android (Google) Code Review
Browse files

Merge "Change default max digits of MetricStyle FixedFloat" into main

parents e6ce0867 f1ac2257

core/api/test-current.txt

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ package android.app { 
  }



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

    field public static final int DEFAULT_MAX_FRACTION_DIGITS = 3; // 0x3

    field public static final int DEFAULT_MAX_FRACTION_DIGITS = 2; // 0x2

    field public static final int DEFAULT_MIN_FRACTION_DIGITS = 0; // 0x0

  }

core/java/android/app/Notification.java

+2 −2
Original line number Diff line number Diff line
@@ -12690,7 +12690,7 @@ public class Notification implements Parcelable 
            private static final int LOWER_BOUND_FRACTION_DIGITS = 0;

            private static final int UPPER_BOUND_FRACTION_DIGITS = 6;

            /** @hide */ @TestApi public static final int DEFAULT_MIN_FRACTION_DIGITS = 0;

            /** @hide */ @TestApi public static final int DEFAULT_MAX_FRACTION_DIGITS = 3;

            /** @hide */ @TestApi public static final int DEFAULT_MAX_FRACTION_DIGITS = 2;















            private static final String KEY_VALUE = "value";















            private static final String KEY_UNIT = "unit";









@@ -12711,7 +12711,7 @@ public class Notification implements Parcelable













            }





























            /**













             * Creates a {@link FixedFloat} instance with 0 minimum and 3 maximum fractional digits.













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

























core/tests/coretests/src/android/app/NotificationMetricStyleTest.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -414,7 +414,7 @@ public class NotificationMetricStyleTest {













    public void valueToString_fixedFloat() {















        FixedFloat defaultDigits = new FixedFloat(1612.3456789f);















        assertThat(defaultDigits.toValueString(mContext)).isEqualTo(













                new ValueString("1,612.346", null));













                new ValueString("1,612.35", null));































        FixedFloat minDigits = new FixedFloat(42, "km", 2, 4);















        assertThat(minDigits.toValueString(mContext)).isEqualTo(new ValueString("42.00", "km"));