Fix Kotlin warnings (controls)
Test: manual
Test: atest com.android.systemui.controls.management
Bug: 177438869
Change-Id: I4f6f38208647da967ebd6e2f0d5bf4ecfde6e229
diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt
index f68388d..40c2386 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt
@@ -139,7 +139,6 @@
}
private fun bindButtons() {
- val rootView = requireViewById<ViewGroup>(R.id.controls_management_root)
saveButton = requireViewById<Button>(R.id.done).apply {
isEnabled = false
setText(R.string.save)
diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsModel.kt b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsModel.kt
index ad0e7a5..d65481a 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/management/ControlsModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/management/ControlsModel.kt
@@ -114,6 +114,7 @@
val controlStatus: ControlStatus
) : ElementWrapper(), ControlInterface by controlStatus
+@Suppress("UNUSED_PARAMETER") // Use function instead of lambda for compile time alloc
private fun nullIconGetter(_a: ComponentName, _b: String): Icon? = null
data class ControlInfoWrapper(
diff --git a/packages/SystemUI/src/com/android/systemui/controls/management/FavoritesModel.kt b/packages/SystemUI/src/com/android/systemui/controls/management/FavoritesModel.kt
index f9ce636..85e8c60 100644
--- a/packages/SystemUI/src/com/android/systemui/controls/management/FavoritesModel.kt
+++ b/packages/SystemUI/src/com/android/systemui/controls/management/FavoritesModel.kt
@@ -220,7 +220,7 @@
viewHolder: RecyclerView.ViewHolder,
target: RecyclerView.ViewHolder
): Boolean {
- onMoveItem(viewHolder.adapterPosition, target.adapterPosition)
+ onMoveItem(viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
return true
}
@@ -228,7 +228,7 @@
recyclerView: RecyclerView,
viewHolder: RecyclerView.ViewHolder
): Int {
- if (viewHolder.adapterPosition < dividerPosition) {
+ if (viewHolder.bindingAdapterPosition < dividerPosition) {
return ItemTouchHelper.Callback.makeMovementFlags(MOVEMENT, 0)
} else {
return ItemTouchHelper.Callback.makeMovementFlags(0, 0)
@@ -240,7 +240,7 @@
current: RecyclerView.ViewHolder,
target: RecyclerView.ViewHolder
): Boolean {
- return target.adapterPosition < dividerPosition
+ return target.bindingAdapterPosition < dividerPosition
}
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {}
