Make Duration an inline class
Bug: 147515966
Relnote: Duration is now an inline class
Test: All ui-unit tests
Change-Id: I565eb86145c866c18ceb35fc6b4065aba0ceb25f
diff --git a/compose/ui/ui-unit/api/current.txt b/compose/ui/ui-unit/api/current.txt
index 9f3c83d..de13c6f 100644
--- a/compose/ui/ui-unit/api/current.txt
+++ b/compose/ui/ui-unit/api/current.txt
@@ -195,58 +195,62 @@
method @androidx.compose.runtime.Stable public static String toString-impl(float $this);
}
- @androidx.compose.runtime.Immutable public final class Duration implements java.lang.Comparable<androidx.compose.ui.unit.Duration> {
- ctor public Duration(long nanoseconds);
- method @androidx.compose.runtime.Stable public int compareTo(androidx.compose.ui.unit.Duration other);
- method public long component1();
- method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.Duration copy(long nanoseconds);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration div(int quotient);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration div(double quotient);
+ @androidx.compose.runtime.Immutable public final inline class Duration implements java.lang.Comparable<androidx.compose.ui.unit.Duration> {
+ ctor public Duration();
+ method @androidx.compose.runtime.Stable public int compareTo-WUeva1s(long p);
+ method @androidx.compose.runtime.Stable public static int compareTo-WUeva1s(long $this, long other);
+ method public static long constructor-impl(long nanoseconds);
+ method @androidx.compose.runtime.Stable public static operator long div-impl(long $this, int quotient);
+ method @androidx.compose.runtime.Stable public static operator long div-impl(long $this, double quotient);
+ method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+ method public static boolean equals-impl0(long p1, long p2);
method public long getNanoseconds();
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration minus(androidx.compose.ui.unit.Duration other);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration plus(androidx.compose.ui.unit.Duration other);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration times(int factor);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration times(double factor);
+ method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+ method @androidx.compose.runtime.Stable public static operator long minus-WUeva1s(long $this, long other);
+ method @androidx.compose.runtime.Stable public static operator long plus-WUeva1s(long $this, long other);
+ method @androidx.compose.runtime.Stable public static operator long times-impl(long $this, int factor);
+ method @androidx.compose.runtime.Stable public static operator long times-impl(long $this, double factor);
+ method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
field public static final androidx.compose.ui.unit.Duration.Companion Companion;
}
public static final class Duration.Companion {
- method public androidx.compose.ui.unit.Duration getZero();
- property public final androidx.compose.ui.unit.Duration Zero;
+ method public long getZero();
+ property public final long Zero;
}
public final class Durations {
- method public static androidx.compose.ui.unit.Duration Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
- method public static androidx.compose.ui.unit.Duration getDays(long);
- method public static androidx.compose.ui.unit.Duration getDays(int);
- method public static androidx.compose.ui.unit.Duration getHours(long);
- method public static androidx.compose.ui.unit.Duration getHours(int);
- method public static androidx.compose.ui.unit.Duration getMicroseconds(long);
- method public static androidx.compose.ui.unit.Duration getMicroseconds(int);
- method public static androidx.compose.ui.unit.Duration getMilliseconds(long);
- method public static androidx.compose.ui.unit.Duration getMilliseconds(int);
- method public static androidx.compose.ui.unit.Duration getMinutes(long);
- method public static androidx.compose.ui.unit.Duration getMinutes(int);
- method public static androidx.compose.ui.unit.Duration getNanoseconds(long);
- method public static androidx.compose.ui.unit.Duration getNanoseconds(int);
- method public static long getNanosecondsPerDay();
- method public static long getNanosecondsPerHour();
- method public static long getNanosecondsPerMillisecond();
- method public static long getNanosecondsPerMinute();
- method public static long getNanosecondsPerSecond();
- method public static androidx.compose.ui.unit.Duration getSeconds(long);
- method public static androidx.compose.ui.unit.Duration getSeconds(int);
- method public static long inDays(androidx.compose.ui.unit.Duration);
- method public static long inHours(androidx.compose.ui.unit.Duration);
- method public static long inMicroseconds(androidx.compose.ui.unit.Duration);
- method public static long inMilliseconds(androidx.compose.ui.unit.Duration);
- method public static long inMinutes(androidx.compose.ui.unit.Duration);
- method public static long inSeconds(androidx.compose.ui.unit.Duration);
+ method public static long Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
+ method public static inline long getDays(long);
+ method public static inline long getDays(int);
+ method public static inline long getHours(long);
+ method public static inline long getHours(int);
+ method public static inline long getMicroseconds(long);
+ method public static inline long getMicroseconds(int);
+ method public static inline long getMilliseconds(long);
+ method public static inline long getMilliseconds(int);
+ method public static inline long getMinutes(long);
+ method public static inline long getMinutes(int);
+ method public static inline long getNanoseconds(long);
+ method public static inline long getNanoseconds(int);
+ method public static inline long getSeconds(long);
+ method public static inline long getSeconds(int);
+ method public static inline long inDays-WUeva1s(long);
+ method public static inline long inHours-WUeva1s(long);
+ method public static inline long inMicroseconds-WUeva1s(long);
+ method public static inline long inMilliseconds-WUeva1s(long);
+ method public static inline long inMinutes-WUeva1s(long);
+ method public static inline long inSeconds-WUeva1s(long);
field public static final long HoursPerDay = 24L; // 0x18L
field public static final long MicrosecondsPerMillisecond = 1000L; // 0x3e8L
field public static final long MillisecondsPerSecond = 1000L; // 0x3e8L
field public static final long MinutesPerHour = 60L; // 0x3cL
+ field public static final long NanosecondsPerDay = 86400000000000L; // 0x4e94914f0000L
+ field public static final long NanosecondsPerHour = 3600000000000L; // 0x34630b8a000L
field public static final long NanosecondsPerMicrosecond = 1000L; // 0x3e8L
+ field public static final long NanosecondsPerMillisecond = 1000000L; // 0xf4240L
+ field public static final long NanosecondsPerMinute = 60000000000L; // 0xdf8475800L
+ field public static final long NanosecondsPerSecond = 1000000000L; // 0x3b9aca00L
field public static final long SecondsPerMinute = 60L; // 0x3cL
}
@@ -515,9 +519,9 @@
method public long component1();
method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.Uptime copy(long nanoseconds);
method public long getNanoseconds();
- method public operator androidx.compose.ui.unit.Uptime minus(androidx.compose.ui.unit.Duration duration);
- method public operator androidx.compose.ui.unit.Duration minus(androidx.compose.ui.unit.Uptime other);
- method public operator androidx.compose.ui.unit.Uptime plus(androidx.compose.ui.unit.Duration duration);
+ method public operator long minus(androidx.compose.ui.unit.Uptime other);
+ method public operator androidx.compose.ui.unit.Uptime minus-WUeva1s(long duration);
+ method public operator androidx.compose.ui.unit.Uptime plus-WUeva1s(long duration);
field public static final androidx.compose.ui.unit.Uptime.Companion Companion;
}
@@ -527,7 +531,7 @@
}
public final class UptimeKt {
- method public static operator androidx.compose.ui.unit.Uptime plus(androidx.compose.ui.unit.Duration, androidx.compose.ui.unit.Uptime uptime);
+ method public static operator androidx.compose.ui.unit.Uptime plus-I3RPvYE(long, androidx.compose.ui.unit.Uptime uptime);
}
@androidx.compose.runtime.Immutable public final class Velocity {
diff --git a/compose/ui/ui-unit/api/public_plus_experimental_current.txt b/compose/ui/ui-unit/api/public_plus_experimental_current.txt
index 9f3c83d..de13c6f 100644
--- a/compose/ui/ui-unit/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui-unit/api/public_plus_experimental_current.txt
@@ -195,58 +195,62 @@
method @androidx.compose.runtime.Stable public static String toString-impl(float $this);
}
- @androidx.compose.runtime.Immutable public final class Duration implements java.lang.Comparable<androidx.compose.ui.unit.Duration> {
- ctor public Duration(long nanoseconds);
- method @androidx.compose.runtime.Stable public int compareTo(androidx.compose.ui.unit.Duration other);
- method public long component1();
- method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.Duration copy(long nanoseconds);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration div(int quotient);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration div(double quotient);
+ @androidx.compose.runtime.Immutable public final inline class Duration implements java.lang.Comparable<androidx.compose.ui.unit.Duration> {
+ ctor public Duration();
+ method @androidx.compose.runtime.Stable public int compareTo-WUeva1s(long p);
+ method @androidx.compose.runtime.Stable public static int compareTo-WUeva1s(long $this, long other);
+ method public static long constructor-impl(long nanoseconds);
+ method @androidx.compose.runtime.Stable public static operator long div-impl(long $this, int quotient);
+ method @androidx.compose.runtime.Stable public static operator long div-impl(long $this, double quotient);
+ method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+ method public static boolean equals-impl0(long p1, long p2);
method public long getNanoseconds();
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration minus(androidx.compose.ui.unit.Duration other);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration plus(androidx.compose.ui.unit.Duration other);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration times(int factor);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration times(double factor);
+ method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+ method @androidx.compose.runtime.Stable public static operator long minus-WUeva1s(long $this, long other);
+ method @androidx.compose.runtime.Stable public static operator long plus-WUeva1s(long $this, long other);
+ method @androidx.compose.runtime.Stable public static operator long times-impl(long $this, int factor);
+ method @androidx.compose.runtime.Stable public static operator long times-impl(long $this, double factor);
+ method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
field public static final androidx.compose.ui.unit.Duration.Companion Companion;
}
public static final class Duration.Companion {
- method public androidx.compose.ui.unit.Duration getZero();
- property public final androidx.compose.ui.unit.Duration Zero;
+ method public long getZero();
+ property public final long Zero;
}
public final class Durations {
- method public static androidx.compose.ui.unit.Duration Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
- method public static androidx.compose.ui.unit.Duration getDays(long);
- method public static androidx.compose.ui.unit.Duration getDays(int);
- method public static androidx.compose.ui.unit.Duration getHours(long);
- method public static androidx.compose.ui.unit.Duration getHours(int);
- method public static androidx.compose.ui.unit.Duration getMicroseconds(long);
- method public static androidx.compose.ui.unit.Duration getMicroseconds(int);
- method public static androidx.compose.ui.unit.Duration getMilliseconds(long);
- method public static androidx.compose.ui.unit.Duration getMilliseconds(int);
- method public static androidx.compose.ui.unit.Duration getMinutes(long);
- method public static androidx.compose.ui.unit.Duration getMinutes(int);
- method public static androidx.compose.ui.unit.Duration getNanoseconds(long);
- method public static androidx.compose.ui.unit.Duration getNanoseconds(int);
- method public static long getNanosecondsPerDay();
- method public static long getNanosecondsPerHour();
- method public static long getNanosecondsPerMillisecond();
- method public static long getNanosecondsPerMinute();
- method public static long getNanosecondsPerSecond();
- method public static androidx.compose.ui.unit.Duration getSeconds(long);
- method public static androidx.compose.ui.unit.Duration getSeconds(int);
- method public static long inDays(androidx.compose.ui.unit.Duration);
- method public static long inHours(androidx.compose.ui.unit.Duration);
- method public static long inMicroseconds(androidx.compose.ui.unit.Duration);
- method public static long inMilliseconds(androidx.compose.ui.unit.Duration);
- method public static long inMinutes(androidx.compose.ui.unit.Duration);
- method public static long inSeconds(androidx.compose.ui.unit.Duration);
+ method public static long Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
+ method public static inline long getDays(long);
+ method public static inline long getDays(int);
+ method public static inline long getHours(long);
+ method public static inline long getHours(int);
+ method public static inline long getMicroseconds(long);
+ method public static inline long getMicroseconds(int);
+ method public static inline long getMilliseconds(long);
+ method public static inline long getMilliseconds(int);
+ method public static inline long getMinutes(long);
+ method public static inline long getMinutes(int);
+ method public static inline long getNanoseconds(long);
+ method public static inline long getNanoseconds(int);
+ method public static inline long getSeconds(long);
+ method public static inline long getSeconds(int);
+ method public static inline long inDays-WUeva1s(long);
+ method public static inline long inHours-WUeva1s(long);
+ method public static inline long inMicroseconds-WUeva1s(long);
+ method public static inline long inMilliseconds-WUeva1s(long);
+ method public static inline long inMinutes-WUeva1s(long);
+ method public static inline long inSeconds-WUeva1s(long);
field public static final long HoursPerDay = 24L; // 0x18L
field public static final long MicrosecondsPerMillisecond = 1000L; // 0x3e8L
field public static final long MillisecondsPerSecond = 1000L; // 0x3e8L
field public static final long MinutesPerHour = 60L; // 0x3cL
+ field public static final long NanosecondsPerDay = 86400000000000L; // 0x4e94914f0000L
+ field public static final long NanosecondsPerHour = 3600000000000L; // 0x34630b8a000L
field public static final long NanosecondsPerMicrosecond = 1000L; // 0x3e8L
+ field public static final long NanosecondsPerMillisecond = 1000000L; // 0xf4240L
+ field public static final long NanosecondsPerMinute = 60000000000L; // 0xdf8475800L
+ field public static final long NanosecondsPerSecond = 1000000000L; // 0x3b9aca00L
field public static final long SecondsPerMinute = 60L; // 0x3cL
}
@@ -515,9 +519,9 @@
method public long component1();
method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.Uptime copy(long nanoseconds);
method public long getNanoseconds();
- method public operator androidx.compose.ui.unit.Uptime minus(androidx.compose.ui.unit.Duration duration);
- method public operator androidx.compose.ui.unit.Duration minus(androidx.compose.ui.unit.Uptime other);
- method public operator androidx.compose.ui.unit.Uptime plus(androidx.compose.ui.unit.Duration duration);
+ method public operator long minus(androidx.compose.ui.unit.Uptime other);
+ method public operator androidx.compose.ui.unit.Uptime minus-WUeva1s(long duration);
+ method public operator androidx.compose.ui.unit.Uptime plus-WUeva1s(long duration);
field public static final androidx.compose.ui.unit.Uptime.Companion Companion;
}
@@ -527,7 +531,7 @@
}
public final class UptimeKt {
- method public static operator androidx.compose.ui.unit.Uptime plus(androidx.compose.ui.unit.Duration, androidx.compose.ui.unit.Uptime uptime);
+ method public static operator androidx.compose.ui.unit.Uptime plus-I3RPvYE(long, androidx.compose.ui.unit.Uptime uptime);
}
@androidx.compose.runtime.Immutable public final class Velocity {
diff --git a/compose/ui/ui-unit/api/restricted_current.txt b/compose/ui/ui-unit/api/restricted_current.txt
index 65ea4d4..f3c5028 100644
--- a/compose/ui/ui-unit/api/restricted_current.txt
+++ b/compose/ui/ui-unit/api/restricted_current.txt
@@ -195,58 +195,62 @@
method @androidx.compose.runtime.Stable public static String toString-impl(float $this);
}
- @androidx.compose.runtime.Immutable public final class Duration implements java.lang.Comparable<androidx.compose.ui.unit.Duration> {
- ctor public Duration(long nanoseconds);
- method @androidx.compose.runtime.Stable public int compareTo(androidx.compose.ui.unit.Duration other);
- method public long component1();
- method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.Duration copy(long nanoseconds);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration div(int quotient);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration div(double quotient);
+ @androidx.compose.runtime.Immutable public final inline class Duration implements java.lang.Comparable<androidx.compose.ui.unit.Duration> {
+ ctor public Duration();
+ method @androidx.compose.runtime.Stable public int compareTo-WUeva1s(long p);
+ method @androidx.compose.runtime.Stable public static int compareTo-WUeva1s(long $this, long other);
+ method public static long constructor-impl(long nanoseconds);
+ method @androidx.compose.runtime.Stable public static operator long div-impl(long $this, int quotient);
+ method @androidx.compose.runtime.Stable public static operator long div-impl(long $this, double quotient);
+ method @androidx.compose.runtime.Immutable public static inline boolean equals-impl(long p, Object? p1);
+ method public static boolean equals-impl0(long p1, long p2);
method public long getNanoseconds();
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration minus(androidx.compose.ui.unit.Duration other);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration plus(androidx.compose.ui.unit.Duration other);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration times(int factor);
- method @androidx.compose.runtime.Stable public operator androidx.compose.ui.unit.Duration times(double factor);
+ method @androidx.compose.runtime.Immutable public static inline int hashCode-impl(long p);
+ method @androidx.compose.runtime.Stable public static operator long minus-WUeva1s(long $this, long other);
+ method @androidx.compose.runtime.Stable public static operator long plus-WUeva1s(long $this, long other);
+ method @androidx.compose.runtime.Stable public static operator long times-impl(long $this, int factor);
+ method @androidx.compose.runtime.Stable public static operator long times-impl(long $this, double factor);
+ method @androidx.compose.runtime.Stable public static String toString-impl(long $this);
field public static final androidx.compose.ui.unit.Duration.Companion Companion;
}
public static final class Duration.Companion {
- method public androidx.compose.ui.unit.Duration getZero();
- property public final androidx.compose.ui.unit.Duration Zero;
+ method public long getZero();
+ property public final long Zero;
}
public final class Durations {
- method public static androidx.compose.ui.unit.Duration Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
- method public static androidx.compose.ui.unit.Duration getDays(long);
- method public static androidx.compose.ui.unit.Duration getDays(int);
- method public static androidx.compose.ui.unit.Duration getHours(long);
- method public static androidx.compose.ui.unit.Duration getHours(int);
- method public static androidx.compose.ui.unit.Duration getMicroseconds(long);
- method public static androidx.compose.ui.unit.Duration getMicroseconds(int);
- method public static androidx.compose.ui.unit.Duration getMilliseconds(long);
- method public static androidx.compose.ui.unit.Duration getMilliseconds(int);
- method public static androidx.compose.ui.unit.Duration getMinutes(long);
- method public static androidx.compose.ui.unit.Duration getMinutes(int);
- method public static androidx.compose.ui.unit.Duration getNanoseconds(long);
- method public static androidx.compose.ui.unit.Duration getNanoseconds(int);
- method public static long getNanosecondsPerDay();
- method public static long getNanosecondsPerHour();
- method public static long getNanosecondsPerMillisecond();
- method public static long getNanosecondsPerMinute();
- method public static long getNanosecondsPerSecond();
- method public static androidx.compose.ui.unit.Duration getSeconds(long);
- method public static androidx.compose.ui.unit.Duration getSeconds(int);
- method public static long inDays(androidx.compose.ui.unit.Duration);
- method public static long inHours(androidx.compose.ui.unit.Duration);
- method public static long inMicroseconds(androidx.compose.ui.unit.Duration);
- method public static long inMilliseconds(androidx.compose.ui.unit.Duration);
- method public static long inMinutes(androidx.compose.ui.unit.Duration);
- method public static long inSeconds(androidx.compose.ui.unit.Duration);
+ method public static long Duration(long days = 0, long hours = 0, long minutes = 0, long seconds = 0, long milliseconds = 0, long microseconds = 0, long nanoseconds = 0);
+ method public static inline long getDays(long);
+ method public static inline long getDays(int);
+ method public static inline long getHours(long);
+ method public static inline long getHours(int);
+ method public static inline long getMicroseconds(long);
+ method public static inline long getMicroseconds(int);
+ method public static inline long getMilliseconds(long);
+ method public static inline long getMilliseconds(int);
+ method public static inline long getMinutes(long);
+ method public static inline long getMinutes(int);
+ method public static inline long getNanoseconds(long);
+ method public static inline long getNanoseconds(int);
+ method public static inline long getSeconds(long);
+ method public static inline long getSeconds(int);
+ method public static inline long inDays-WUeva1s(long);
+ method public static inline long inHours-WUeva1s(long);
+ method public static inline long inMicroseconds-WUeva1s(long);
+ method public static inline long inMilliseconds-WUeva1s(long);
+ method public static inline long inMinutes-WUeva1s(long);
+ method public static inline long inSeconds-WUeva1s(long);
field public static final long HoursPerDay = 24L; // 0x18L
field public static final long MicrosecondsPerMillisecond = 1000L; // 0x3e8L
field public static final long MillisecondsPerSecond = 1000L; // 0x3e8L
field public static final long MinutesPerHour = 60L; // 0x3cL
+ field public static final long NanosecondsPerDay = 86400000000000L; // 0x4e94914f0000L
+ field public static final long NanosecondsPerHour = 3600000000000L; // 0x34630b8a000L
field public static final long NanosecondsPerMicrosecond = 1000L; // 0x3e8L
+ field public static final long NanosecondsPerMillisecond = 1000000L; // 0xf4240L
+ field public static final long NanosecondsPerMinute = 60000000000L; // 0xdf8475800L
+ field public static final long NanosecondsPerSecond = 1000000000L; // 0x3b9aca00L
field public static final long SecondsPerMinute = 60L; // 0x3cL
}
@@ -519,9 +523,9 @@
method public long component1();
method @androidx.compose.runtime.Immutable public androidx.compose.ui.unit.Uptime copy(long nanoseconds);
method public long getNanoseconds();
- method public operator androidx.compose.ui.unit.Uptime minus(androidx.compose.ui.unit.Duration duration);
- method public operator androidx.compose.ui.unit.Duration minus(androidx.compose.ui.unit.Uptime other);
- method public operator androidx.compose.ui.unit.Uptime plus(androidx.compose.ui.unit.Duration duration);
+ method public operator long minus(androidx.compose.ui.unit.Uptime other);
+ method public operator androidx.compose.ui.unit.Uptime minus-WUeva1s(long duration);
+ method public operator androidx.compose.ui.unit.Uptime plus-WUeva1s(long duration);
field public static final androidx.compose.ui.unit.Uptime.Companion Companion;
}
@@ -531,7 +535,7 @@
}
public final class UptimeKt {
- method public static operator androidx.compose.ui.unit.Uptime plus(androidx.compose.ui.unit.Duration, androidx.compose.ui.unit.Uptime uptime);
+ method public static operator androidx.compose.ui.unit.Uptime plus-I3RPvYE(long, androidx.compose.ui.unit.Uptime uptime);
}
@androidx.compose.runtime.Immutable public final class Velocity {
diff --git a/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Duration.kt b/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Duration.kt
index 305adf9..4527e65 100644
--- a/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Duration.kt
+++ b/compose/ui/ui-unit/src/commonMain/kotlin/androidx/compose/ui/unit/Duration.kt
@@ -33,14 +33,12 @@
const val SecondsPerMinute = 60L
const val MinutesPerHour = 60L
const val HoursPerDay = 24L
-
-// TODO(mount): these should be "const val", but that doesn't work right
-// now with the IR compiler.
-val NanosecondsPerMillisecond = NanosecondsPerMicrosecond * MicrosecondsPerMillisecond
-val NanosecondsPerSecond = NanosecondsPerMillisecond * MillisecondsPerSecond
-val NanosecondsPerMinute = NanosecondsPerSecond * SecondsPerMinute
-val NanosecondsPerHour = NanosecondsPerMinute * MinutesPerHour
-val NanosecondsPerDay = NanosecondsPerHour * HoursPerDay
+const val NanosecondsPerMillisecond =
+ NanosecondsPerMicrosecond * MicrosecondsPerMillisecond
+const val NanosecondsPerSecond = NanosecondsPerMillisecond * MillisecondsPerSecond
+const val NanosecondsPerMinute = NanosecondsPerSecond * SecondsPerMinute
+const val NanosecondsPerHour = NanosecondsPerMinute * MinutesPerHour
+const val NanosecondsPerDay = NanosecondsPerHour * HoursPerDay
/** Only used by this implementation */
private const val MicrosecondsPerSecond = MicrosecondsPerMillisecond * MillisecondsPerSecond
@@ -67,60 +65,50 @@
)
/* A [Duration] of this many days. */
-// TODO(inline)
-val Long.days: Duration get() = Duration(this * NanosecondsPerDay)
+inline val Long.days: Duration get() = Duration(this * NanosecondsPerDay)
/* A [Duration] of this many hours. */
-// TODO(inline)
-val Long.hours: Duration get() = Duration(this * NanosecondsPerHour)
+inline val Long.hours: Duration get() = Duration(this * NanosecondsPerHour)
/* A [Duration] of this many minutes. */
-// TODO(inline)
-val Long.minutes: Duration get() = Duration(this * NanosecondsPerMinute)
+inline val Long.minutes: Duration get() = Duration(this * NanosecondsPerMinute)
/* A [Duration] of this many seconds. */
-// TODO(inline)
-val Long.seconds: Duration get() = Duration(this * NanosecondsPerSecond)
+inline val Long.seconds: Duration
+ @Suppress("MethodNameUnits") // lint warning is confused by an inline class.
+ get() = Duration(this * NanosecondsPerSecond)
/* A [Duration] of this many milliseconds. */
-// TODO(inline)
-val Long.milliseconds: Duration get() = Duration(this * NanosecondsPerMillisecond)
+inline val Long.milliseconds: Duration get() = Duration(this * NanosecondsPerMillisecond)
/* A [Duration] of this many microseconds. */
-// TODO(inline)
-val Long.microseconds: Duration get() = Duration(this * NanosecondsPerMicrosecond)
+inline val Long.microseconds: Duration get() = Duration(this * NanosecondsPerMicrosecond)
/* A [Duration] of this many nanoseconds. */
-// TODO(inline)
-val Long.nanoseconds: Duration get() = Duration(this)
+inline val Long.nanoseconds: Duration get() = Duration(this)
/* A [Duration] of this many days. */
-// TODO(inline)
-val Int.days: Duration get() = toLong().days
+inline val Int.days: Duration get() = toLong().days
/* A [Duration] of this many hours. */
-// TODO(inline)
-val Int.hours: Duration get() = toLong().hours
+inline val Int.hours: Duration get() = toLong().hours
/* A [Duration] of this many minutes. */
-// TODO(inline)
-val Int.minutes: Duration get() = toLong().minutes
+inline val Int.minutes: Duration get() = toLong().minutes
/* A [Duration] of this many seconds. */
-// TODO(inline)
-val Int.seconds: Duration get() = toLong().seconds
+inline val Int.seconds: Duration
+ @Suppress("MethodNameUnits") // lint warning is confused by an inline class.
+ get() = toLong().seconds
/* A [Duration] of this many milliseconds. */
-// TODO(inline)
-val Int.milliseconds: Duration get() = toLong().milliseconds
+inline val Int.milliseconds: Duration get() = toLong().milliseconds
/* A [Duration] of this many microseconds. */
-// TODO(inline)
-val Int.microseconds: Duration get() = toLong().microseconds
+inline val Int.microseconds: Duration get() = toLong().microseconds
/* A [Duration] of this many nanoseconds. */
-// TODO(inline)
-val Int.nanoseconds: Duration get() = toLong().nanoseconds
+inline val Int.nanoseconds: Duration get() = toLong().nanoseconds
/**
* A span of time, such as 27 days, 4 hours, 12 minutes, and 3 seconds.
@@ -163,8 +151,9 @@
* val aLongWeekend = 86.hours
* assertEquals(3, aLongWeekend.inDays())
*/
+@Suppress("EXPERIMENTAL_FEATURE_WARNING")
@Immutable
-data class Duration(val nanoseconds: Long) : Comparable<Duration> {
+inline class Duration(val nanoseconds: Long) : Comparable<Duration> {
/**
* Adds this Duration and [other] and returns the sum as a Duration.
@@ -259,43 +248,37 @@
/**
* Returns the number of whole days spanned by this Duration.
*/
-// TODO(inline)
-fun Duration.inDays(): Long = nanoseconds / NanosecondsPerDay
+inline fun Duration.inDays(): Long = nanoseconds / NanosecondsPerDay
/**
* Returns the number of whole hours spanned by this Duration.
*
* The returned value can be greater than 23.
*/
-// TODO(inline)
-fun Duration.inHours(): Long = nanoseconds / NanosecondsPerHour
+inline fun Duration.inHours(): Long = nanoseconds / NanosecondsPerHour
/**
* Returns the number of whole minutes spanned by this Duration.
*
* The returned value can be greater than 59.
*/
-// TODO(inline)
-fun Duration.inMinutes(): Long = nanoseconds / NanosecondsPerMinute
+inline fun Duration.inMinutes(): Long = nanoseconds / NanosecondsPerMinute
/**
* Returns the number of whole seconds spanned by this Duration.
*
* The returned value can be greater than 59.
*/
-// TODO(inline)
-fun Duration.inSeconds(): Long = nanoseconds / NanosecondsPerSecond
+inline fun Duration.inSeconds(): Long = nanoseconds / NanosecondsPerSecond
/**
* Returns number of whole milliseconds spanned by this Duration.
*
* The returned value can be greater than 999.
*/
-// TODO(inline)
-fun Duration.inMilliseconds(): Long = nanoseconds / NanosecondsPerMillisecond
+inline fun Duration.inMilliseconds(): Long = nanoseconds / NanosecondsPerMillisecond
/**
* Returns number of whole microseconds spanned by this Duration.
*/
-// TODO(inline)
-fun Duration.inMicroseconds(): Long = nanoseconds / NanosecondsPerMicrosecond
+inline fun Duration.inMicroseconds(): Long = nanoseconds / NanosecondsPerMicrosecond
diff --git a/compose/ui/ui/api/current.txt b/compose/ui/ui/api/current.txt
index 8530094..17bc6d3 100644
--- a/compose/ui/ui/api/current.txt
+++ b/compose/ui/ui/api/current.txt
@@ -497,23 +497,23 @@
package androidx.compose.ui.gesture {
public final class ConstantsKt {
- method public static androidx.compose.ui.unit.Duration getDoubleTapMinTime();
+ method public static long getDoubleTapMinTime();
method public static float getDoubleTapSlop();
- method public static androidx.compose.ui.unit.Duration getDoubleTapTimeout();
+ method public static long getDoubleTapTimeout();
method public static float getDoubleTapTouchSlop();
method public static float getHoverTapSlop();
- method public static androidx.compose.ui.unit.Duration getHoverTapTimeout();
- method public static androidx.compose.ui.unit.Duration getJumpTapTimeout();
- method public static androidx.compose.ui.unit.Duration getLongPressTimeout();
+ method public static long getHoverTapTimeout();
+ method public static long getJumpTapTimeout();
+ method public static long getLongPressTimeout();
method public static float getMaxFlingVelocity();
method public static float getMinFlingVelocity();
method public static float getPagingTouchSlop();
method public static float getPanSlop();
- method public static androidx.compose.ui.unit.Duration getPressTimeout();
+ method public static long getPressTimeout();
method public static float getScaleSlop();
method public static float getTouchSlop();
method public static float getWindowTouchSlop();
- method public static androidx.compose.ui.unit.Duration getZoomControlsTimeout();
+ method public static long getZoomControlsTimeout();
}
public enum Direction {
diff --git a/compose/ui/ui/api/public_plus_experimental_current.txt b/compose/ui/ui/api/public_plus_experimental_current.txt
index 8530094..17bc6d3 100644
--- a/compose/ui/ui/api/public_plus_experimental_current.txt
+++ b/compose/ui/ui/api/public_plus_experimental_current.txt
@@ -497,23 +497,23 @@
package androidx.compose.ui.gesture {
public final class ConstantsKt {
- method public static androidx.compose.ui.unit.Duration getDoubleTapMinTime();
+ method public static long getDoubleTapMinTime();
method public static float getDoubleTapSlop();
- method public static androidx.compose.ui.unit.Duration getDoubleTapTimeout();
+ method public static long getDoubleTapTimeout();
method public static float getDoubleTapTouchSlop();
method public static float getHoverTapSlop();
- method public static androidx.compose.ui.unit.Duration getHoverTapTimeout();
- method public static androidx.compose.ui.unit.Duration getJumpTapTimeout();
- method public static androidx.compose.ui.unit.Duration getLongPressTimeout();
+ method public static long getHoverTapTimeout();
+ method public static long getJumpTapTimeout();
+ method public static long getLongPressTimeout();
method public static float getMaxFlingVelocity();
method public static float getMinFlingVelocity();
method public static float getPagingTouchSlop();
method public static float getPanSlop();
- method public static androidx.compose.ui.unit.Duration getPressTimeout();
+ method public static long getPressTimeout();
method public static float getScaleSlop();
method public static float getTouchSlop();
method public static float getWindowTouchSlop();
- method public static androidx.compose.ui.unit.Duration getZoomControlsTimeout();
+ method public static long getZoomControlsTimeout();
}
public enum Direction {
diff --git a/compose/ui/ui/api/restricted_current.txt b/compose/ui/ui/api/restricted_current.txt
index e4aaf0c..5476fad 100644
--- a/compose/ui/ui/api/restricted_current.txt
+++ b/compose/ui/ui/api/restricted_current.txt
@@ -544,23 +544,23 @@
package androidx.compose.ui.gesture {
public final class ConstantsKt {
- method public static androidx.compose.ui.unit.Duration getDoubleTapMinTime();
+ method public static long getDoubleTapMinTime();
method public static float getDoubleTapSlop();
- method public static androidx.compose.ui.unit.Duration getDoubleTapTimeout();
+ method public static long getDoubleTapTimeout();
method public static float getDoubleTapTouchSlop();
method public static float getHoverTapSlop();
- method public static androidx.compose.ui.unit.Duration getHoverTapTimeout();
- method public static androidx.compose.ui.unit.Duration getJumpTapTimeout();
- method public static androidx.compose.ui.unit.Duration getLongPressTimeout();
+ method public static long getHoverTapTimeout();
+ method public static long getJumpTapTimeout();
+ method public static long getLongPressTimeout();
method public static float getMaxFlingVelocity();
method public static float getMinFlingVelocity();
method public static float getPagingTouchSlop();
method public static float getPanSlop();
- method public static androidx.compose.ui.unit.Duration getPressTimeout();
+ method public static long getPressTimeout();
method public static float getScaleSlop();
method public static float getTouchSlop();
method public static float getWindowTouchSlop();
- method public static androidx.compose.ui.unit.Duration getZoomControlsTimeout();
+ method public static long getZoomControlsTimeout();
}
public enum Direction {
diff --git a/ui/ui-test/api/current.txt b/ui/ui-test/api/current.txt
index 287a48d..23556f2c 100644
--- a/ui/ui-test/api/current.txt
+++ b/ui/ui-test/api/current.txt
@@ -181,7 +181,7 @@
public final class GestureScopeKt {
method public static void cancel(androidx.ui.test.GestureScope);
method public static void click-7zpKyg8(androidx.ui.test.GestureScope, long position = center);
- method public static void doubleClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, androidx.compose.ui.unit.Duration delay = androidx.ui.test.GestureScopeKt.doubleClickDelay);
+ method public static void doubleClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, long delay = androidx.ui.test.GestureScopeKt.doubleClickDelay);
method public static void down-7zpKyg8(androidx.ui.test.GestureScope, long position);
method public static void down-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long position);
method public static inline float getBottom(androidx.ui.test.GestureScope);
@@ -203,7 +203,7 @@
method public static long getTopRight(androidx.ui.test.GestureScope);
method public static inline int getWidth(androidx.ui.test.GestureScope);
method public static long localToGlobal-7zpKyg8(androidx.ui.test.GestureScope, long position);
- method public static void longClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, androidx.compose.ui.unit.Duration duration = androidx.compose.ui.gesture.ConstantsKt.LongPressTimeout + 100.milliseconds);
+ method public static void longClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, long duration = androidx.compose.ui.gesture.ConstantsKt.LongPressTimeout + 100.milliseconds);
method public static void move(androidx.ui.test.GestureScope);
method public static void moveBy-7zpKyg8(androidx.ui.test.GestureScope, long delta);
method public static void moveBy-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long delta);
@@ -212,13 +212,13 @@
method public static void moveTo-7zpKyg8(androidx.ui.test.GestureScope, long position);
method public static void moveTo-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long position);
method public static long percentOffset(androidx.ui.test.GestureScope, @FloatRange(from=-1.0, to=1.0) float x = 0f, @FloatRange(from=-1.0, to=1.0) float y = 0f);
- method public static void pinch-LifKLvY(androidx.ui.test.GestureScope, long start0, long end0, long start1, long end1, androidx.compose.ui.unit.Duration duration = 400.milliseconds);
- method public static void swipe-lXQwTZI(androidx.ui.test.GestureScope, long start, long end, androidx.compose.ui.unit.Duration duration = 200.milliseconds);
+ method public static void pinch-LifKLvY(androidx.ui.test.GestureScope, long start0, long end0, long start1, long end1, long duration = 400.milliseconds);
+ method public static void swipe-lXQwTZI(androidx.ui.test.GestureScope, long start, long end, long duration = 200.milliseconds);
method public static void swipeDown(androidx.ui.test.GestureScope);
method public static void swipeLeft(androidx.ui.test.GestureScope);
method public static void swipeRight(androidx.ui.test.GestureScope);
method public static void swipeUp(androidx.ui.test.GestureScope);
- method public static void swipeWithVelocity-HxPTMKA(androidx.ui.test.GestureScope, long start, long end, @FloatRange(from=0.0, to=3.4E38) float endVelocity, androidx.compose.ui.unit.Duration duration = 200.milliseconds);
+ method public static void swipeWithVelocity-HxPTMKA(androidx.ui.test.GestureScope, long start, long end, @FloatRange(from=0.0, to=3.4E38) float endVelocity, long duration = 200.milliseconds);
method public static void up(androidx.ui.test.GestureScope, int pointerId = 0);
}
diff --git a/ui/ui-test/api/public_plus_experimental_current.txt b/ui/ui-test/api/public_plus_experimental_current.txt
index 287a48d..23556f2c 100644
--- a/ui/ui-test/api/public_plus_experimental_current.txt
+++ b/ui/ui-test/api/public_plus_experimental_current.txt
@@ -181,7 +181,7 @@
public final class GestureScopeKt {
method public static void cancel(androidx.ui.test.GestureScope);
method public static void click-7zpKyg8(androidx.ui.test.GestureScope, long position = center);
- method public static void doubleClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, androidx.compose.ui.unit.Duration delay = androidx.ui.test.GestureScopeKt.doubleClickDelay);
+ method public static void doubleClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, long delay = androidx.ui.test.GestureScopeKt.doubleClickDelay);
method public static void down-7zpKyg8(androidx.ui.test.GestureScope, long position);
method public static void down-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long position);
method public static inline float getBottom(androidx.ui.test.GestureScope);
@@ -203,7 +203,7 @@
method public static long getTopRight(androidx.ui.test.GestureScope);
method public static inline int getWidth(androidx.ui.test.GestureScope);
method public static long localToGlobal-7zpKyg8(androidx.ui.test.GestureScope, long position);
- method public static void longClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, androidx.compose.ui.unit.Duration duration = androidx.compose.ui.gesture.ConstantsKt.LongPressTimeout + 100.milliseconds);
+ method public static void longClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, long duration = androidx.compose.ui.gesture.ConstantsKt.LongPressTimeout + 100.milliseconds);
method public static void move(androidx.ui.test.GestureScope);
method public static void moveBy-7zpKyg8(androidx.ui.test.GestureScope, long delta);
method public static void moveBy-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long delta);
@@ -212,13 +212,13 @@
method public static void moveTo-7zpKyg8(androidx.ui.test.GestureScope, long position);
method public static void moveTo-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long position);
method public static long percentOffset(androidx.ui.test.GestureScope, @FloatRange(from=-1.0, to=1.0) float x = 0f, @FloatRange(from=-1.0, to=1.0) float y = 0f);
- method public static void pinch-LifKLvY(androidx.ui.test.GestureScope, long start0, long end0, long start1, long end1, androidx.compose.ui.unit.Duration duration = 400.milliseconds);
- method public static void swipe-lXQwTZI(androidx.ui.test.GestureScope, long start, long end, androidx.compose.ui.unit.Duration duration = 200.milliseconds);
+ method public static void pinch-LifKLvY(androidx.ui.test.GestureScope, long start0, long end0, long start1, long end1, long duration = 400.milliseconds);
+ method public static void swipe-lXQwTZI(androidx.ui.test.GestureScope, long start, long end, long duration = 200.milliseconds);
method public static void swipeDown(androidx.ui.test.GestureScope);
method public static void swipeLeft(androidx.ui.test.GestureScope);
method public static void swipeRight(androidx.ui.test.GestureScope);
method public static void swipeUp(androidx.ui.test.GestureScope);
- method public static void swipeWithVelocity-HxPTMKA(androidx.ui.test.GestureScope, long start, long end, @FloatRange(from=0.0, to=3.4E38) float endVelocity, androidx.compose.ui.unit.Duration duration = 200.milliseconds);
+ method public static void swipeWithVelocity-HxPTMKA(androidx.ui.test.GestureScope, long start, long end, @FloatRange(from=0.0, to=3.4E38) float endVelocity, long duration = 200.milliseconds);
method public static void up(androidx.ui.test.GestureScope, int pointerId = 0);
}
diff --git a/ui/ui-test/api/restricted_current.txt b/ui/ui-test/api/restricted_current.txt
index 287a48d..23556f2c 100644
--- a/ui/ui-test/api/restricted_current.txt
+++ b/ui/ui-test/api/restricted_current.txt
@@ -181,7 +181,7 @@
public final class GestureScopeKt {
method public static void cancel(androidx.ui.test.GestureScope);
method public static void click-7zpKyg8(androidx.ui.test.GestureScope, long position = center);
- method public static void doubleClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, androidx.compose.ui.unit.Duration delay = androidx.ui.test.GestureScopeKt.doubleClickDelay);
+ method public static void doubleClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, long delay = androidx.ui.test.GestureScopeKt.doubleClickDelay);
method public static void down-7zpKyg8(androidx.ui.test.GestureScope, long position);
method public static void down-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long position);
method public static inline float getBottom(androidx.ui.test.GestureScope);
@@ -203,7 +203,7 @@
method public static long getTopRight(androidx.ui.test.GestureScope);
method public static inline int getWidth(androidx.ui.test.GestureScope);
method public static long localToGlobal-7zpKyg8(androidx.ui.test.GestureScope, long position);
- method public static void longClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, androidx.compose.ui.unit.Duration duration = androidx.compose.ui.gesture.ConstantsKt.LongPressTimeout + 100.milliseconds);
+ method public static void longClick-FEK65Ao(androidx.ui.test.GestureScope, long position = center, long duration = androidx.compose.ui.gesture.ConstantsKt.LongPressTimeout + 100.milliseconds);
method public static void move(androidx.ui.test.GestureScope);
method public static void moveBy-7zpKyg8(androidx.ui.test.GestureScope, long delta);
method public static void moveBy-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long delta);
@@ -212,13 +212,13 @@
method public static void moveTo-7zpKyg8(androidx.ui.test.GestureScope, long position);
method public static void moveTo-Y-DztCk(androidx.ui.test.GestureScope, int pointerId, long position);
method public static long percentOffset(androidx.ui.test.GestureScope, @FloatRange(from=-1.0, to=1.0) float x = 0f, @FloatRange(from=-1.0, to=1.0) float y = 0f);
- method public static void pinch-LifKLvY(androidx.ui.test.GestureScope, long start0, long end0, long start1, long end1, androidx.compose.ui.unit.Duration duration = 400.milliseconds);
- method public static void swipe-lXQwTZI(androidx.ui.test.GestureScope, long start, long end, androidx.compose.ui.unit.Duration duration = 200.milliseconds);
+ method public static void pinch-LifKLvY(androidx.ui.test.GestureScope, long start0, long end0, long start1, long end1, long duration = 400.milliseconds);
+ method public static void swipe-lXQwTZI(androidx.ui.test.GestureScope, long start, long end, long duration = 200.milliseconds);
method public static void swipeDown(androidx.ui.test.GestureScope);
method public static void swipeLeft(androidx.ui.test.GestureScope);
method public static void swipeRight(androidx.ui.test.GestureScope);
method public static void swipeUp(androidx.ui.test.GestureScope);
- method public static void swipeWithVelocity-HxPTMKA(androidx.ui.test.GestureScope, long start, long end, @FloatRange(from=0.0, to=3.4E38) float endVelocity, androidx.compose.ui.unit.Duration duration = 200.milliseconds);
+ method public static void swipeWithVelocity-HxPTMKA(androidx.ui.test.GestureScope, long start, long end, @FloatRange(from=0.0, to=3.4E38) float endVelocity, long duration = 200.milliseconds);
method public static void up(androidx.ui.test.GestureScope, int pointerId = 0);
}
