Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7a35a41 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Fix Kotlin warnings (controls) 

Test: manual
Test: atest com.android.systemui.controls.management
Bug: 177438869
Change-Id: I4f6f38208647da967ebd6e2f0d5bf4ecfde6e229
parent 23c36e41

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

+0 −1
Original line number Diff line number Diff line
@@ -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)

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

+1 −0
Original line number Diff line number Diff line
@@ -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(

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

+3 −3
Original line number Diff line number Diff line
@@ -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) {}