Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Kotlin warnings (controls)

Browse Source 
Test: manual
Test: atest com.android.systemui.controls.management
Bug: 177438869
Change-Id: I4f6f38208647da967ebd6e2f0d5bf4ecfde6e229
This commit is contained in:
Fabian Kozynski
2021-01-13 15:29:39 -05:00
parent 23c36e41d1
commit c7a35a4113
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/src/com/android/systemui/controls/management/ControlsEditingActivity.kt
View File

@@ -139,7 +139,6 @@ class ControlsEditingActivity @Inject constructor(
}
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)

1
packages/SystemUI/src/com/android/systemui/controls/management/ControlsModel.kt
View File

@@ -114,6 +114,7 @@ data class ControlStatusWrapper(
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(

6
packages/SystemUI/src/com/android/systemui/controls/management/FavoritesModel.kt
View File

@@ -220,7 +220,7 @@ class FavoritesModel(
viewHolder: RecyclerView.ViewHolder,
target: RecyclerView.ViewHolder
): Boolean {
onMoveItem(viewHolder.adapterPosition, target.adapterPosition)
onMoveItem(viewHolder.bindingAdapterPosition, target.bindingAdapterPosition)
return true
}
@@ -228,7 +228,7 @@ class FavoritesModel(
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 @@ class FavoritesModel(
current: RecyclerView.ViewHolder,
target: RecyclerView.ViewHolder
): Boolean {
return target.adapterPosition < dividerPosition
return target.bindingAdapterPosition < dividerPosition
}
override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {}