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

Commit 40ab2330 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix spacing between clock and date" into sc-qpr1-dev

parents 86536be5 40a10b28

packages/SystemUI/res/layout/quick_qs_status_icons.xml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ 
            android:id="@+id/clock"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:minWidth="48dp"

            android:minHeight="48dp"

            android:gravity="center_vertical|start"

            android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
@@ -51,6 +50,7 @@ 
            android:id="@+id/date_clock"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_marginStart="@dimen/status_bar_left_clock_end_padding"

            android:gravity="center_vertical|start"

            android:singleLine="true"

            android:textAppearance="@style/TextAppearance.QS.Status"

packages/SystemUI/res/values/dimens.xml

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



    <!-- End padding for left-aligned status bar clock -->

    <dimen name="status_bar_left_clock_end_padding">7dp</dimen>

    <dimen name="status_bar_left_clock_end_padding">2dp</dimen>



    <!-- Spacing after the wifi signals that is present if there are any icons following it. -->

    <dimen name="status_bar_wifi_signal_spacer_width">2.5dp</dimen>

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

+19 −0
Original line number Diff line number Diff line
@@ -277,6 +277,25 @@ public class QuickStatusBarHeader extends FrameLayout { 
        updateBatteryMode();

        updateHeadersPadding();

        updateAnimators();



        updateClockDatePadding();

    }



    private void updateClockDatePadding() {

        int startPadding = mContext.getResources()

                .getDimensionPixelSize(R.dimen.status_bar_left_clock_starting_padding);

        int endPadding = mContext.getResources()

                .getDimensionPixelSize(R.dimen.status_bar_left_clock_end_padding);

        mClockView.setPaddingRelative(

                startPadding,

                mClockView.getPaddingTop(),

                endPadding,

                mClockView.getPaddingBottom()

        );



        MarginLayoutParams lp = (MarginLayoutParams) mClockDateView.getLayoutParams();

        lp.setMarginStart(endPadding);

        mClockDateView.setLayoutParams(lp);

    }



    private void updateAnimators() {