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

Commit b63b5dbb authored by Catherine Liang's avatar Catherine Liang
Browse files

Fix shortcuts flash in wallpaper picker preview 

When the lock screen preview is initialized in the wallpaper picker,
empty shortcuts flash in for a moment before showing correctly, and is
especially noticeable if only zero or one shortcuts are set. This is
occuring when the KeyguardBottomAreaRefactor flag is enabled, because
the start and end shortcuts buttons, which are supposed to start out
invisible, is set to visible when the blueprint constraint set is
applied. Setting the visibility mode to ignore for both the buttons
resolves the issue and allows the buttons to remain invisible on
initialization.

Flag: ACONFIG com.android.systemui.keyguard_bottom_area_refactor STAGING
Bug: 319479474
Test: manually verified that when flag is turned on, flash no longer
appears in the wallpaper picker preview, also verified that shortcuts
still appear correctly on lock screen.

Change-Id: I97d1660bb8bd097f10b41f8fdb38309a7209fb97
parent 92daab22

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

+6 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import androidx.constraintlayout.widget.ConstraintSet.BOTTOM 
import androidx.constraintlayout.widget.ConstraintSet.LEFT

import androidx.constraintlayout.widget.ConstraintSet.LEFT

import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID

import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID

import androidx.constraintlayout.widget.ConstraintSet.RIGHT

import androidx.constraintlayout.widget.ConstraintSet.RIGHT

import androidx.constraintlayout.widget.ConstraintSet.VISIBILITY_MODE_IGNORE

import com.android.systemui.Flags.keyguardBottomAreaRefactor

import com.android.systemui.Flags.keyguardBottomAreaRefactor

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

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

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

import com.android.systemui.keyguard.ui.binder.KeyguardQuickAffordanceViewBinder
@@ -96,6 +97,11 @@ constructor( 
            constrainHeight(R.id.end_button, height)

            constrainHeight(R.id.end_button, height)

            connect(R.id.end_button, RIGHT, PARENT_ID, RIGHT, horizontalOffsetMargin)

            connect(R.id.end_button, RIGHT, PARENT_ID, RIGHT, horizontalOffsetMargin)

            connect(R.id.end_button, BOTTOM, PARENT_ID, BOTTOM, verticalOffsetMargin)

            connect(R.id.end_button, BOTTOM, PARENT_ID, BOTTOM, verticalOffsetMargin)



            // The constraint set visibility for start and end button are default visible, set to

            // ignore so the view's own initial visibility (invisible) is used

            setVisibilityMode(R.id.start_button, VISIBILITY_MODE_IGNORE)

            setVisibilityMode(R.id.end_button, VISIBILITY_MODE_IGNORE)

        }

        }

    }

    }

}
 
}