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

Commit 89ffd33a authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[Chipbar] Run the linter on ChipbarCoordinator. 

Bug: N/A
Test: atest ChipbarCoordinatorTest
Change-Id: I373d54df0f7179c5b95d956a1c63149727432116
parent 7d7cf413

packages/SystemUI/ktfmt_includes.txt

+0 −1
Original line number Diff line number Diff line
@@ -486,7 +486,6 @@ 
-packages/SystemUI/src/com/android/systemui/statusbar/window/StatusBarWindowStateController.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewInfo.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/TemporaryViewDisplayController.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt

-packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarRootView.kt

-packages/SystemUI/src/com/android/systemui/toast/ToastDefaultAnimation.kt

-packages/SystemUI/src/com/android/systemui/toast/ToastLogger.kt

packages/SystemUI/src/com/android/systemui/temporarydisplay/chipbar/ChipbarCoordinator.kt

+42 −43
Original line number Diff line number Diff line
@@ -65,11 +65,11 @@ import javax.inject.Inject 
 * in the list of notifications until the user dismisses them.

 *

 * Only one chipbar may be shown at a time.

 * TODO(b/245610654): Should we just display whichever chipbar was most recently requested, or do we

 *   need to maintain a priority ordering?

 */

@SysUISingleton

open class ChipbarCoordinator @Inject constructor(

open class ChipbarCoordinator

@Inject

constructor(

    context: Context,

    logger: ChipbarLogger,

    windowManager: WindowManager,
@@ -84,7 +84,8 @@ open class ChipbarCoordinator @Inject constructor( 
    private val vibratorHelper: VibratorHelper,

    wakeLockBuilder: WakeLock.Builder,

    systemClock: SystemClock,

) : TemporaryViewDisplayController<ChipbarInfo, ChipbarLogger>(

) :

    TemporaryViewDisplayController<ChipbarInfo, ChipbarLogger>(

        context,

        logger,

        windowManager,
@@ -100,14 +101,10 @@ open class ChipbarCoordinator @Inject constructor( 


    private lateinit var parent: ChipbarRootView



    override val windowLayoutParams = commonWindowLayoutParams.apply {

        gravity = Gravity.TOP.or(Gravity.CENTER_HORIZONTAL)

    }

    override val windowLayoutParams =

        commonWindowLayoutParams.apply { gravity = Gravity.TOP.or(Gravity.CENTER_HORIZONTAL) }



    override fun updateView(

        newInfo: ChipbarInfo,

        currentView: ViewGroup

    ) {

    override fun updateView(newInfo: ChipbarInfo, currentView: ViewGroup) {

        logger.logViewUpdate(

            newInfo.windowTitle,

            newInfo.text.loadText(context),
@@ -123,7 +120,8 @@ open class ChipbarCoordinator @Inject constructor( 


        // Detect falsing touches on the chip.

        parent = currentView.requireViewById(R.id.chipbar_root_view)

        parent.touchHandler = object : Gefingerpoken {

        parent.touchHandler =

            object : Gefingerpoken {

                override fun onTouchEvent(ev: MotionEvent?): Boolean {

                    falsingCollector.onTouchEvent(ev)

                    return false
@@ -155,8 +153,10 @@ open class ChipbarCoordinator @Inject constructor( 
        if (newInfo.endItem is ChipbarEndItem.Button) {

            TextViewBinder.bind(buttonView, newInfo.endItem.text)



            val onClickListener = View.OnClickListener { clickedView ->

                if (falsingManager.isFalseTap(FalsingManager.LOW_PENALTY)) return@OnClickListener

            val onClickListener =

                View.OnClickListener { clickedView ->

                    if (falsingManager.isFalseTap(FalsingManager.LOW_PENALTY))

                        return@OnClickListener

                    newInfo.endItem.onClickListener.onClick(clickedView)

                }
@@ -168,7 +168,8 @@ open class ChipbarCoordinator @Inject constructor( 


        // ---- Overall accessibility ----

        val iconDesc = newInfo.startIcon.icon.contentDescription

        val loadedIconDesc = if (iconDesc != null) {

        val loadedIconDesc =

            if (iconDesc != null) {

                "${iconDesc.loadContentDescription(context)} "

            } else {

                ""
@@ -187,9 +188,7 @@ open class ChipbarCoordinator @Inject constructor( 
        maybeGetAccessibilityFocus(newInfo, currentView)



        // ---- Haptics ----

        newInfo.vibrationEffect?.let {

            vibratorHelper.vibrate(it)

        }

        newInfo.vibrationEffect?.let { vibratorHelper.vibrate(it) }

    }



    private fun maybeGetAccessibilityFocus(info: ChipbarInfo?, view: ViewGroup) {