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

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

Merge changes from topic "metric-noinstant" into main 

* changes:
  Initial pieces of MetricStyle layouts
  Replace FixedInstant by FixedDate + FixedTime
parents d634c46b 1b570f51

core/api/current.txt

+17 −18
Original line number Diff line number Diff line
@@ -7043,6 +7043,16 @@ package android.app { 
    field public static final int MEANING_WEATHER_UV_INDEX = 327682; // 0x50002

  }













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













    ctor public Notification.Metric.FixedDate(@NonNull java.time.LocalDate);













    ctor public Notification.Metric.FixedDate(@NonNull java.time.LocalDate, int);













    method public int getFormat();













    method @NonNull public java.time.LocalDate getValue();













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













    field public static final int FORMAT_LONG_DATE = 1; // 0x1













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













  }



























  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);









@@ -7053,21 +7063,6 @@ package android.app {













    method public float getValue();















  }



























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













    ctor public Notification.Metric.FixedInstant(@NonNull java.time.Instant);













    ctor public Notification.Metric.FixedInstant(@NonNull java.time.Instant, int);













    ctor public Notification.Metric.FixedInstant(@NonNull java.time.Instant, int, @Nullable java.util.TimeZone);













    method public int getFormat();













    method @Nullable public java.util.TimeZone getTimeZone();













    method @NonNull public java.time.Instant getValue();













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













    field public static final int FORMAT_LONG_DATE = 1; // 0x1













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













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













    field public static final int FORMAT_SHORT_DATE_TIME = 4; // 0x4













    field public static final int FORMAT_TIME = 5; // 0x5













  }



























  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);









@@ -7080,6 +7075,11 @@ package android.app {













    method @NonNull public String getValue();















  }



























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













    ctor public Notification.Metric.FixedTime(@NonNull java.time.LocalTime);













    method @NonNull public java.time.LocalTime getValue();













  }



























  public abstract static class Notification.Metric.MetricValue {















  }























@@ -7094,9 +7094,8 @@ package android.app {













    method public boolean isStopwatch();















    method public boolean isTimer();















    field public static final int FORMAT_ADAPTIVE = 1; // 0x1













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













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













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













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













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















  }





























  @FlaggedApi("android.app.api_metric_style") public static class Notification.MetricStyle extends android.app.Notification.Style {

























core/java/android/app/Notification.java



+377
−112


























File changed.
Preview size limit exceeded, changes collapsed.
























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



+386
−5


























File changed.
Preview size limit exceeded, changes collapsed.
























services/tests/uiservicestests/src/com/android/server/notification/NotificationVisitUrisTest.java



+4
−2




























Original line number
Diff line number
Diff line








@@ -77,6 +77,8 @@ import java.lang.reflect.ParameterizedType;













import java.lang.reflect.Type;















import java.time.Duration;















import java.time.Instant;













import java.time.LocalDate;













import java.time.LocalTime;















import java.util.ArrayList;















import java.util.Arrays;















import java.util.Comparator;









@@ -84,7 +86,6 @@ import java.util.HashSet;













import java.util.List;















import java.util.Optional;















import java.util.Set;













import java.util.TimeZone;















import java.util.concurrent.ThreadLocalRandom;















import java.util.function.Consumer;















import java.util.stream.Collectors;










@@ -687,7 +688,8 @@ public class NotificationVisitUrisTest extends UiServiceTestCase {













                        .put(char.class, 'N')















                        .put(Instant.class, Instant.ofEpochMilli(1747306630000L))















                        .put(Duration.class, Duration.ofSeconds(10))













                        .put(TimeZone.class, TimeZone.getDefault())













                        .put(LocalDate.class, LocalDate.of(1789, 7, 14))













                        .put(LocalTime.class, LocalTime.of(17, 0))















                        .build();































        private final Context mContext;