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

Commit 19c9f95e authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Fix vertical size when using new headers 

For the new headers, we shouldn't be looking at quick_qs_offset_header.
Instead, use 48dp for QQS offset.

This is needed because with combined headers, the height of the header is always the same. Without this CL, in some devices, there's a lot of blank space under the header, because the system expects them to be larger.

Test: manual, multiple devices and screen sizes
Bug: 215584502
Change-Id: Ic6f4c45eb4e21891a073f11bb328497a7807edac
parent 268f0020

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -407,7 +407,7 @@ 
    <dimen name="match_parent">-1px</dimen>



    <!-- Height of status bar in split shade mode - visible only on large screens -->

    <dimen name="large_screen_shade_header_height">@*android:dimen/quick_qs_offset_height</dimen>

    <dimen name="large_screen_shade_header_height">48dp</dimen>

    <dimen name="large_screen_shade_header_min_height">@dimen/qs_header_row_min_height</dimen>

    <dimen name="large_screen_shade_header_left_padding">@dimen/qs_horizontal_margin</dimen>

packages/SystemUI/res/xml/large_screen_shade_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ 
        android:id="@+id/privacy_container">

        <Layout

            android:layout_width="wrap_content"

            android:layout_height="0dp"

            android:layout_height="@dimen/large_screen_shade_header_min_height"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="@id/date"

            app:layout_constraintBottom_toBottomOf="@id/date"

packages/SystemUI/res/xml/qqs_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ 
        android:id="@+id/privacy_container">

        <Layout

            android:layout_width="wrap_content"

            android:layout_height="0dp"

            android:layout_height="@dimen/large_screen_shade_header_min_height"

            app:layout_constraintStart_toEndOf="@id/date"

            app:layout_constraintEnd_toEndOf="@id/end_guide"

            app:layout_constraintTop_toTopOf="parent"

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

+13 −1
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ import android.widget.FrameLayout; 
import com.android.systemui.Dumpable;

import com.android.systemui.R;

import com.android.systemui.qs.customize.QSCustomizer;

import com.android.systemui.util.LargeScreenUtils;



import java.io.PrintWriter;
@@ -52,6 +53,7 @@ public class QSContainerImpl extends FrameLayout implements Dumpable { 
    private boolean mQsDisabled;

    private int mContentHorizontalPadding = -1;

    private boolean mClippingEnabled;

    private boolean mUseCombinedHeaders;



    public QSContainerImpl(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -66,6 +68,10 @@ public class QSContainerImpl extends FrameLayout implements Dumpable { 
        setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);

    }



    void setUseCombinedHeaders(boolean useCombinedHeaders) {

        mUseCombinedHeaders = useCombinedHeaders;

    }



    @Override

    public boolean hasOverlappingRendering() {

        return false;
@@ -143,9 +149,15 @@ public class QSContainerImpl extends FrameLayout implements Dumpable { 


    void updateResources(QSPanelController qsPanelController,

            QuickStatusBarHeaderController quickStatusBarHeaderController) {

        int topPadding = QSUtils.getQsHeaderSystemIconsAreaHeight(mContext);

        if (mUseCombinedHeaders

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

            topPadding = mContext.getResources()

                    .getDimensionPixelSize(R.dimen.large_screen_shade_header_height);

        }

        mQSPanelContainer.setPaddingRelative(

                mQSPanelContainer.getPaddingStart(),

                QSUtils.getQsHeaderSystemIconsAreaHeight(mContext),

                topPadding,

                mQSPanelContainer.getPaddingEnd(),

                mQSPanelContainer.getPaddingBottom());

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

+5 −2
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import android.content.res.Configuration; 
import android.view.MotionEvent;

import android.view.View;



import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.flags.Flags;

import com.android.systemui.plugins.FalsingManager;

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

import com.android.systemui.statusbar.policy.ConfigurationController;
@@ -37,7 +39,6 @@ public class QSContainerImplController extends ViewController<QSContainerImpl> { 
    private final ConfigurationController mConfigurationController;

    private final FalsingManager mFalsingManager;

    private final NonInterceptingScrollView mQSPanelContainer;



    private final ConfigurationController.ConfigurationListener mConfigurationListener =

            new ConfigurationController.ConfigurationListener() {

        @Override
@@ -65,13 +66,15 @@ public class QSContainerImplController extends ViewController<QSContainerImpl> { 
            QSPanelController qsPanelController,

            QuickStatusBarHeaderController quickStatusBarHeaderController,

            ConfigurationController configurationController,

            FalsingManager falsingManager) {

            FalsingManager falsingManager,

            FeatureFlags featureFlags) {

        super(view);

        mQsPanelController = qsPanelController;

        mQuickStatusBarHeaderController = quickStatusBarHeaderController;

        mConfigurationController = configurationController;

        mFalsingManager = falsingManager;

        mQSPanelContainer = mView.getQSPanelContainer();

        view.setUseCombinedHeaders(featureFlags.isEnabled(Flags.COMBINED_QS_HEADERS));

    }



    @Override