diff options
| author | 2023-05-19 15:17:07 +0000 | |
|---|---|---|
| committer | 2023-05-19 15:17:07 +0000 | |
| commit | fd60cd89725daec00de15718f03e98560f1afc7d (patch) | |
| tree | 01c89e0f378b67ad1e84cdbbe25da99e36e49d3b /libs | |
| parent | bebfee2082eaa81168995b373f219a74d68f8dc6 (diff) | |
| parent | cd24155497acaad23b775372f26432a53d478f0d (diff) | |
Merge "Don't show user education if it's hiding" into udc-dev am: ebf2f44062 am: cd24155497
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23320751
Change-Id: I9cd45bf61727d13816b5245e5f2dd41a54a2a3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java | 2 | ||||
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java index a48be5ed5ad5..91c7cc0c6e89 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/BubbleStackView.java @@ -1346,7 +1346,7 @@ public class BubbleStackView extends FrameLayout // Recreates & shows the education views. Call when a theme/config change happens. private void updateUserEdu() { - if (isStackEduVisible()) { + if (isStackEduVisible() && !mStackEduView.isHiding()) { removeView(mStackEduView); mStackEduView = new StackEducationView(mContext, mPositioner, mBubbleController); addView(mStackEduView); diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt index 627273f093f3..d0598cd28582 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/bubbles/StackEducationView.kt @@ -37,8 +37,7 @@ class StackEducationView constructor( context: Context, positioner: BubblePositioner, controller: BubbleController -) - : LinearLayout(context) { +) : LinearLayout(context) { private val TAG = if (BubbleDebugConfig.TAG_WITH_CLASS_NAME) "BubbleStackEducationView" 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 descTextView by lazy { findViewById<TextView>(R.id.stack_education_description) } - private var isHiding = false + var isHiding = false + private set init { LayoutInflater.from(context).inflate(R.layout.bubble_stack_user_education, this) |