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

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

Merge "[Keyguard Bouncer] Add new data flow." into tm-qpr-dev am: d316c7d4 am: e6e3722e 

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



Change-Id: I5ed885115a318d2170a057f3c08c32d64ef4845e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32fc7214 e6e3722e

packages/SystemUI/res/layout/super_notification_shade.xml

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
                     android:layout_width="match_parent"

                     android:layout_weight="1"

                     android:background="@android:color/transparent"

                     android:visibility="invisible"

                     android:clipChildren="false"

                     android:clipToPadding="false" />

    </LinearLayout>

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

+1 −0
Original line number Diff line number Diff line
@@ -1096,6 +1096,7 @@ public class KeyguardSecurityContainer extends FrameLayout { 
                return;

            }



            mView.setAlpha(1f);

            mUserSwitcherViewGroup.setAlpha(0f);

            ObjectAnimator alphaAnim = ObjectAnimator.ofFloat(mUserSwitcherViewGroup, View.ALPHA,

                    1f);

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

+8 −0
Original line number Diff line number Diff line
@@ -106,6 +106,14 @@ public class KeyguardSimPukViewController 
        mKeyguardUpdateMonitor.removeCallback(mUpdateMonitorCallback);

    }



    @Override

    public void onResume(int reason) {

        super.onResume(reason);

        if (mShowDefaultMessage) {

            showDefaultMessage();

        }

    }



    @Override

    void resetState() {

        super.resetState();

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ import com.android.systemui.dreams.dagger.DreamModule; 
import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FlagsModule;

import com.android.systemui.fragments.FragmentService;

import com.android.systemui.keyguard.data.BouncerViewModule;

import com.android.systemui.log.dagger.LogModule;

import com.android.systemui.media.dagger.MediaProjectionModule;

import com.android.systemui.model.SysUiState;
@@ -116,6 +117,7 @@ import dagger.Provides; 
            AppOpsModule.class,

            AssistModule.class,

            BiometricsModule.class,

            BouncerViewModule.class,

            ClockModule.class,

            CoroutinesModule.class,

            DreamModule.class,

packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java

+7 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.dagger.qualifiers.Main; 
import com.android.systemui.dreams.complication.ComplicationHostViewController;

import com.android.systemui.dreams.dagger.DreamOverlayComponent;

import com.android.systemui.dreams.dagger.DreamOverlayModule;

import com.android.systemui.keyguard.domain.interactor.BouncerCallbackInteractor;

import com.android.systemui.statusbar.BlurUtils;

import com.android.systemui.statusbar.phone.KeyguardBouncer;

import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;
@@ -73,6 +74,7 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
    // Main thread handler used to schedule periodic tasks (e.g. burn-in protection updates).

    private final Handler mHandler;

    private final int mDreamOverlayMaxTranslationY;

    private final BouncerCallbackInteractor mBouncerCallbackInteractor;



    private long mJitterStartTimeMillis;
@@ -131,7 +133,8 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
            @Named(DreamOverlayModule.MAX_BURN_IN_OFFSET) int maxBurnInOffset,

            @Named(DreamOverlayModule.BURN_IN_PROTECTION_UPDATE_INTERVAL) long

                    burnInProtectionUpdateInterval,

            @Named(DreamOverlayModule.MILLIS_UNTIL_FULL_JITTER) long millisUntilFullJitter) {

            @Named(DreamOverlayModule.MILLIS_UNTIL_FULL_JITTER) long millisUntilFullJitter,

            BouncerCallbackInteractor bouncerCallbackInteractor) {

        super(containerView);

        mDreamOverlayContentView = contentView;

        mStatusBarViewController = statusBarViewController;
@@ -151,6 +154,7 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
        mMaxBurnInOffset = maxBurnInOffset;

        mBurnInProtectionUpdateInterval = burnInProtectionUpdateInterval;

        mMillisUntilFullJitter = millisUntilFullJitter;

        mBouncerCallbackInteractor = bouncerCallbackInteractor;

    }



    @Override
@@ -167,6 +171,7 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
        if (bouncer != null) {

            bouncer.addBouncerExpansionCallback(mBouncerExpansionCallback);

        }

        mBouncerCallbackInteractor.addBouncerExpansionCallback(mBouncerExpansionCallback);

    }



    @Override
@@ -176,6 +181,7 @@ public class DreamOverlayContainerViewController extends ViewController<DreamOve 
        if (bouncer != null) {

            bouncer.removeBouncerExpansionCallback(mBouncerExpansionCallback);

        }

        mBouncerCallbackInteractor.removeBouncerExpansionCallback(mBouncerExpansionCallback);

    }



    View getContainerView() {