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

Commit cd241554 authored by Mady Mellor's avatar Mady Mellor Committed by Automerger Merge Worker
Browse files

Merge "Don't show user education if it's hiding" into udc-dev am: ebf2f440 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23320751



Change-Id: I556ad78959a2d7f47932a7a66e8d1d3eb633ec87
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0aefdd5f ebf2f440

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1346,7 +1346,7 @@ public class BubbleStackView extends FrameLayout 




    // Recreates & shows the education views. Call when a theme/config change happens.

    // Recreates & shows the education views. Call when a theme/config change happens.

    private void updateUserEdu() {

    private void updateUserEdu() {

        if (isStackEduVisible()) {

        if (isStackEduVisible() && !mStackEduView.isHiding()) {

            removeView(mStackEduView);

            removeView(mStackEduView);

            mStackEduView = new StackEducationView(mContext, mPositioner, mBubbleController);

            mStackEduView = new StackEducationView(mContext, mPositioner, mBubbleController);

            addView(mStackEduView);

            addView(mStackEduView);

libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt

+3 −3
Original line number Original line Diff line number Diff line
@@ -37,8 +37,7 @@ class StackEducationView constructor( 
    context: Context,

    context: Context,

    positioner: BubblePositioner,

    positioner: BubblePositioner,

    controller: BubbleController

    controller: BubbleController

)

) : LinearLayout(context) {

    : LinearLayout(context) {





    private val TAG = if (BubbleDebugConfig.TAG_WITH_CLASS_NAME) "BubbleStackEducationView"

    private val TAG = if (BubbleDebugConfig.TAG_WITH_CLASS_NAME) "BubbleStackEducationView"

        else BubbleDebugConfig.TAG_BUBBLES

        else BubbleDebugConfig.TAG_BUBBLES
@@ -53,7 +52,8 @@ class StackEducationView constructor( 
    private val titleTextView by lazy { findViewById<TextView>(R.id.stack_education_title) }

    private val titleTextView by lazy { findViewById<TextView>(R.id.stack_education_title) }

    private val descTextView by lazy { findViewById<TextView>(R.id.stack_education_description) }

    private val descTextView by lazy { findViewById<TextView>(R.id.stack_education_description) }





    private var isHiding = false

    var isHiding = false

        private set





    init {

    init {

        LayoutInflater.from(context).inflate(R.layout.bubble_stack_user_education, this)

        LayoutInflater.from(context).inflate(R.layout.bubble_stack_user_education, this)