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

Commit 70a1745e authored by Evan Laird's avatar Evan Laird
Browse files

Remove legacy calls to StatusBarWindowView for layouts 

QuickStatusBarHeader, KeyguardStatusBarView, and PhoneStatusBarView all
had a few calls to some methods in StatusBarWindowView that would try to
calculate the insets necessary draw content in the status bar area that
avoids cutouts. This CL removes those methods and moves that
functionality into StatusBarContentInsetsProvider so that everything can
benefit from the caching it provides and hopefully this simplifies
things.

Test: atest SystemUITests; manual
Bug: 203223072
Change-Id: I6235394a3c71a360b5cc1fb9f511a52aef8c8f17
parent a1f84cfd

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java

+15 −14
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ import com.android.settingslib.Utils; 
import com.android.systemui.R;

import com.android.systemui.battery.BatteryMeterView;

import com.android.systemui.qs.QSDetail.Callback;

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

import com.android.systemui.statusbar.phone.StatusBarIconController.TintedIconManager;

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

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

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

import com.android.systemui.statusbar.policy.VariableDateView;
@@ -86,6 +86,7 @@ public class QuickStatusBarHeader extends FrameLayout { 


    private TintedIconManager mTintedIconManager;

    private QSExpansionPathInterpolator mQSExpansionPathInterpolator;

    private StatusBarContentInsetsProvider mInsetsProvider;



    private int mRoundedCornerPadding = 0;

    private int mWaterfallTopInset;
@@ -158,9 +159,11 @@ public class QuickStatusBarHeader extends FrameLayout { 


    void onAttach(TintedIconManager iconManager,

            QSExpansionPathInterpolator qsExpansionPathInterpolator,

            List<String> rssiIgnoredSlots) {

            List<String> rssiIgnoredSlots,

            StatusBarContentInsetsProvider insetsProvider) {

        mTintedIconManager = iconManager;

        mRssiIgnoredSlots = rssiIgnoredSlots;

        mInsetsProvider = insetsProvider;

        int fillColor = Utils.getColorAttrDefaultColor(getContext(),

                android.R.attr.textColorPrimary);
@@ -421,22 +424,20 @@ public class QuickStatusBarHeader extends FrameLayout { 
    public WindowInsets onApplyWindowInsets(WindowInsets insets) {

        // Handle padding of the views

        DisplayCutout cutout = insets.getDisplayCutout();

        Pair<Integer, Integer> cornerCutoutPadding = StatusBarWindowView.cornerCutoutMargins(

                cutout, getDisplay());

        Pair<Integer, Integer> padding =

                StatusBarWindowView.paddingNeededForCutoutAndRoundedCorner(

                        cutout, cornerCutoutPadding, -1);

        mDatePrivacyView.setPadding(padding.first, 0, padding.second, 0);

        mStatusIconsView.setPadding(padding.first, 0, padding.second, 0);



        Pair<Integer, Integer> sbInsets = mInsetsProvider

                .getStatusBarContentInsetsForCurrentRotation();

        boolean hasCornerCutout = mInsetsProvider.currentRotationHasCornerCutout();



        mDatePrivacyView.setPadding(sbInsets.first, 0, sbInsets.second, 0);

        mStatusIconsView.setPadding(sbInsets.first, 0, sbInsets.second, 0);

        LinearLayout.LayoutParams datePrivacySeparatorLayoutParams =

                (LinearLayout.LayoutParams) mDatePrivacySeparator.getLayoutParams();

        LinearLayout.LayoutParams mClockIconsSeparatorLayoutParams =

                (LinearLayout.LayoutParams) mClockIconsSeparator.getLayoutParams();

        boolean cornerCutout = cornerCutoutPadding != null

                && (cornerCutoutPadding.first == 0 || cornerCutoutPadding.second == 0);

        if (cutout != null) {

            Rect topCutout = cutout.getBoundingRectTop();

            if (topCutout.isEmpty() || cornerCutout) {

            if (topCutout.isEmpty() || hasCornerCutout) {

                datePrivacySeparatorLayoutParams.width = 0;

                mDatePrivacySeparator.setVisibility(View.GONE);

                mClockIconsSeparatorLayoutParams.width = 0;
@@ -454,8 +455,8 @@ public class QuickStatusBarHeader extends FrameLayout { 
        }

        mDatePrivacySeparator.setLayoutParams(datePrivacySeparatorLayoutParams);

        mClockIconsSeparator.setLayoutParams(mClockIconsSeparatorLayoutParams);

        mCutOutPaddingLeft = padding.first;

        mCutOutPaddingRight = padding.second;

        mCutOutPaddingLeft = sbInsets.first;

        mCutOutPaddingRight = sbInsets.second;

        mWaterfallTopInset = cutout == null ? 0 : cutout.getWaterfallInsets().top;



        updateBatteryMode();

packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeaderController.java

+7 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ import com.android.systemui.privacy.PrivacyItemController; 
import com.android.systemui.privacy.logging.PrivacyLogger;

import com.android.systemui.qs.carrier.QSCarrierGroupController;

import com.android.systemui.qs.dagger.QSScope;

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

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

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

import com.android.systemui.statusbar.policy.Clock;
@@ -73,6 +74,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
    private final QSExpansionPathInterpolator mQSExpansionPathInterpolator;

    private final FeatureFlags mFeatureFlags;

    private final BatteryMeterViewController mBatteryMeterViewController;

    private final StatusBarContentInsetsProvider mInsetsProvider;



    private final VariableDateViewController mVariableDateViewControllerDateView;

    private final VariableDateViewController mVariableDateViewControllerClockDateView;
@@ -142,7 +144,8 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
            QSExpansionPathInterpolator qsExpansionPathInterpolator,

            FeatureFlags featureFlags,

            VariableDateViewController.Factory variableDateViewControllerFactory,

            BatteryMeterViewController batteryMeterViewController) {

            BatteryMeterViewController batteryMeterViewController,

            StatusBarContentInsetsProvider statusBarContentInsetsProvider) {

        super(view);

        mPrivacyItemController = privacyItemController;

        mActivityStarter = activityStarter;
@@ -155,6 +158,7 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
        mQSExpansionPathInterpolator = qsExpansionPathInterpolator;

        mFeatureFlags = featureFlags;

        mBatteryMeterViewController = batteryMeterViewController;

        mInsetsProvider = statusBarContentInsetsProvider;



        mQSCarrierGroupController = qsCarrierGroupControllerBuilder

                .setQSCarrierGroup(mView.findViewById(R.id.carrier_group))
@@ -225,7 +229,8 @@ class QuickStatusBarHeaderController extends ViewController<QuickStatusBarHeader 
            );

        }



        mView.onAttach(mIconManager, mQSExpansionPathInterpolator, rssiIgnoredSlots);

        mView.onAttach(

                mIconManager, mQSExpansionPathInterpolator, rssiIgnoredSlots, mInsetsProvider);



        mDemoModeController.addCallback(mDemoModeReceiver);

packages/SystemUI/src/com/android/systemui/statusbar/events/PrivacyDotViewController.kt

+8 −8
Original line number Diff line number Diff line
@@ -394,11 +394,11 @@ class PrivacyDotViewController @Inject constructor( 
            animationScheduler.addCallback(systemStatusAnimationCallback)

        }



        val left = contentInsetsProvider.getStatusBarContentInsetsForRotation(ROTATION_SEASCAPE)

        val top = contentInsetsProvider.getStatusBarContentInsetsForRotation(ROTATION_NONE)

        val right = contentInsetsProvider.getStatusBarContentInsetsForRotation(ROTATION_LANDSCAPE)

        val left = contentInsetsProvider.getStatusBarContentAreaForRotation(ROTATION_SEASCAPE)

        val top = contentInsetsProvider.getStatusBarContentAreaForRotation(ROTATION_NONE)

        val right = contentInsetsProvider.getStatusBarContentAreaForRotation(ROTATION_LANDSCAPE)

        val bottom = contentInsetsProvider

                .getStatusBarContentInsetsForRotation(ROTATION_UPSIDE_DOWN)

                .getStatusBarContentAreaForRotation(ROTATION_UPSIDE_DOWN)

        val paddingTop = contentInsetsProvider.getStatusBarPaddingTop()



        synchronized(lock) {
@@ -529,11 +529,11 @@ class PrivacyDotViewController @Inject constructor( 


    // Returns [left, top, right, bottom] aka [seascape, none, landscape, upside-down]

    private fun getLayoutRects(): List<Rect> {

        val left = contentInsetsProvider.getStatusBarContentInsetsForRotation(ROTATION_SEASCAPE)

        val top = contentInsetsProvider.getStatusBarContentInsetsForRotation(ROTATION_NONE)

        val right = contentInsetsProvider.getStatusBarContentInsetsForRotation(ROTATION_LANDSCAPE)

        val left = contentInsetsProvider.getStatusBarContentAreaForRotation(ROTATION_SEASCAPE)

        val top = contentInsetsProvider.getStatusBarContentAreaForRotation(ROTATION_NONE)

        val right = contentInsetsProvider.getStatusBarContentAreaForRotation(ROTATION_LANDSCAPE)

        val bottom = contentInsetsProvider

                .getStatusBarContentInsetsForRotation(ROTATION_UPSIDE_DOWN)

                .getStatusBarContentAreaForRotation(ROTATION_UPSIDE_DOWN)



        return listOf(left, top, right, bottom)

    }

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

+10 −13
Original line number Diff line number Diff line
@@ -238,35 +238,32 @@ public class KeyguardStatusBarView extends RelativeLayout { 
        }

    }



    @Override

    public WindowInsets onApplyWindowInsets(WindowInsets insets) {

    /** Should only be called from {@link KeyguardStatusBarViewController}. */

    WindowInsets updateWindowInsets(

            WindowInsets insets,

            StatusBarContentInsetsProvider insetsProvider) {

        mLayoutState = LAYOUT_NONE;

        if (updateLayoutConsideringCutout()) {

        if (updateLayoutConsideringCutout(insetsProvider)) {

            requestLayout();

        }

        return super.onApplyWindowInsets(insets);

    }



    private boolean updateLayoutConsideringCutout() {

    private boolean updateLayoutConsideringCutout(StatusBarContentInsetsProvider insetsProvider) {

        mDisplayCutout = getRootWindowInsets().getDisplayCutout();

        updateKeyguardStatusBarHeight();



        Pair<Integer, Integer> cornerCutoutMargins =

                StatusBarWindowView.cornerCutoutMargins(mDisplayCutout, getDisplay());

        updatePadding(cornerCutoutMargins);

        if (mDisplayCutout == null || cornerCutoutMargins != null) {

        updatePadding(insetsProvider);

        if (mDisplayCutout == null || insetsProvider.currentRotationHasCornerCutout()) {

            return updateLayoutParamsNoCutout();

        } else {

            return updateLayoutParamsForCutout();

        }

    }



    private void updatePadding(Pair<Integer, Integer> cornerCutoutMargins) {

    private void updatePadding(StatusBarContentInsetsProvider insetsProvider) {

        final int waterfallTop =

                mDisplayCutout == null ? 0 : mDisplayCutout.getWaterfallInsets().top;

        mPadding =

                StatusBarWindowView.paddingNeededForCutoutAndRoundedCorner(

                        mDisplayCutout, cornerCutoutMargins, mRoundedCornerPadding);

        mPadding = insetsProvider.getStatusBarContentInsetsForCurrentRotation();



        // consider privacy dot space

        final int minLeft = (isLayoutRtl() && mIsPrivacyDotEnabled)

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

+8 −1
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
    private final KeyguardUpdateMonitor mKeyguardUpdateMonitor;

    private final BiometricUnlockController mBiometricUnlockController;

    private final SysuiStatusBarStateController mStatusBarStateController;

    private final StatusBarContentInsetsProvider mInsetsProvider;



    private final ConfigurationController.ConfigurationListener mConfigurationListener =

            new ConfigurationController.ConfigurationListener() {
@@ -228,7 +229,9 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
            KeyguardBypassController bypassController,

            KeyguardUpdateMonitor keyguardUpdateMonitor,

            BiometricUnlockController biometricUnlockController,

            SysuiStatusBarStateController statusBarStateController) {

            SysuiStatusBarStateController statusBarStateController,

            StatusBarContentInsetsProvider statusBarContentInsetsProvider

    ) {

        super(view);

        mCarrierTextController = carrierTextController;

        mConfigurationController = configurationController;
@@ -244,6 +247,7 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
        mKeyguardUpdateMonitor = keyguardUpdateMonitor;

        mBiometricUnlockController = biometricUnlockController;

        mStatusBarStateController = statusBarStateController;

        mInsetsProvider = statusBarContentInsetsProvider;



        mFirstBypassAttempt = mKeyguardBypassController.getBypassEnabled();

        mKeyguardStateController.addCallback(
@@ -287,6 +291,9 @@ public class KeyguardStatusBarViewController extends ViewController<KeyguardStat 
            mTintedIconManager.setBlockList(mBlockedIcons);

            mStatusBarIconController.addIconGroup(mTintedIconManager);

        }

        mView.setOnApplyWindowInsetsListener(

                (view, windowInsets) -> mView.updateWindowInsets(windowInsets, mInsetsProvider));



        onThemeChanged();

    }