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

Commit ebe33c2c authored by Aaron Liu's avatar Aaron Liu Committed by Android (Google) Code Review
Browse files

Merge changes I313240f1,Ie2b830d0 into udc-qpr-dev 

* changes:
  Remove setalpha(0f) from reset.
  Revert "Fix user switcher flicker."
parents eecbe7a9 05445443

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -1197,8 +1197,6 @@ public class KeyguardSecurityContainer extends ConstraintLayout { 
                });

                });

                mPopup.show();

                mPopup.show();

            });

            });



            mUserSwitcherViewGroup.setAlpha(0f);

        }

        }





        @Override

        @Override

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

+8 −0
Original line number Original line Diff line number Diff line
@@ -675,6 +675,14 @@ public class KeyguardSecurityContainerController extends ViewController<Keyguard 
        mSecurityViewFlipperController.reset();

        mSecurityViewFlipperController.reset();

    }

    }





    /** Prepares views in the bouncer before starting appear animation. */

    public void prepareToShow() {

        View bouncerUserSwitcher = mView.findViewById(R.id.keyguard_bouncer_user_switcher);

        if (bouncerUserSwitcher != null) {

            bouncerUserSwitcher.setAlpha(0f);

        }

    }



    @Override

    @Override

    public void onResume(int reason) {

    public void onResume(int reason) {

        if (DEBUG) Log.d(TAG, "screen on, instance " + Integer.toHexString(hashCode()));

        if (DEBUG) Log.d(TAG, "screen on, instance " + Integer.toHexString(hashCode()));

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ object KeyguardBouncerViewBinder { 
                            view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE

                            view.visibility = if (isShowing) View.VISIBLE else View.INVISIBLE

                            if (isShowing) {

                            if (isShowing) {

                                // Reset security container because these views are not reinflated.

                                // Reset security container because these views are not reinflated.

                                securityContainerController.reset()

                                securityContainerController.prepareToShow()

                                securityContainerController.reinflateViewFlipper {

                                securityContainerController.reinflateViewFlipper {

                                    // Reset Security Container entirely.

                                    // Reset Security Container entirely.

                                    securityContainerController.onBouncerVisibilityChanged(

                                    securityContainerController.onBouncerVisibilityChanged(

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

+12 −0
Original line number Original line Diff line number Diff line
@@ -27,6 +27,7 @@ import android.testing.TestableResources 
import android.view.Gravity

import android.view.Gravity

import android.view.LayoutInflater

import android.view.LayoutInflater

import android.view.MotionEvent

import android.view.MotionEvent

import android.view.View

import android.view.WindowInsetsController

import android.view.WindowInsetsController

import android.widget.FrameLayout

import android.widget.FrameLayout

import androidx.test.filters.SmallTest

import androidx.test.filters.SmallTest
@@ -83,6 +84,7 @@ import org.mockito.Captor 
import org.mockito.Mock

import org.mockito.Mock

import org.mockito.Mockito.atLeastOnce

import org.mockito.Mockito.atLeastOnce

import org.mockito.Mockito.clearInvocations

import org.mockito.Mockito.clearInvocations

import org.mockito.Mockito.mock

import org.mockito.Mockito.never

import org.mockito.Mockito.never

import org.mockito.Mockito.spy

import org.mockito.Mockito.spy

import org.mockito.Mockito.verify

import org.mockito.Mockito.verify
@@ -837,6 +839,16 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
            verify(viewMediatorCallback).keyguardDone(anyBoolean(), anyInt())

            verify(viewMediatorCallback).keyguardDone(anyBoolean(), anyInt())

        }

        }





    @Test

    fun testResetUserSwitcher() {

        val userSwitcher = mock(View::class.java)

        whenever(view.findViewById<View>(R.id.keyguard_bouncer_user_switcher))

            .thenReturn(userSwitcher)



        underTest.prepareToShow()

        verify(userSwitcher).setAlpha(0f)

    }



    private val registeredSwipeListener: KeyguardSecurityContainer.SwipeListener

    private val registeredSwipeListener: KeyguardSecurityContainer.SwipeListener

        get() {

        get() {

            underTest.onViewAttached()

            underTest.onViewAttached()