diff options
author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-29 01:12:02 +0000 |
---|---|---|
committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-07-29 01:12:02 +0000 |
commit | 7b4e4a432484d65545bd89870085761cca75e581 (patch) | |
tree | 9e15d1a73baad86e5dd657367f723b0fb902f3f5 | |
parent | e44439912f72d856e42d1ebb557c52d769cf9cf3 (diff) | |
parent | d952d2ac776f70285914f0c4ceadca96d0a1dccc (diff) | |
download | libmonet-android-14.0.0_r27.tar.gz |
Snap for 10580366 from d952d2ac776f70285914f0c4ceadca96d0a1dccc to udc-qpr1-releaseandroid-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-release
Change-Id: I84d09267c5c98cc0e3c244907057ce7e882722fa
-rw-r--r-- | dynamiccolor/MaterialDynamicColors.java | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/dynamiccolor/MaterialDynamicColors.java b/dynamiccolor/MaterialDynamicColors.java index 0109906..cf1027e 100644 --- a/dynamiccolor/MaterialDynamicColors.java +++ b/dynamiccolor/MaterialDynamicColors.java @@ -31,7 +31,17 @@ import com.google.ux.material.libmonet.scheme.Variant; // AndroidManifest with an SDK set higher than 14. @SuppressWarnings({"AndroidJdkLibsChecker", "NewApi"}) public final class MaterialDynamicColors { - public MaterialDynamicColors() {} + /** Optionally use fidelity on most color schemes. */ + private final boolean isExtendedFidelity; + + public MaterialDynamicColors() { + this.isExtendedFidelity = false; + } + + // Temporary constructor to support extended fidelity experiment. + public MaterialDynamicColors(boolean isExtendedFidelity) { + this.isExtendedFidelity = isExtendedFidelity; + } @NonNull public DynamicColor highestSurface(@NonNull DynamicScheme s) { @@ -909,12 +919,17 @@ public final class MaterialDynamicColors { "text_hint_inverse", (s) -> s.neutralPalette, (s) -> s.isDark ? 10.0 : 90.0); } - private static ViewingConditions viewingConditionsForAlbers(DynamicScheme scheme) { - return ViewingConditions.defaultWithBackgroundLstar(scheme.isDark ? 30.0 : 80.0); + private boolean isFidelity(DynamicScheme scheme) { + if (this.isExtendedFidelity + && scheme.variant != Variant.MONOCHROME + && scheme.variant != Variant.NEUTRAL) { + return true; + } + return scheme.variant == Variant.FIDELITY || scheme.variant == Variant.CONTENT; } - private static boolean isFidelity(DynamicScheme scheme) { - return scheme.variant == Variant.FIDELITY || scheme.variant == Variant.CONTENT; + private static ViewingConditions viewingConditionsForAlbers(DynamicScheme scheme) { + return ViewingConditions.defaultWithBackgroundLstar(scheme.isDark ? 30.0 : 80.0); } private static boolean isMonochrome(DynamicScheme scheme) { @@ -959,4 +974,4 @@ public final class MaterialDynamicColors { return DynamicColor.enableLightForeground(albersd.getTone()); } } -} +}
\ No newline at end of file |