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

Commit abada9bd authored by Aaron Liu's avatar Aaron Liu Committed by Automerger Merge Worker
Browse files

Merge changes I5a5714fc,Ib45034ea,I9e4bc66d,Ie341c5d8,I1f40e8b7 into udc-dev am: 5ba92513 

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



Change-Id: I4338a2f1d45c7b2c8c6cbc7ceac01a7c598de649
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents bcdaebea 5ba92513

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+2 −2
Original line number Diff line number Diff line
@@ -219,12 +219,12 @@ object Flags { 
    /** Whether to inflate the bouncer view on a background thread. */

    // TODO(b/272091103): Tracking Bug

    @JvmField

    val ASYNC_INFLATE_BOUNCER = unreleasedFlag(229, "async_inflate_bouncer", teamfood = true)

    val ASYNC_INFLATE_BOUNCER = releasedFlag(229, "async_inflate_bouncer")



    /** Whether to inflate the bouncer view on a background thread. */

    // TODO(b/273341787): Tracking Bug

    @JvmField

    val PREVENT_BYPASS_KEYGUARD = unreleasedFlag(230, "prevent_bypass_keyguard", teamfood = true)

    val PREVENT_BYPASS_KEYGUARD = releasedFlag(230, "prevent_bypass_keyguard")



    /** Whether to use a new data source for intents to run on keyguard dismissal. */

    @JvmField

packages/SystemUI/src/com/android/systemui/keyguard/data/repository/KeyguardRepository.kt

+5 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import com.android.systemui.common.coroutine.ChannelExt.trySendWithFailureLoggin 
import com.android.systemui.common.coroutine.ConflatedCallbackFlow.conflatedCallbackFlow

import com.android.systemui.common.shared.model.Position

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main

import com.android.systemui.doze.DozeHost

import com.android.systemui.doze.DozeMachine

import com.android.systemui.doze.DozeTransitionCallback
@@ -43,12 +44,14 @@ import com.android.systemui.statusbar.phone.BiometricUnlockController.WakeAndUnl 
import com.android.systemui.statusbar.phone.DozeParameters

import com.android.systemui.statusbar.policy.KeyguardStateController

import javax.inject.Inject

import kotlinx.coroutines.CoroutineDispatcher

import kotlinx.coroutines.channels.awaitClose

import kotlinx.coroutines.flow.Flow

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.StateFlow

import kotlinx.coroutines.flow.asStateFlow

import kotlinx.coroutines.flow.distinctUntilChanged

import kotlinx.coroutines.flow.flowOn



/** Defines interface for classes that encapsulate application state for the keyguard. */

interface KeyguardRepository {
@@ -195,6 +198,7 @@ constructor( 
    private val dozeParameters: DozeParameters,

    private val authController: AuthController,

    private val dreamOverlayCallbackController: DreamOverlayCallbackController,

    @Main private val mainDispatcher: CoroutineDispatcher

) : KeyguardRepository {

    private val _animateBottomAreaDozingTransitions = MutableStateFlow(false)

    override val animateBottomAreaDozingTransitions =
@@ -387,6 +391,7 @@ constructor( 


                awaitClose { keyguardUpdateMonitor.removeCallback(callback) }

            }

            .flowOn(mainDispatcher)

            .distinctUntilChanged()



    override val linearDozeAmount: Flow<Float> = conflatedCallbackFlow {

packages/SystemUI/src/com/android/systemui/keyguard/domain/interactor/PrimaryBouncerInteractor.kt

+4 −8
Original line number Diff line number Diff line
@@ -142,22 +142,18 @@ constructor( 
            (isBouncerShowing() || repository.primaryBouncerShowingSoon.value) &&

                needsFullscreenBouncer()



        if (!resumeBouncer && isBouncerShowing()) {

            // If bouncer is visible, the bouncer is already showing.

            return

        }



        Trace.beginSection("KeyguardBouncer#show")

        repository.setPrimaryScrimmed(isScrimmed)

        if (isScrimmed) {

            setPanelExpansion(KeyguardBouncerConstants.EXPANSION_VISIBLE)

        }



        // In this special case, we want to hide the bouncer and show it again. We want to emit

        // show(true) again so that we can reinflate the new view.

        if (resumeBouncer) {

            primaryBouncerView.delegate?.resume()

            // Bouncer is showing the next security screen and we just need to prompt a resume.

            return

            repository.setPrimaryShow(false)

        }



        if (primaryBouncerView.delegate?.showNextSecurityScreenOrFinish() == true) {

            // Keyguard is done.

            return

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

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

                            if (isShowing) {

                                // Reset Security Container entirely.

                                view.visibility = View.VISIBLE

                                securityContainerController.reinflateViewFlipper {

                                    // Reset Security Container entirely.

                                    securityContainerController.onBouncerVisibilityChanged(

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

+9 −11
Original line number Diff line number Diff line
@@ -163,8 +163,6 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
    @Captor

    private ArgumentCaptor<KeyguardSecurityContainer.SwipeListener> mSwipeListenerArgumentCaptor;



    private Configuration mConfiguration;



    private KeyguardSecurityContainerController mKeyguardSecurityContainerController;

    private KeyguardPasswordViewController mKeyguardPasswordViewController;

    private KeyguardPasswordView mKeyguardPasswordView;
@@ -172,12 +170,12 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 


    @Before

    public void setup() {

        mConfiguration = new Configuration();

        mConfiguration.setToDefaults(); // Defaults to ORIENTATION_UNDEFINED.

        mTestableResources = mContext.getOrCreateTestableResources();

        mTestableResources.getResources().getConfiguration().orientation =

                Configuration.ORIENTATION_UNDEFINED;



        when(mView.getContext()).thenReturn(mContext);

        when(mView.getResources()).thenReturn(mContext.getResources());

        when(mView.getResources()).thenReturn(mTestableResources.getResources());

        FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(/* width=  */ 0, /* height= */

                0);

        lp.gravity = 0;
@@ -254,6 +252,8 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 


    @Test

    public void onResourcesUpdate_callsThroughOnRotationChange() {

        clearInvocations(mView);



        // Rotation is the same, shouldn't cause an update

        mKeyguardSecurityContainerController.updateResources();

        verify(mView, never()).initMode(eq(MODE_DEFAULT), eq(mGlobalSettings), eq(mFalsingManager),
@@ -620,12 +620,12 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
        // Set initial gravity

        mTestableResources.addOverride(R.integer.keyguard_host_view_gravity,

                Gravity.CENTER);

        mTestableResources.addOverride(

                R.bool.can_use_one_handed_bouncer, false);



        // Kick off the initial pass...

        mKeyguardSecurityContainerController.onInit();

        verify(mView).setLayoutParams(argThat(

                (ArgumentMatcher<FrameLayout.LayoutParams>) argument ->

                        argument.gravity == Gravity.CENTER));

        verify(mView).setLayoutParams(any());

        clearInvocations(mView);



        // Now simulate a config change
@@ -633,9 +633,7 @@ public class KeyguardSecurityContainerControllerTest extends SysuiTestCase { 
                Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM);



        mKeyguardSecurityContainerController.updateResources();

        verify(mView).setLayoutParams(argThat(

                (ArgumentMatcher<FrameLayout.LayoutParams>) argument ->

                        argument.gravity == (Gravity.CENTER_HORIZONTAL | Gravity.BOTTOM)));

        verify(mView).setLayoutParams(any());

    }



    @Test