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

Commit ea4a4ea5 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Revert change in qs padding in portrait" into tm-qpr-dev am: be8eeb52 am: aeafc461 

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



Change-Id: Idd3a6c790ee51b92bfeb29aed5745fcb05a6d810
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 6a57f511 aeafc461

packages/SystemUI/res/values-land/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -59,4 +59,5 @@ 
    <dimen name="large_dialog_width">348dp</dimen>



    <dimen name="qs_panel_padding_top">@dimen/qqs_layout_margin_top</dimen>

    <dimen name="qs_panel_padding_top_combined_headers">@dimen/qs_panel_padding_top</dimen>

</resources>

packages/SystemUI/res/values-sw600dp/dimens.xml

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
    <dimen name="qs_security_footer_background_inset">0dp</dimen>



    <dimen name="qs_panel_padding_top">8dp</dimen>

    <dimen name="qs_panel_padding_top_combined_headers">@dimen/qs_panel_padding_top</dimen>



    <!-- The width of large/content heavy dialogs (e.g. Internet, Media output, etc) -->

    <dimen name="large_dialog_width">472dp</dimen>

packages/SystemUI/res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line
@@ -559,7 +559,8 @@ 
    <dimen name="qs_dual_tile_padding_horizontal">6dp</dimen>

    <dimen name="qs_panel_elevation">4dp</dimen>

    <dimen name="qs_panel_padding_bottom">@dimen/footer_actions_height</dimen>

    <dimen name="qs_panel_padding_top">80dp</dimen>

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

    <dimen name="qs_panel_padding_top_combined_headers">80dp</dimen>



    <dimen name="qs_data_usage_text_size">14sp</dimen>

    <dimen name="qs_data_usage_usage_text_size">36sp</dimen>

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

+8 −1
Original line number Diff line number Diff line
@@ -105,6 +105,7 @@ public class QSPanel extends LinearLayout implements Tunable { 
    private final Rect mClippingRect = new Rect();

    private ViewGroup mMediaHostView;

    private boolean mShouldMoveMediaOnExpansion = true;

    private boolean mUsingCombinedHeaders = false;



    public QSPanel(Context context, AttributeSet attrs) {

        super(context, attrs);
@@ -148,6 +149,10 @@ public class QSPanel extends LinearLayout implements Tunable { 
        }

    }



    void setUsingCombinedHeaders(boolean usingCombinedHeaders) {

        mUsingCombinedHeaders = usingCombinedHeaders;

    }



    protected void setHorizontalContentContainerClipping() {

        mHorizontalContentContainer.setClipChildren(true);

        mHorizontalContentContainer.setClipToPadding(false);
@@ -371,7 +376,9 @@ public class QSPanel extends LinearLayout implements Tunable { 


    protected void updatePadding() {

        final Resources res = mContext.getResources();

        int paddingTop = res.getDimensionPixelSize(R.dimen.qs_panel_padding_top);

        int paddingTop = res.getDimensionPixelSize(

                mUsingCombinedHeaders ? R.dimen.qs_panel_padding_top_combined_headers

                        : R.dimen.qs_panel_padding_top);

        int paddingBottom = res.getDimensionPixelSize(R.dimen.qs_panel_padding_bottom);

        setPaddingRelative(getPaddingStart(),

                paddingTop,

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

+5 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.qs;



import static com.android.systemui.classifier.Classifier.QS_SWIPE_SIDE;

import static com.android.systemui.flags.Flags.COMBINED_QS_HEADERS;

import static com.android.systemui.media.dagger.MediaModule.QS_PANEL;

import static com.android.systemui.qs.QSPanel.QS_SHOW_BRIGHTNESS;

import static com.android.systemui.qs.dagger.QSFragmentModule.QS_USING_MEDIA_PLAYER;
@@ -27,6 +28,7 @@ import android.view.View; 
import com.android.internal.logging.MetricsLogger;

import com.android.internal.logging.UiEventLogger;

import com.android.systemui.dump.DumpManager;

import com.android.systemui.flags.FeatureFlags;

import com.android.systemui.media.MediaHierarchyManager;

import com.android.systemui.media.MediaHost;

import com.android.systemui.media.MediaHostState;
@@ -79,7 +81,8 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
            QSLogger qsLogger, BrightnessController.Factory brightnessControllerFactory,

            BrightnessSliderController.Factory brightnessSliderFactory,

            FalsingManager falsingManager,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager) {

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            FeatureFlags featureFlags) {

        super(view, qstileHost, qsCustomizerController, usingMediaPlayer, mediaHost,

                metricsLogger, uiEventLogger, qsLogger, dumpManager);

        mTunerService = tunerService;
@@ -93,6 +96,7 @@ public class QSPanelController extends QSPanelControllerBase<QSPanel> { 
        mBrightnessController = brightnessControllerFactory.create(mBrightnessSliderController);

        mBrightnessMirrorHandler = new BrightnessMirrorHandler(mBrightnessController);

        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        mView.setUsingCombinedHeaders(featureFlags.isEnabled(COMBINED_QS_HEADERS));

    }



    @Override