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

Commit 71dd4844 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Do not request focus during wake and unlock 

Focus was being required because the expansion of the panel
would trigger onFullyShown. Bouncer shouldn't need any
translation during WAKE_AND_UNLOCK.

Test: atest packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java
Test: go/sysui-bouncer-tests
Change-Id: I6d5c17ba89e14384859cf7fc91ca5cc2815dbfd9
Fixes: 80345339
parent d8f3889b

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java

+4 −2
Original line number Diff line number Diff line
@@ -173,11 +173,13 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb 
                || mStatusBar.isFullScreenUserSwitcherState()) {

            mBouncer.setExpansion(KeyguardBouncer.EXPANSION_VISIBLE);

        } else if (mShowing && !mDozing) {

            if (!isWakeAndUnlocking()) {

                mBouncer.setExpansion(expansion);

            }

            if (expansion != KeyguardBouncer.EXPANSION_HIDDEN && tracking

                    && mStatusBar.isKeyguardCurrentlySecure()

                    && !mBouncer.isShowing() && !mBouncer.isAnimatingAway()) {

                mBouncer.show(false /* resetSecuritySelection */, false /* animated */);

                mBouncer.show(false /* resetSecuritySelection */, false /* scrimmed */);

            }

        }

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManagerTest.java

+10 −3
Original line number Diff line number Diff line
@@ -16,14 +16,12 @@ 


package com.android.systemui.statusbar.phone;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyFloat;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyZeroInteractions;

import static org.mockito.Mockito.when;



import android.content.Context;
@@ -170,6 +168,15 @@ public class StatusBarKeyguardViewManagerTest extends SysuiTestCase { 
        verify(mBouncer, never()).setExpansion(eq(0.5f));

    }



    @Test

    public void onPanelExpansionChanged_neverTranslatesBouncerWhenWakeAndUnlock() {

        when(mFingerprintUnlockController.getMode())

                .thenReturn(FingerprintUnlockController.MODE_WAKE_AND_UNLOCK);

        mStatusBarKeyguardViewManager.onPanelExpansionChanged(KeyguardBouncer.EXPANSION_VISIBLE,

                false /* tracking */);

        verify(mBouncer, never()).setExpansion(anyFloat());

    }



    private class TestableStatusBarKeyguardViewManager extends StatusBarKeyguardViewManager {



        public TestableStatusBarKeyguardViewManager(Context context,