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

Commit 94dabaf8 authored by Aaron Liu's avatar Aaron Liu
Browse files

Add parent class for shortcut sections 

Add parent class to encapsulate redundant logic and to define equality
and hashcode for set diffing.

Fixes: 299499116
Test: switch between default and alignshortcuts blueprints.

Change-Id: Iec8e6fa48f83ae45518be1b860cee58ffd1e521c
parent 897e289b

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/AlignShortcutsToUdfpsSection.kt

+1 −72
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ 
package com.android.systemui.keyguard.ui.view.layout.sections



import android.content.res.Resources

import android.view.View

import android.widget.ImageView

import androidx.constraintlayout.widget.ConstraintLayout

import androidx.constraintlayout.widget.ConstraintSet

import androidx.constraintlayout.widget.ConstraintSet.BOTTOM
@@ -27,13 +25,10 @@ import androidx.constraintlayout.widget.ConstraintSet.LEFT 
import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID

import androidx.constraintlayout.widget.ConstraintSet.RIGHT

import androidx.constraintlayout.widget.ConstraintSet.TOP

import androidx.core.content.res.ResourcesCompat

import com.android.systemui.R

import com.android.systemui.animation.view.LaunchableImageView

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.shared.model.KeyguardSection

import com.android.systemui.keyguard.ui.binder.KeyguardQuickAffordanceViewBinder

import com.android.systemui.keyguard.ui.viewmodel.KeyguardQuickAffordancesCombinedViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel
@@ -53,10 +48,7 @@ constructor( 
    private val falsingManager: FalsingManager,

    private val indicationController: KeyguardIndicationController,

    private val vibratorHelper: VibratorHelper,

) : KeyguardSection() {

    private var leftShortcutHandle: KeyguardQuickAffordanceViewBinder.Binding? = null

    private var rightShortcutHandle: KeyguardQuickAffordanceViewBinder.Binding? = null



) : BaseShortcutSection() {

    override fun addViews(constraintLayout: ConstraintLayout) {

        if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {

            addLeftShortcut(constraintLayout)
@@ -109,67 +101,4 @@ constructor( 
            connect(R.id.end_button, BOTTOM, R.id.lock_icon_view, BOTTOM)

        }

    }



    override fun removeViews(constraintLayout: ConstraintLayout) {

        leftShortcutHandle?.destroy()

        rightShortcutHandle?.destroy()

        constraintLayout.removeView(R.id.start_button)

        constraintLayout.removeView(R.id.end_button)

    }



    private fun addLeftShortcut(constraintLayout: ConstraintLayout) {

        val padding =

            constraintLayout.resources.getDimensionPixelSize(

                R.dimen.keyguard_affordance_fixed_padding

            )

        val view =

            LaunchableImageView(constraintLayout.context, null).apply {

                id = R.id.start_button

                scaleType = ImageView.ScaleType.FIT_CENTER

                background =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_bg,

                        context.theme

                    )

                foreground =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_selected_border,

                        context.theme

                    )

                visibility = View.INVISIBLE

                setPadding(padding, padding, padding, padding)

            }

        constraintLayout.addView(view)

    }



    private fun addRightShortcut(constraintLayout: ConstraintLayout) {

        if (constraintLayout.findViewById<View>(R.id.end_button) != null) return



        val padding =

            constraintLayout.resources.getDimensionPixelSize(

                R.dimen.keyguard_affordance_fixed_padding

            )

        val view =

            LaunchableImageView(constraintLayout.context, null).apply {

                id = R.id.end_button

                scaleType = ImageView.ScaleType.FIT_CENTER

                background =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_bg,

                        context.theme

                    )

                foreground =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_selected_border,

                        context.theme

                    )

                visibility = View.INVISIBLE

                setPadding(padding, padding, padding, padding)

            }

        constraintLayout.addView(view)

    }

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/BaseShortcutSection.kt

0 → 100644
+99 −0
Original line number Diff line number Diff line 
package com.android.systemui.keyguard.ui.view.layout.sections



import android.view.View

import android.widget.ImageView

import androidx.constraintlayout.widget.ConstraintLayout

import androidx.core.content.res.ResourcesCompat

import com.android.systemui.R

import com.android.systemui.animation.view.LaunchableImageView

import com.android.systemui.keyguard.shared.model.KeyguardSection

import com.android.systemui.keyguard.ui.binder.KeyguardQuickAffordanceViewBinder



abstract class BaseShortcutSection : KeyguardSection() {

    protected var leftShortcutHandle: KeyguardQuickAffordanceViewBinder.Binding? = null

    protected var rightShortcutHandle: KeyguardQuickAffordanceViewBinder.Binding? = null



    override fun removeViews(constraintLayout: ConstraintLayout) {

        leftShortcutHandle?.destroy()

        rightShortcutHandle?.destroy()

        constraintLayout.removeView(R.id.start_button)

        constraintLayout.removeView(R.id.end_button)

    }



    protected fun addLeftShortcut(constraintLayout: ConstraintLayout) {

        val padding =

            constraintLayout.resources.getDimensionPixelSize(

                R.dimen.keyguard_affordance_fixed_padding

            )

        val view =

            LaunchableImageView(constraintLayout.context, null).apply {

                id = R.id.start_button

                scaleType = ImageView.ScaleType.FIT_CENTER

                background =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_bg,

                        context.theme

                    )

                foreground =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_selected_border,

                        context.theme

                    )

                visibility = View.INVISIBLE

                setPadding(padding, padding, padding, padding)

            }

        constraintLayout.addView(view)

    }



    protected fun addRightShortcut(constraintLayout: ConstraintLayout) {

        if (constraintLayout.findViewById<View>(R.id.end_button) != null) return



        val padding =

            constraintLayout.resources.getDimensionPixelSize(

                R.dimen.keyguard_affordance_fixed_padding

            )

        val view =

            LaunchableImageView(constraintLayout.context, null).apply {

                id = R.id.end_button

                scaleType = ImageView.ScaleType.FIT_CENTER

                background =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_bg,

                        context.theme

                    )

                foreground =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_selected_border,

                        context.theme

                    )

                visibility = View.INVISIBLE

                setPadding(padding, padding, padding, padding)

            }

        constraintLayout.addView(view)

    }

    /**

     * Defines equality as same class.

     *

     * This is to enable set operations to be done as an optimization to blueprint transitions.

     */

    override fun equals(other: Any?): Boolean {

        return other is BaseShortcutSection

    }



    /**

     * Defines hashcode as class.

     *

     * This is to enable set operations to be done as an optimization to blueprint transitions.

     */

    override fun hashCode(): Int {

        return KEY.hashCode()

    }



    companion object {

        private const val KEY = "shortcuts"

    }

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultShortcutsSection.kt

+1 −72
Original line number Diff line number Diff line
@@ -18,21 +18,16 @@ 
package com.android.systemui.keyguard.ui.view.layout.sections



import android.content.res.Resources

import android.view.View

import android.widget.ImageView

import androidx.constraintlayout.widget.ConstraintLayout

import androidx.constraintlayout.widget.ConstraintSet

import androidx.constraintlayout.widget.ConstraintSet.BOTTOM

import androidx.constraintlayout.widget.ConstraintSet.LEFT

import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID

import androidx.constraintlayout.widget.ConstraintSet.RIGHT

import androidx.core.content.res.ResourcesCompat

import com.android.systemui.R

import com.android.systemui.animation.view.LaunchableImageView

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.keyguard.shared.model.KeyguardSection

import com.android.systemui.keyguard.ui.binder.KeyguardQuickAffordanceViewBinder

import com.android.systemui.keyguard.ui.viewmodel.KeyguardQuickAffordancesCombinedViewModel

import com.android.systemui.keyguard.ui.viewmodel.KeyguardRootViewModel
@@ -52,10 +47,7 @@ constructor( 
    private val falsingManager: FalsingManager,

    private val indicationController: KeyguardIndicationController,

    private val vibratorHelper: VibratorHelper,

) : KeyguardSection() {

    private var leftShortcutHandle: KeyguardQuickAffordanceViewBinder.Binding? = null

    private var rightShortcutHandle: KeyguardQuickAffordanceViewBinder.Binding? = null



) : BaseShortcutSection() {

    override fun addViews(constraintLayout: ConstraintLayout) {

        if (featureFlags.isEnabled(Flags.MIGRATE_SPLIT_KEYGUARD_BOTTOM_AREA)) {

            addLeftShortcut(constraintLayout)
@@ -108,67 +100,4 @@ constructor( 
            connect(R.id.end_button, BOTTOM, PARENT_ID, BOTTOM, verticalOffsetMargin)

        }

    }



    override fun removeViews(constraintLayout: ConstraintLayout) {

        leftShortcutHandle?.destroy()

        rightShortcutHandle?.destroy()

        constraintLayout.removeView(R.id.start_button)

        constraintLayout.removeView(R.id.end_button)

    }



    private fun addLeftShortcut(constraintLayout: ConstraintLayout) {

        val padding =

            constraintLayout.resources.getDimensionPixelSize(

                R.dimen.keyguard_affordance_fixed_padding

            )

        val view =

            LaunchableImageView(constraintLayout.context, null).apply {

                id = R.id.start_button

                scaleType = ImageView.ScaleType.FIT_CENTER

                background =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_bg,

                        context.theme

                    )

                foreground =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_selected_border,

                        context.theme

                    )

                visibility = View.INVISIBLE

                setPadding(padding, padding, padding, padding)

            }

        constraintLayout.addView(view)

    }



    private fun addRightShortcut(constraintLayout: ConstraintLayout) {

        if (constraintLayout.findViewById<View>(R.id.end_button) != null) return



        val padding =

            constraintLayout.resources.getDimensionPixelSize(

                R.dimen.keyguard_affordance_fixed_padding

            )

        val view =

            LaunchableImageView(constraintLayout.context, null).apply {

                id = R.id.end_button

                scaleType = ImageView.ScaleType.FIT_CENTER

                background =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_bg,

                        context.theme

                    )

                foreground =

                    ResourcesCompat.getDrawable(

                        context.resources,

                        R.drawable.keyguard_bottom_affordance_selected_border,

                        context.theme

                    )

                visibility = View.INVISIBLE

                setPadding(padding, padding, padding, padding)

            }

        constraintLayout.addView(view)

    }

}