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

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

Merge changes I76427c00,Idcbbc90a into udc-dev am: 5568b8bc 

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



Change-Id: I079afc2ffcc652ed432eb3174a34f17f1a0af2de
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9bb03491 5568b8bc

packages/SystemUI/res-keyguard/values/styles.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    <!-- Keyguard PIN pad styles -->

    <style name="Keyguard.TextView" parent="@android:style/Widget.DeviceDefault.TextView">

        <item name="android:textSize">@dimen/kg_status_line_font_size</item>

        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>

    </style>

    <style name="Keyguard.TextView.EmergencyButton" parent="Theme.SystemUI">

        <item name="android:textColor">?androidprv:attr/materialColorOnTertiaryFixed</item>

packages/SystemUI/src/com/android/systemui/shade/QuickSettingsController.java

+8 −2
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ import com.android.systemui.statusbar.phone.ScrimController; 
import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager;

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

import com.android.systemui.statusbar.phone.dagger.CentralSurfacesComponent;

import com.android.systemui.statusbar.policy.CastController;

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

import com.android.systemui.util.LargeScreenUtils;
@@ -135,6 +136,7 @@ public class QuickSettingsController { 
    private final LockscreenGestureLogger mLockscreenGestureLogger;

    private final ShadeLogger mShadeLog;

    private final KeyguardFaceAuthInteractor mKeyguardFaceAuthInteractor;

    private final CastController mCastController;

    private final FeatureFlags mFeatureFlags;

    private final InteractionJankMonitor mInteractionJankMonitor;

    private final ShadeRepository mShadeRepository;
@@ -324,7 +326,8 @@ public class QuickSettingsController { 
            InteractionJankMonitor interactionJankMonitor,

            ShadeLogger shadeLog,

            KeyguardFaceAuthInteractor keyguardFaceAuthInteractor,

            ShadeRepository shadeRepository

            ShadeRepository shadeRepository,

            CastController castController

    ) {

        mPanelViewControllerLazy = panelViewControllerLazy;

        mPanelView = panelView;
@@ -364,6 +367,7 @@ public class QuickSettingsController { 
        mMetricsLogger = metricsLogger;

        mShadeLog = shadeLog;

        mKeyguardFaceAuthInteractor = keyguardFaceAuthInteractor;

        mCastController = castController;

        mFeatureFlags = featureFlags;

        mInteractionJankMonitor = interactionJankMonitor;

        mShadeRepository = shadeRepository;
@@ -1188,7 +1192,9 @@ public class QuickSettingsController { 
        mLastClipBounds.set(left, top, right, bottom);

        if (mIsFullWidth) {

            clipStatusView = qsVisible;

            float screenCornerRadius = mRecordingController.isRecording() ? 0 : mScreenCornerRadius;

            float screenCornerRadius =

                    mRecordingController.isRecording() || mCastController.hasConnectedCastDevice()

                            ? 0 : mScreenCornerRadius;

            radius = (int) MathUtils.lerp(screenCornerRadius, mScrimCornerRadius,

                    Math.min(top / (float) mScrimCornerRadius, 1f));

            mScrimController.setNotificationBottomRadius(radius);

packages/SystemUI/src/com/android/systemui/statusbar/policy/CastController.java

+5 −0
Original line number Diff line number Diff line
@@ -28,6 +28,11 @@ public interface CastController extends CallbackController<Callback>, Dumpable { 
    void startCasting(CastDevice device);

    void stopCasting(CastDevice device);



    /**

     * @return whether we have a connected device.

     */

    boolean hasConnectedCastDevice();



    public interface Callback {

        void onCastDevicesChanged();

    }

packages/SystemUI/src/com/android/systemui/statusbar/policy/CastControllerImpl.java

+6 −0
Original line number Diff line number Diff line
@@ -217,6 +217,12 @@ public class CastControllerImpl implements CastController { 
        }

    }



    @Override

    public boolean hasConnectedCastDevice() {

        return getCastDevices().stream().anyMatch(

                castDevice -> castDevice.state == CastDevice.STATE_CONNECTED);

    }



    private void setProjection(MediaProjectionInfo projection, boolean started) {

        boolean changed = false;

        final MediaProjectionInfo oldProjection = mProjection;

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationPanelViewControllerBaseTest.java

+4 −1
Original line number Diff line number Diff line
@@ -158,6 +158,7 @@ import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; 
import com.android.systemui.statusbar.phone.StatusBarTouchableRegionManager;

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

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

import com.android.systemui.statusbar.policy.CastController;

import com.android.systemui.statusbar.policy.ConfigurationController;

import com.android.systemui.statusbar.policy.KeyguardQsUserSwitchController;

import com.android.systemui.statusbar.policy.KeyguardStateController;
@@ -306,6 +307,7 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
    @Mock protected ActivityStarter mActivityStarter;

    @Mock protected KeyguardFaceAuthInteractor mKeyguardFaceAuthInteractor;

    @Mock protected ShadeRepository mShadeRepository;

    @Mock private CastController mCastController;



    protected final int mMaxUdfpsBurnInOffsetY = 5;

    protected KeyguardBottomAreaInteractor mKeyguardBottomAreaInteractor;
@@ -675,7 +677,8 @@ public class NotificationPanelViewControllerBaseTest extends SysuiTestCase { 
                mInteractionJankMonitor,

                mShadeLog,

                mKeyguardFaceAuthInteractor,

                mShadeRepository

                mShadeRepository,

                mCastController

        );

    }