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

Commit 882ec9a6 authored by Chris Göllner's avatar Chris Göllner Committed by Android (Google) Code Review
Browse files

Merge "Rename "centralized_status_bar_dimens_refactor" flag" into main

parents dac9af85 32aad6c9

packages/SystemUI/aconfig/systemui.aconfig

+1 −1
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ flag { 
}



flag {

   name: "centralized_status_bar_dimens_refactor"

   name: "centralized_status_bar_height_fix"

   namespace: "systemui"

   description: "Refactors shade header and keyguard status bar to read status bar dimens from a"

        " central place, instead of reading resources directly. This is to take into account display"

packages/SystemUI/compose/features/src/com/android/systemui/keyguard/ui/composable/blueprint/SplitShadeBlueprint.kt

+1 −1
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ constructor( 
                            }

                            with(notificationSection) {

                                val splitShadeTopMargin: Dp =

                                    if (Flags.centralizedStatusBarDimensRefactor()) {

                                    if (Flags.centralizedStatusBarHeightFix()) {

                                        largeScreenHeaderHelper.getLargeScreenHeaderHeight().dp

                                    } else {

                                        dimensionResource(

packages/SystemUI/src/com/android/systemui/keyguard/ui/view/layout/sections/DefaultNotificationStackScrollLayoutSection.kt

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import androidx.constraintlayout.widget.ConstraintSet.END 
import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID

import androidx.constraintlayout.widget.ConstraintSet.START

import androidx.constraintlayout.widget.ConstraintSet.TOP

import com.android.systemui.Flags.centralizedStatusBarDimensRefactor

import com.android.systemui.Flags.centralizedStatusBarHeightFix

import com.android.systemui.Flags.migrateClocksToBlueprint

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

import com.android.systemui.res.R
@@ -80,7 +80,7 @@ constructor( 
                val useLargeScreenHeader =

                    context.resources.getBoolean(R.bool.config_use_large_screen_shade_header)

                val marginTopLargeScreen =

                    if (centralizedStatusBarDimensRefactor()) {

                    if (centralizedStatusBarHeightFix()) {

                        largeScreenHeaderHelperLazy.get().getLargeScreenHeaderHeight()

                    } else {

                        context.resources.getDimensionPixelSize(

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

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.qs; 


import static android.app.StatusBarManager.DISABLE2_QUICK_SETTINGS;



import static com.android.systemui.Flags.centralizedStatusBarDimensRefactor;

import static com.android.systemui.Flags.centralizedStatusBarHeightFix;



import android.content.Context;

import android.graphics.Canvas;
@@ -194,7 +194,7 @@ public class QSContainerImpl extends FrameLayout implements Dumpable { 
        int topPadding = QSUtils.getQsHeaderSystemIconsAreaHeight(mContext);

        if (!LargeScreenUtils.shouldUseLargeScreenShadeHeader(mContext.getResources())) {

            topPadding =

                    centralizedStatusBarDimensRefactor()

                    centralizedStatusBarHeightFix()

                            ? LargeScreenHeaderHelper.getLargeScreenHeaderHeight(mContext)

                            : mContext.getResources()

                                    .getDimensionPixelSize(

packages/SystemUI/src/com/android/systemui/shade/NotificationsQSContainerController.kt

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ import androidx.constraintlayout.widget.ConstraintSet.PARENT_ID 
import androidx.constraintlayout.widget.ConstraintSet.START

import androidx.constraintlayout.widget.ConstraintSet.TOP

import androidx.lifecycle.lifecycleScope

import com.android.systemui.Flags.centralizedStatusBarDimensRefactor

import com.android.systemui.Flags.centralizedStatusBarHeightFix

import com.android.systemui.Flags.migrateClocksToBlueprint

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Main
@@ -183,7 +183,7 @@ class NotificationsQSContainerController @Inject constructor( 
    }



    private fun calculateLargeShadeHeaderHeight(): Int {

        return if (centralizedStatusBarDimensRefactor()) {

        return if (centralizedStatusBarHeightFix()) {

            largeScreenHeaderHelperLazy.get().getLargeScreenHeaderHeight()

        } else {

            resources.getDimensionPixelSize(R.dimen.large_screen_shade_header_height)