diff options
| author | 2025-02-27 12:10:16 -0800 | |
|---|---|---|
| committer | 2025-02-27 12:10:16 -0800 | |
| commit | 91e577158548d7ccd5452daa7117eb5ba38e83c0 (patch) | |
| tree | 91a28abf1700bb90efcea491745240eb121d9113 | |
| parent | cdecd6183a918f848e29dd9435cfdeeefd061591 (diff) | |
| parent | d5a26b179eef3a05891444d89f9f2cf9aa019257 (diff) | |
Merge "Fix deprecation errors in EasterEgg." into main am: d5a26b179e
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3511850
Change-Id: I296db83502b4e33a93e61f7ccba12a0ebca0bdc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
3 files changed, 3 insertions, 4 deletions
diff --git a/packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt b/packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt index fb5954ec9736..4f5a88e85457 100644 --- a/packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt +++ b/packages/EasterEgg/src/com/android/egg/landroid/Autopilot.kt @@ -43,7 +43,7 @@ class Autopilot(val ship: Spacecraft, val universe: Universe) : Entity { get() = listOf( "---- AUTOPILOT ENGAGED ----", - "TGT: " + (target?.name?.toUpperCase() ?: "SELECTING..."), + "TGT: " + (target?.name?.uppercase() ?: "SELECTING..."), "EXE: $strategy" + if (debug.isNotEmpty()) " ($debug)" else "", ) .joinToString("\n") diff --git a/packages/EasterEgg/src/com/android/egg/landroid/MainActivity.kt b/packages/EasterEgg/src/com/android/egg/landroid/MainActivity.kt index 16ec1a933d92..927216e54b5e 100644 --- a/packages/EasterEgg/src/com/android/egg/landroid/MainActivity.kt +++ b/packages/EasterEgg/src/com/android/egg/landroid/MainActivity.kt @@ -64,7 +64,6 @@ import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.toUpperCase import androidx.compose.ui.tooling.preview.Devices import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -226,7 +225,7 @@ fun Telemetry(universe: VisibleUniverse) { val distToClosest = ((closest.pos - pos).mag() - closest.radius).toInt() listOfNotNull( landing?.let { - "LND: ${it.planet.name.toUpperCase()}\nJOB: ${it.text}" + "LND: ${it.planet.name.uppercase()}\nJOB: ${it.text}" } ?: if (distToClosest < 10_000) { "ALT: $distToClosest" diff --git a/packages/EasterEgg/src/com/android/egg/landroid/Namer.kt b/packages/EasterEgg/src/com/android/egg/landroid/Namer.kt index 73318077f47a..28e56d045ed9 100644 --- a/packages/EasterEgg/src/com/android/egg/landroid/Namer.kt +++ b/packages/EasterEgg/src/com/android/egg/landroid/Namer.kt @@ -121,6 +121,6 @@ class Namer(resources: Resources) { else -> "unknown template tag: ${it.groupValues[0]}" } } - .toUpperCase() + .uppercase() } } |