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

Commit 93e844f3 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Fix Kotlin warnings"

parents 8887c6da 6e51a705

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsFavoritePersistenceWrapper.kt

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ class ControlsFavoritePersistenceWrapper( 
    }



    private fun parseXml(parser: XmlPullParser): List<ControlInfo> {

        var type = 0

        var type: Int

        val infos = mutableListOf<ControlInfo>()

        while (parser.next().also { type = it } != XmlPullParser.END_DOCUMENT) {

            if (type == XmlPullParser.END_TAG || type == XmlPullParser.TEXT) {

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

+3 −3
Original line number Diff line number Diff line
@@ -58,13 +58,13 @@ class AppAdapter( 
    private var listOfServices = emptyList<CandidateInfo>()



    private val callback = object : ControlsListingController.ControlsListingCallback {

        override fun onServicesUpdated(list: List<CandidateInfo>) {

        override fun onServicesUpdated(candidates: List<CandidateInfo>) {

            backgroundExecutor.execute {

                val collator = Collator.getInstance(resources.getConfiguration().locale)

                val collator = Collator.getInstance(resources.configuration.locales[0])

                val localeComparator = compareBy<CandidateInfo, CharSequence>(collator) {

                    it.loadLabel()

                }

                listOfServices = list.sortedWith(localeComparator)

                listOfServices = candidates.sortedWith(localeComparator)

                uiExecutor.execute(::notifyDataSetChanged)

            }

        }

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

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class ControlsFavoritingActivity @Inject constructor( 
            target: RecyclerView.ViewHolder

        ): Boolean {

            return currentModel?.onMoveItem(

                    viewHolder.adapterPosition, target.adapterPosition) != null

                    viewHolder.layoutPosition, target.layoutPosition) != null

        }



        override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {}

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

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,6 @@ interface ControlsListingController : 


    @FunctionalInterface

    interface ControlsListingCallback {

        fun onServicesUpdated(list: List<CandidateInfo>)

        fun onServicesUpdated(candidates: List<CandidateInfo>)

    }

}

packages/SystemUI/src/com/android/systemui/controls/ui/ControlsUiControllerImpl.kt

+1 −2
Original line number Diff line number Diff line
@@ -130,8 +130,7 @@ class ControlsUiControllerImpl @Inject constructor ( 
    private val listingCallback = object : ControlsListingController.ControlsListingCallback {

        override fun onServicesUpdated(candidates: List<CandidateInfo>) {

            bgExecutor.execute {

                val collator = Collator.getInstance(context.getResources()

                        .getConfiguration().locale)

                val collator = Collator.getInstance(context.resources.configuration.locales[0])

                val localeComparator = compareBy<CandidateInfo, CharSequence>(collator) {

                    it.loadLabel()

                }