Merge "Rename ColorProvider.resolve to ColorProvider.getColor" into androidx-main am: ed153eb65c
Original change: https://android-review.googlesource.com/c/platform/frameworks/support/+/2150521
Change-Id: I776374b246d3effa59070a9e9809d9f7d7b72ed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/ApplyModifiers.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/ApplyModifiers.kt
index 48d2bc6..85bafc9 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/ApplyModifiers.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/ApplyModifiers.kt
@@ -287,7 +287,7 @@
colorProvider.night.toArgb()
)
} else {
- rv.setViewBackgroundColor(viewId, colorProvider.resolve(context).toArgb())
+ rv.setViewBackgroundColor(viewId, colorProvider.getColor(context).toArgb())
}
}
else -> Log.w(GlanceAppWidgetTag, "Unexpected background color modifier: $colorProvider")
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/CheckBoxTranslator.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/CheckBoxTranslator.kt
index d8b34fb..8351fe2 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/CheckBoxTranslator.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/CheckBoxTranslator.kt
@@ -71,7 +71,7 @@
setViewEnabled(iconId, element.checked)
setImageViewColorFilter(
iconId,
- element.colors.checkBox.resolve(translationContext.context, element.checked)
+ element.colors.checkBox.getColor(translationContext.context, element.checked)
)
}
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/CompoundButtonTranslator.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/CompoundButtonTranslator.kt
index 7af4e08..5cdca85 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/CompoundButtonTranslator.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/CompoundButtonTranslator.kt
@@ -34,8 +34,8 @@
isNightMode: Boolean
): ColorStateList {
return createCheckedColorStateList(
- checked = resolve(context, isNightMode, isChecked = true),
- unchecked = resolve(context, isNightMode, isChecked = false)
+ checked = getColor(context, isNightMode, isChecked = true),
+ unchecked = getColor(context, isNightMode, isChecked = false)
)
}
@@ -59,8 +59,8 @@
)
}
-internal fun CheckableColorProvider.resolve(context: Context, isChecked: Boolean) = when (this) {
- is CheckedUncheckedColorProvider -> resolve(context, context.isNightMode, isChecked)
+internal fun CheckableColorProvider.getColor(context: Context, isChecked: Boolean) = when (this) {
+ is CheckedUncheckedColorProvider -> getColor(context, context.isNightMode, isChecked)
is ResourceCheckableColorProvider -> {
// If the user provided res id does not resolve, then resolve using the fallback
// (which cannot fail).
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/RadioButtonTranslator.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/RadioButtonTranslator.kt
index 26ffc3d..e20a8e8 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/RadioButtonTranslator.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/RadioButtonTranslator.kt
@@ -67,7 +67,7 @@
textViewId = inflateViewStub(translationContext, R.id.radioText)
val iconId = inflateViewStub(translationContext, R.id.radioIcon)
setViewEnabled(iconId, element.checked)
- setImageViewColorFilter(iconId, element.colors.radio.resolve(context, element.checked))
+ setImageViewColorFilter(iconId, element.colors.radio.getColor(context, element.checked))
}
setText(
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/SwitchTranslator.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/SwitchTranslator.kt
index 0213888..a17fd52 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/SwitchTranslator.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/SwitchTranslator.kt
@@ -78,8 +78,8 @@
val trackId = inflateViewStub(translationContext, R.id.switchTrack)
setViewEnabled(thumbId, element.checked)
setViewEnabled(trackId, element.checked)
- setImageViewColorFilter(thumbId, element.colors.thumb.resolve(context, element.checked))
- setImageViewColorFilter(trackId, element.colors.track.resolve(context, element.checked))
+ setImageViewColorFilter(thumbId, element.colors.thumb.getColor(context, element.checked))
+ setImageViewColorFilter(trackId, element.colors.track.getColor(context, element.checked))
}
setText(
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/TextTranslator.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/TextTranslator.kt
index eb07e89..78dd121 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/TextTranslator.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/translators/TextTranslator.kt
@@ -137,7 +137,7 @@
if (Build.VERSION.SDK_INT >= 31) {
setTextViewTextColorResource(resId, colorProvider.resId)
} else {
- setTextColor(resId, colorProvider.resolve(translationContext.context).toArgb())
+ setTextColor(resId, colorProvider.getColor(translationContext.context).toArgb())
}
}
is DayNightColorProvider -> {
@@ -148,7 +148,7 @@
night = colorProvider.night.toArgb()
)
} else {
- setTextColor(resId, colorProvider.resolve(translationContext.context).toArgb())
+ setTextColor(resId, colorProvider.getColor(translationContext.context).toArgb())
}
}
null -> {}
diff --git a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/unit/ColorProvider.kt b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/unit/ColorProvider.kt
index 07d0b58..e6c1775 100644
--- a/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/unit/ColorProvider.kt
+++ b/glance/glance-appwidget/src/androidMain/kotlin/androidx/glance/appwidget/unit/ColorProvider.kt
@@ -37,9 +37,9 @@
}
internal data class DayNightColorProvider(val day: Color, val night: Color) : ColorProvider {
- override fun resolve(context: Context) = resolve(context.isNightMode)
+ override fun getColor(context: Context) = getColor(context.isNightMode)
- fun resolve(isNightMode: Boolean) = if (isNightMode) night else day
+ fun getColor(isNightMode: Boolean) = if (isNightMode) night else day
}
internal val Context.isNightMode: Boolean
@@ -92,9 +92,9 @@
* Resolves the [CheckedUncheckedColorProvider] to a single [Color] given the night mode and
* checked states.
*/
- fun resolve(context: Context, isNightMode: Boolean, isChecked: Boolean) = when {
- isChecked -> checked.toDayNightColorProvider(context, isChecked).resolve(isNightMode)
- else -> unchecked.toDayNightColorProvider(context, isChecked).resolve(isNightMode)
+ fun getColor(context: Context, isNightMode: Boolean, isChecked: Boolean) = when {
+ isChecked -> checked.toDayNightColorProvider(context, isChecked).getColor(isNightMode)
+ else -> unchecked.toDayNightColorProvider(context, isChecked).getColor(isNightMode)
}
companion object {
diff --git a/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/translators/CompoundButtonTranslatorTest.kt b/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/translators/CompoundButtonTranslatorTest.kt
index fd379a3..0ccc124 100644
--- a/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/translators/CompoundButtonTranslatorTest.kt
+++ b/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/translators/CompoundButtonTranslatorTest.kt
@@ -38,7 +38,7 @@
fallback = R.color.my_color
)
- assertThat(colorProvider.resolve(lightContext, isChecked = true))
+ assertThat(colorProvider.getColor(lightContext, isChecked = true))
.isSameColorAs("#EEEEEE")
}
@@ -49,7 +49,7 @@
fallback = R.color.my_color
)
- assertThat(colorProvider.resolve(lightContext, isChecked = true))
+ assertThat(colorProvider.getColor(lightContext, isChecked = true))
.isSameColorAs("#EEEEEE")
}
@@ -60,7 +60,7 @@
fallback = R.color.my_color
)
- assertThat(colorProvider.resolve(lightContext, isChecked = true))
+ assertThat(colorProvider.getColor(lightContext, isChecked = true))
.isSameColorAs("#FF0000")
}
@@ -71,7 +71,7 @@
fallback = R.color.my_color
)
- assertThat(colorProvider.resolve(darkContext, isChecked = true))
+ assertThat(colorProvider.getColor(darkContext, isChecked = true))
.isSameColorAs("#FFFF00")
}
}
\ No newline at end of file
diff --git a/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/unit/ColorProviderTest.kt b/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/unit/ColorProviderTest.kt
index 5620dd1..b2a5637 100644
--- a/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/unit/ColorProviderTest.kt
+++ b/glance/glance-appwidget/src/test/kotlin/androidx/glance/appwidget/unit/ColorProviderTest.kt
@@ -59,13 +59,13 @@
)
assertIs<CheckedUncheckedColorProvider>(provider)
- assertThat(provider.resolve(context, isNightMode = false, isChecked = true))
+ assertThat(provider.getColor(context, isNightMode = false, isChecked = true))
.isSameColorAs("#FF0000")
- assertThat(provider.resolve(context, isNightMode = true, isChecked = true))
+ assertThat(provider.getColor(context, isNightMode = true, isChecked = true))
.isSameColorAs("#FFFF00")
- assertThat(provider.resolve(context, isNightMode = false, isChecked = false))
+ assertThat(provider.getColor(context, isNightMode = false, isChecked = false))
.isSameColorAs(Color.Red)
- assertThat(provider.resolve(context, isNightMode = true, isChecked = false))
+ assertThat(provider.getColor(context, isNightMode = true, isChecked = false))
.isSameColorAs(Color.Yellow)
}
@@ -79,13 +79,13 @@
)
assertIs<CheckedUncheckedColorProvider>(provider)
- assertThat(provider.resolve(context, isNightMode = false, isChecked = true))
+ assertThat(provider.getColor(context, isNightMode = false, isChecked = true))
.isSameColorAs(Color.Blue)
- assertThat(provider.resolve(context, isNightMode = true, isChecked = true))
+ assertThat(provider.getColor(context, isNightMode = true, isChecked = true))
.isSameColorAs(Color.Green)
- assertThat(provider.resolve(context, isNightMode = false, isChecked = false))
+ assertThat(provider.getColor(context, isNightMode = false, isChecked = false))
.isSameColorAs("#0000FF")
- assertThat(provider.resolve(context, isNightMode = true, isChecked = false))
+ assertThat(provider.getColor(context, isNightMode = true, isChecked = false))
.isSameColorAs("#00FFFF")
}
@@ -99,13 +99,13 @@
)
assertIs<CheckedUncheckedColorProvider>(provider)
- assertThat(provider.resolve(context, isNightMode = false, isChecked = true))
+ assertThat(provider.getColor(context, isNightMode = false, isChecked = true))
.isSameColorAs(Color.Blue)
- assertThat(provider.resolve(context, isNightMode = true, isChecked = true))
+ assertThat(provider.getColor(context, isNightMode = true, isChecked = true))
.isSameColorAs(Color.Green)
- assertThat(provider.resolve(context, isNightMode = false, isChecked = false))
+ assertThat(provider.getColor(context, isNightMode = false, isChecked = false))
.isSameColorAs(Color.Red)
- assertThat(provider.resolve(context, isNightMode = true, isChecked = false))
+ assertThat(provider.getColor(context, isNightMode = true, isChecked = false))
.isSameColorAs(Color.Yellow)
}
@@ -119,13 +119,13 @@
)
assertIs<CheckedUncheckedColorProvider>(provider)
- assertThat(provider.resolve(context, isNightMode = false, isChecked = true))
+ assertThat(provider.getColor(context, isNightMode = false, isChecked = true))
.isSameColorAs(Color.Blue)
- assertThat(provider.resolve(context, isNightMode = true, isChecked = true))
+ assertThat(provider.getColor(context, isNightMode = true, isChecked = true))
.isSameColorAs(Color.Blue)
- assertThat(provider.resolve(context, isNightMode = false, isChecked = false))
+ assertThat(provider.getColor(context, isNightMode = false, isChecked = false))
.isSameColorAs(Color.Red)
- assertThat(provider.resolve(context, isNightMode = true, isChecked = false))
+ assertThat(provider.getColor(context, isNightMode = true, isChecked = false))
.isSameColorAs(Color.Red)
}
@@ -155,19 +155,19 @@
@Test
fun resolveColorProvider_FixedColorProvider() {
- assertThat(ColorProvider(Color.Blue).resolve(context)).isSameColorAs(Color.Blue)
+ assertThat(ColorProvider(Color.Blue).getColor(context)).isSameColorAs(Color.Blue)
}
@Test
fun resolveColorProvider_ResourceColorProvider() {
- assertThat(ColorProvider(R.color.my_color).resolve(context))
+ assertThat(ColorProvider(R.color.my_color).getColor(context))
.isSameColorAs(Color(0xFFEEEEEE))
}
@Test
@Config(qualifiers = "+night")
fun resolveColorProvider_DayNightColorProvider() {
- assertThat(ColorProvider(Color.Blue, Color.Red).resolve(context))
+ assertThat(ColorProvider(Color.Blue, Color.Red).getColor(context))
.isSameColorAs(Color.Red)
}
}
\ No newline at end of file
diff --git a/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/WearCompositionTranslator.kt b/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/WearCompositionTranslator.kt
index 52fe283..141f83b 100644
--- a/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/WearCompositionTranslator.kt
+++ b/glance/glance-wear-tiles/src/androidMain/kotlin/androidx/glance/wear/tiles/WearCompositionTranslator.kt
@@ -153,14 +153,14 @@
private fun BackgroundModifier.toProto(context: Context): ModifiersBuilders.Background? =
this.colorProvider?.let { provider ->
ModifiersBuilders.Background.Builder()
- .setColor(argb(provider.getColor(context)))
+ .setColor(argb(provider.getColorAsArgb(context)))
.build()
}
private fun BorderModifier.toProto(context: Context): ModifiersBuilders.Border =
ModifiersBuilders.Border.Builder()
.setWidth(dp(this.width.toDp(context.resources).value))
- .setColor(argb(this.color.getColor(context)))
+ .setColor(argb(this.color.getColorAsArgb(context)))
.build()
private fun SemanticsModifier.toProto(): ModifiersBuilders.Semantics? =
@@ -177,7 +177,7 @@
.build()
}
-private fun ColorProvider.getColor(context: Context) = resolve(context).toArgb()
+private fun ColorProvider.getColorAsArgb(context: Context) = getColor(context).toArgb()
// TODO: handle parameters
private fun StartActivityAction.toProto(context: Context): ActionBuilders.LaunchAction =
@@ -406,7 +406,7 @@
): LayoutElementBuilders.FontStyle {
val fontStyleBuilder = LayoutElementBuilders.FontStyle.Builder()
- style.color?.let { fontStyleBuilder.setColor(argb(it.getColor(context))) }
+ style.color?.let { fontStyleBuilder.setColor(argb(it.getColorAsArgb(context))) }
// TODO(b/203656358): Can we support Em here too?
style.fontSize?.let {
if (!it.isSp) {
@@ -444,7 +444,7 @@
): LayoutElementBuilders.FontStyle {
val fontStyleBuilder = LayoutElementBuilders.FontStyle.Builder()
- style.color?.let { fontStyleBuilder.setColor(argb(it.getColor(context))) }
+ style.color?.let { fontStyleBuilder.setColor(argb(it.getColorAsArgb(context))) }
style.fontSize?.let { fontStyleBuilder.setSize(sp(it.value)) }
style.fontStyle?.let { fontStyleBuilder.setItalic(it == FontStyle.Italic) }
style.fontWeight?.let {
@@ -644,7 +644,7 @@
return LayoutElementBuilders.ArcLine.Builder()
.setLength(degrees(sweepAngleDegrees))
.setThickness(dp(thickness.value))
- .setColor(argb(element.color.getColor(context)))
+ .setColor(argb(element.color.getColorAsArgb(context)))
.setModifiers(translateCurvedModifiers(context, element.curvedModifier))
.build()
}
diff --git a/glance/glance/api/current.txt b/glance/glance/api/current.txt
index 11f94b4..938dfab 100644
--- a/glance/glance/api/current.txt
+++ b/glance/glance/api/current.txt
@@ -651,7 +651,7 @@
package androidx.glance.unit {
public interface ColorProvider {
- method public long resolve(android.content.Context context);
+ method public long getColor(android.content.Context context);
}
public final class ColorProviderKt {
diff --git a/glance/glance/api/public_plus_experimental_current.txt b/glance/glance/api/public_plus_experimental_current.txt
index 11f94b4..938dfab 100644
--- a/glance/glance/api/public_plus_experimental_current.txt
+++ b/glance/glance/api/public_plus_experimental_current.txt
@@ -651,7 +651,7 @@
package androidx.glance.unit {
public interface ColorProvider {
- method public long resolve(android.content.Context context);
+ method public long getColor(android.content.Context context);
}
public final class ColorProviderKt {
diff --git a/glance/glance/api/restricted_current.txt b/glance/glance/api/restricted_current.txt
index 11f94b4..938dfab 100644
--- a/glance/glance/api/restricted_current.txt
+++ b/glance/glance/api/restricted_current.txt
@@ -651,7 +651,7 @@
package androidx.glance.unit {
public interface ColorProvider {
- method public long resolve(android.content.Context context);
+ method public long getColor(android.content.Context context);
}
public final class ColorProviderKt {
diff --git a/glance/glance/src/androidMain/kotlin/androidx/glance/unit/ColorProvider.kt b/glance/glance/src/androidMain/kotlin/androidx/glance/unit/ColorProvider.kt
index f40debd..354ed42 100644
--- a/glance/glance/src/androidMain/kotlin/androidx/glance/unit/ColorProvider.kt
+++ b/glance/glance/src/androidMain/kotlin/androidx/glance/unit/ColorProvider.kt
@@ -30,7 +30,7 @@
/**
* Returns the color the provider would use in the given [context].
*/
- fun resolve(context: Context): Color
+ fun getColor(context: Context): Color
}
/** Returns a [ColorProvider] that always resolves to the [Color]. */
@@ -46,13 +46,13 @@
/** @suppress */
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
data class FixedColorProvider(val color: Color) : ColorProvider {
- override fun resolve(context: Context) = color
+ override fun getColor(context: Context) = color
}
/** @suppress */
@RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
data class ResourceColorProvider(@ColorRes val resId: Int) : ColorProvider {
- override fun resolve(context: Context): Color {
+ override fun getColor(context: Context): Color {
val androidColor = if (Build.VERSION.SDK_INT >= 23) {
ColorProviderApi23Impl.getColor(context, resId)
} else {
