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

Commit 186e4943 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge changes from topic "flip_flag_v2" into tm-qpr-dev am: 9eff0afd 

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



Change-Id: Ib66b594fe031fb05af5ace72f02fb705d7f58c8b
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 28d26295 9eff0afd

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/flags/Flags.kt

+2 −2
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ object Flags { 
    // 500 - quick settings



    // TODO(b/254512321): Tracking Bug

    @JvmField val COMBINED_QS_HEADERS = UnreleasedFlag(501, teamfood = true)

    @JvmField val COMBINED_QS_HEADERS = ReleasedFlag(501)

    val PEOPLE_TILE = ResourceBooleanFlag(502, R.bool.flag_conversations)



    @JvmField
@@ -159,7 +159,7 @@ object Flags { 
        ResourceBooleanFlag(503, R.bool.flag_lockscreen_qs_user_detail_shortcut)



    // TODO(b/254512747): Tracking Bug

    val NEW_HEADER = UnreleasedFlag(505, teamfood = true)

    val NEW_HEADER = ReleasedFlag(505)



    // TODO(b/254512383): Tracking Bug

    @JvmField

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());