Merge "Adjusting bounds of system_icons and statusIcons so they align with...

        xmlns:android="http://schemas.android.com/apk/res/android"

        android:id="@+id/battery_percentage_view"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:textAppearance="@style/TextAppearance.StatusBar.Clock"

        android:textColor="?android:attr/textColorPrimary"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/status_bar_padding_end"

            android:gravity="center_vertical|end">

            <include layout="@layout/system_icons" />

            <include layout="@layout/system_icons"

                android:layout_gravity="center_vertical"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

        </FrameLayout>

        <ImageView android:id="@+id/multi_user_avatar"

              xmlns:systemui="http://schemas.android.com/apk/res-auto"

    android:id="@+id/system_icons"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_gravity="center_vertical|end"

    android:layout_height="wrap_content"

    android:paddingBottom="@dimen/status_bar_icons_padding_bottom"

    android:paddingTop="@dimen/status_bar_icons_padding_top"

    android:paddingStart="@dimen/status_bar_icons_padding_start"

    android:paddingEnd="@dimen/status_bar_icons_padding_end"

    android:gravity="center_vertical">

    <com.android.systemui.statusbar.phone.StatusIconContainer android:id="@+id/statusIcons"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:paddingEnd="@dimen/signal_cluster_battery_padding"

        android:gravity="center_vertical"

        android:orientation="horizontal"/>

    <com.android.systemui.battery.BatteryMeterView android:id="@+id/battery"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:layout_width="wrap_content"

        android:clipToPadding="false"

        android:clipChildren="false"

*/

-->

<resources>

    <!-- padding for container with status icons and battery -->

    <dimen name="status_bar_icons_padding_end">12dp</dimen>

    <!-- it's a bit smaller on large screen to account for status_bar_icon_horizontal_margin -->

    <dimen name="status_bar_icons_padding_start">10dp</dimen>

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

    <!-- gap on either side of status bar notification icons -->

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

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

    <dimen name="controls_header_horizontal_padding">28dp</dimen>

    <dimen name="controls_content_margin_horizontal">40dp</dimen>

    <!-- opacity at which Notification icons will be drawn in the status bar -->

    <item type="dimen" name="status_bar_icon_drawing_alpha">90%</item>

    <!-- paddings for container with status icons and battery -->

    <!-- padding start is a bit smaller than end to account for status icon margin-->

    <dimen name="status_bar_icons_padding_start">11dp</dimen>

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

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

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

    <!-- gap on either side of status bar notification icons -->

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

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

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

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

    <!-- Status bar user chip -->

    <dimen name="status_bar_user_chip_avatar_size">16dp</dimen>

    <dimen name="status_bar_user_chip_end_margin">12dp</dimen>

    <!-- below also works as break between user chip and hover state of status icons -->

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

    <dimen name="status_bar_user_chip_text_size">12sp</dimen>

    <!-- System UI Dialog -->