Merge "Revert "Destroy and reinflate bouncer before showing"" into tm-qpr-dev

packages/SystemUI/src/com/android/keyguard/KeyguardHostViewController.java

@@ -202,11 +202,8 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>
         mKeyguardSecurityContainerController.onPause();
     }
 
-    /**
+    public void resetSecurityContainer() {
-     * Reinflate the view flipper child view.
+        mKeyguardSecurityContainerController.reset();
-     */
-    public void reinflateViewFlipper() {
-        mKeyguardSecurityContainerController.reinflateViewFlipper();
     }
 
     /**
@@ -235,19 +232,23 @@ public class KeyguardHostViewController extends ViewController<KeyguardHostView>
     /**
      * Starts the animation when the Keyguard gets shown.
      */
-    public void appear() {
+    public void appear(int statusBarHeight) {
         // We might still be collapsed and the view didn't have time to layout yet or still
         // be small, let's wait on the predraw to do the animation in that case.
-        mView.getViewTreeObserver().addOnPreDrawListener(
+        if (mView.getHeight() != 0 && mView.getHeight() != statusBarHeight) {
-                new ViewTreeObserver.OnPreDrawListener() {
+            mKeyguardSecurityContainerController.startAppearAnimation();
-                    @Override
+        } else {
-                    public boolean onPreDraw() {
+            mView.getViewTreeObserver().addOnPreDrawListener(
-                        mView.getViewTreeObserver().removeOnPreDrawListener(this);
+                    new ViewTreeObserver.OnPreDrawListener() {
-                        mKeyguardSecurityContainerController.startAppearAnimation();
+                        @Override
-                        return true;
+                        public boolean onPreDraw() {
-                    }
+                            mView.getViewTreeObserver().removeOnPreDrawListener(this);
-                });
+                            mKeyguardSecurityContainerController.startAppearAnimation();
-        mView.requestLayout();
+                            return true;
+                        }
+                    });
+            mView.requestLayout();
+        }
     }
 
     /**

packages/SystemUI/src/com/android/keyguard/KeyguardSecurityContainerController.java

@@ -743,20 +743,17 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard
     }
 
     private void reloadColors() {
-        reinflateViewFlipper();
+        resetViewFlipper();
         mView.reloadColors();
     }
 
     /** Handles density or font scale changes. */
     private void onDensityOrFontScaleChanged() {
-        reinflateViewFlipper();
+        resetViewFlipper();
         mView.onDensityOrFontScaleChanged();
     }
 
-    /**
+    private void resetViewFlipper() {
-     * Reinflate the view flipper child view.
-     */
-    public void reinflateViewFlipper() {
         mSecurityViewFlipperController.clearViews();
         mSecurityViewFlipperController.getSecurityView(mCurrentSecurityMode,
                 mKeyguardSecurityCallback);

packages/SystemUI/src/com/android/systemui/keyguard/ui/binder/KeyguardBouncerViewBinder.kt

@@ -22,6 +22,7 @@ import android.view.ViewGroup
 import android.window.OnBackAnimationCallback
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.repeatOnLifecycle
+import com.android.internal.policy.SystemBarUtils
 import com.android.keyguard.KeyguardHostViewController
 import com.android.keyguard.KeyguardSecurityModel
 import com.android.keyguard.KeyguardUpdateMonitor
@@ -97,14 +98,14 @@ object KeyguardBouncerViewBinder {
                     viewModel.setBouncerViewDelegate(delegate)
                     launch {
                         viewModel.show.collect {
-                            // Reset Security Container entirely.
-                            hostViewController.reinflateViewFlipper()
                             hostViewController.showPromptReason(it.promptReason)
                             it.errorMessage?.let { errorMessage ->
                                 hostViewController.showErrorMessage(errorMessage)
                             }
                             hostViewController.showPrimarySecurityScreen()
-                            hostViewController.appear()
+                            hostViewController.appear(
+                                SystemBarUtils.getStatusBarHeight(view.context)
+                            )
                             hostViewController.onResume()
                         }
                     }
@@ -113,6 +114,7 @@ object KeyguardBouncerViewBinder {
                         viewModel.hide.collect {
                             hostViewController.cancelDismissAction()
                             hostViewController.cleanUp()
+                            hostViewController.resetSecurityContainer()
                         }
                     }
 
@@ -157,6 +159,15 @@ object KeyguardBouncerViewBinder {
                         }
                     }
 
+                    launch {
+                        viewModel.isBouncerVisible
+                            .filter { !it }
+                            .collect {
+                                // Remove existing input for security reasons.
+                                hostViewController.resetSecurityContainer()
+                            }
+                    }
+
                     launch {
                         viewModel.keyguardPosition.collect { position ->
                             hostViewController.updateKeyguardPosition(position)

packages/SystemUI/tests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.java

@@ -600,14 +600,6 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase {
                 any(KeyguardSecurityCallback.class));
     }
 
-    @Test
-    public void testReinflateViewFlipper() {
-        mKeyguardSecurityContainerController.reinflateViewFlipper();
-        verify(mKeyguardSecurityViewFlipperController).clearViews();
-        verify(mKeyguardSecurityViewFlipperController).getSecurityView(any(SecurityMode.class),
-                any(KeyguardSecurityCallback.class));
-    }
-
     private KeyguardSecurityContainer.SwipeListener getRegisteredSwipeListener() {
         mKeyguardSecurityContainerController.onViewAttached();
         verify(mView).setSwipeListener(mSwipeListenerArgumentCaptor.capture());