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

Commit 760a1958 authored by Fabian Kozynski's avatar Fabian Kozynski
Browse files

Fix spacing between clock and date 

The clock doesn't need a min width since it's no longer clickable.
Instead, make sure that there's correct margin to the left of the date.

Test: manual
Fixes: 194302524
Change-Id: I7ec7912ca1db34b8f16f3d8676dc810b1e65177c
parent a3017177

packages/SystemUI/res/layout/quick_qs_status_icons.xml

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

            android:id="@+id/clock"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:minWidth="@dimen/min_clickable_item_size"

            android:minHeight="@dimen/qs_header_row_min_height"

            android:minHeight="@dimen/min_clickable_item_size"

            android:gravity="center_vertical|start"

            android:gravity="center_vertical|start"

            android:paddingStart="@dimen/status_bar_left_clock_starting_padding"

            android:paddingStart="@dimen/status_bar_left_clock_starting_padding"

            android:paddingEnd="@dimen/status_bar_left_clock_end_padding"

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

            android:id="@+id/date_clock"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_marginStart="@dimen/status_bar_left_clock_end_padding"

            android:gravity="center_vertical|start"

            android:gravity="center_vertical|start"

            android:singleLine="true"

            android:singleLine="true"

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

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

packages/SystemUI/res/values/dimens.xml

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

    <dimen name="status_bar_left_clock_starting_padding">0dp</dimen>





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

    <!-- 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. -->

    <!-- 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>

    <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 Original line Diff line number Diff line
@@ -280,6 +280,25 @@ public class QuickStatusBarHeader extends FrameLayout { 
        updateBatteryMode();

        updateBatteryMode();

        updateHeadersPadding();

        updateHeadersPadding();

        updateAnimators();

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

    private void updateAnimators() {