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

Commit 852b53cc authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19829996, 20026353, 20104719, 20111891, 20119800] into tm-qpr1-release. 

Change-Id: Iae7a7663fec2247d8cccb98e048c06ea6b5010df
parents 84b3fc11 beafe059

core/java/android/os/Parcel.java

+3 −0
Original line number Diff line number Diff line
@@ -4388,6 +4388,9 @@ public final class Parcel { 
        int type = readInt();

        if (isLengthPrefixed(type)) {

            int objectLength = readInt();

            if (objectLength < 0) {

                return null;

            }

            int end = MathUtils.addOrThrow(dataPosition(), objectLength);

            int valueLength = end - start;

            setDataPosition(end);

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,