Merge changes I6358cfe3,I00b20bd7 into pi-dev

    android:layout_height="20dp"

    android:layout_marginTop="8dp"

    android:layout_marginBottom="14dp"

    android:layout_marginEnd="@dimen/notification_side_paddings"

    android:layout_below="@id/quick_status_bar_system_icons"

    android:paddingEnd="@dimen/signal_cluster_battery_padding" >

    android:paddingEnd="@dimen/status_bar_padding_end" >

    <com.android.systemui.statusbar.phone.StatusIconContainer

        android:id="@+id/statusIcons"

    android:id="@+id/quick_status_bar_system_icons"

    android:layout_width="match_parent"

    android:layout_height="@*android:dimen/quick_qs_offset_height"

    android:layout_marginRight="@dimen/notification_side_paddings"

    android:layout_marginLeft="@dimen/notification_side_paddings"

    android:layout_alignParentEnd="true"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:gravity="center"

    android:paddingStart="8dp"

    android:paddingEnd="8dp"

    android:paddingStart="@dimen/status_bar_padding_start"

    android:paddingEnd="@dimen/status_bar_padding_end"

    android:orientation="horizontal">

    <com.android.systemui.statusbar.policy.Clock

        android:id="@+id/clock"

        android:layout_width="wrap_content"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:paddingStart="@dimen/status_bar_padding_start"

        android:paddingEnd="8dp"

        android:paddingEnd="@dimen/status_bar_padding_end"

        android:orientation="horizontal"

        >

        <ViewStub

<resources>

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

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

    <dimen name="qs_header_tile_margin_horizontal">5dp</dimen>

    <dimen name="qs_header_tile_margin_horizontal">13dp</dimen>

</resources>

    <!-- the padding on the start of the statusbar -->

    <dimen name="status_bar_padding_start">6dp</dimen>

    <!-- the padding on the end of the statusbar -->

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

    <!-- the radius of the overflow dot in the status bar -->

    <dimen name="overflow_dot_radius">1dp</dimen>