From dd319c4a2af85e35ce4915a31adf9580b740e1a7 Mon Sep 17 00:00:00 2001
From: Michael Wright <michaelwr@google.com>
Date: Fri, 15 Jan 2021 15:21:23 +0000
Subject: [PATCH] Clean up SysUI Kotlin warnings

Bug: 177652618
Test: Compiles
Change-Id: Ic2b318e40f93184ae4a09eb0984488603fbb9ece
---
 .../EasterEgg/src/com/android/egg/neko/NekoControlsService.kt | 4 ++--
 packages/EasterEgg/src/com/android/egg/paint/ToolbarView.kt   | 1 +
 .../EasterEgg/src/com/android/egg/quares/QuaresActivity.kt    | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/EasterEgg/src/com/android/egg/neko/NekoControlsService.kt b/packages/EasterEgg/src/com/android/egg/neko/NekoControlsService.kt
index 56f599a3a2198..7efaf0b37de13 100644
--- a/packages/EasterEgg/src/com/android/egg/neko/NekoControlsService.kt
+++ b/packages/EasterEgg/src/com/android/egg/neko/NekoControlsService.kt
@@ -74,6 +74,7 @@ public class NekoControlsService : ControlsProviderService(), PrefState.PrefsLis
     private val controls = HashMap<String, Control>()
     private val publishers = ArrayList<UglyPublisher>()
     private val rng = Random()
+    private val metricsLogger = MetricsLogger()
 
     private var lastToyIcon: Icon? = null
 
@@ -184,7 +185,6 @@ public class NekoControlsService : ControlsProviderService(), PrefState.PrefsLis
         return getPendingIntent()
     }
 
-
     override fun performControlAction(
         controlId: String,
         action: ControlAction,
@@ -196,7 +196,7 @@ public class NekoControlsService : ControlsProviderService(), PrefState.PrefsLis
                 controls[CONTROL_ID_FOOD] = makeFoodBowlControl(true)
                 Log.v(TAG, "Bowl refilled. (Registering job.)")
                 NekoService.registerJob(this, FOOD_SPAWN_CAT_DELAY_MINS)
-                MetricsLogger.histogram(this, "egg_neko_offered_food", 11)
+                metricsLogger.histogram("egg_neko_offered_food", 11)
                 prefs.foodState = 11
             }
             CONTROL_ID_TOY -> {
diff --git a/packages/EasterEgg/src/com/android/egg/paint/ToolbarView.kt b/packages/EasterEgg/src/com/android/egg/paint/ToolbarView.kt
index 460fa3a7241fb..20527afd9652f 100644
--- a/packages/EasterEgg/src/com/android/egg/paint/ToolbarView.kt
+++ b/packages/EasterEgg/src/com/android/egg/paint/ToolbarView.kt
@@ -47,6 +47,7 @@ class ToolbarView : FrameLayout {
     ) : super(context, attrs, defStyle) {
     }
 
+    @Suppress("DEPRECATION")
     override fun onApplyWindowInsets(insets: WindowInsets?): WindowInsets {
         var lp = layoutParams as FrameLayout.LayoutParams?
         if (lp != null && insets != null) {
diff --git a/packages/EasterEgg/src/com/android/egg/quares/QuaresActivity.kt b/packages/EasterEgg/src/com/android/egg/quares/QuaresActivity.kt
index ce439a9a663ca..578de01a0c30c 100644
--- a/packages/EasterEgg/src/com/android/egg/quares/QuaresActivity.kt
+++ b/packages/EasterEgg/src/com/android/egg/quares/QuaresActivity.kt
@@ -49,6 +49,7 @@ class QuaresActivity : Activity() {
     private lateinit var label: Button
     private lateinit var grid: GridLayout
 
+    @Suppress("DEPRECATION")
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)