Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I556ad78959a2d7f47932a7a66e8d1d3eb633ec87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Mady Mellor
2023-05-19 15:14:58 +00:00
committed by Automerger Merge Worker
parent 0aefdd5fb3 ebf2f44062
commit cd24155497
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

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

@@ -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)