From 1b3078258f06d79200786f200d864eb95d731f64 Mon Sep 17 00:00:00 2001 From: Vinit Nayak Date: Mon, 26 Jul 2021 11:50:02 -0700 Subject: [PATCH] Only set property state after back button instantiated Fixes: 194374924 Test: Repro steps don't cause crash Change-Id: I5ece220469f420d59698a56816057e248306fd32 --- .../launcher3/taskbar/NavbarButtonsViewController.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java index 357dc7bc1e..2544513ed3 100644 --- a/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java +++ b/quickstep/src/com/android/launcher3/taskbar/NavbarButtonsViewController.java @@ -160,15 +160,14 @@ public class NavbarButtonsViewController { private void initButtons(ViewGroup navContainer, ViewGroup endContainer, TaskbarNavButtonController navButtonController) { - // Hide when keyguard is showing, show when bouncer is showing - mPropertyHolders.add(new StatePropertyHolder(mBackButton, - flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 || - (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0)); - mBackButton = addButton(R.drawable.ic_sysbar_back, BUTTON_BACK, mNavButtonContainer, mControllers.navButtonController, R.id.back); mPropertyHolders.add(new StatePropertyHolder(mBackButton, flags -> (flags & FLAG_IME_VISIBLE) == 0)); + // Hide when keyguard is showing, show when bouncer is showing + mPropertyHolders.add(new StatePropertyHolder(mBackButton, + flags -> (flags & FLAG_KEYGUARD_VISIBLE) == 0 || + (flags & FLAG_ONLY_BACK_FOR_BOUNCER_VISIBLE) != 0)); // home and recents buttons View homeButton = addButton(R.drawable.ic_sysbar_home, BUTTON_HOME, navContainer,