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

Commit 094bdb4c authored by Michal Brzezinski's avatar Michal Brzezinski
Browse files

Adjusting bounds of system_icons and statusIcons so they align with cursor hover state 

Changing bounds of them both to be wrapped_content instead of match_parent - then when we introduce hover state for system_icons, it can simply align with view bounds instead of doing custom measurements.
StatusIconContainer required changes in onMeasure, otherwise it was always taking all available space vertically.
Both views are still centered vertically, no changes in that regard..

Bug: 249859409
Test: Checking how status bar looks in different orientations on launcher/keyguard
Change-Id: Icb4e3cb832a82097444a92f7a398d3e7cdf06666
parent 5a5f77af

packages/SystemUI/res/layout/battery_percentage_view.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -20,7 +20,7 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

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

        android:id="@+id/battery_percentage_view"

        android:id="@+id/battery_percentage_view"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:singleLine="true"

        android:singleLine="true"

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

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

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

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

packages/SystemUI/res/layout/keyguard_status_bar.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,10 @@ 
            android:layout_height="match_parent"

            android:layout_height="match_parent"

            android:layout_marginEnd="@dimen/status_bar_padding_end"

            android:layout_marginEnd="@dimen/status_bar_padding_end"

            android:gravity="center_vertical|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>

        </FrameLayout>





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

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

packages/SystemUI/res/layout/system_icons.xml

+7 −4
Original line number Original line Diff line number Diff line
@@ -18,20 +18,23 @@ 
              xmlns:systemui="http://schemas.android.com/apk/res-auto"

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

    android:id="@+id/system_icons"

    android:id="@+id/system_icons"

    android:layout_width="wrap_content"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:layout_height="wrap_content"

    android:layout_gravity="center_vertical|end"

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

    android:gravity="center_vertical">





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

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

        android:layout_width="0dp"

        android:layout_width="0dp"

        android:layout_weight="1"

        android:layout_weight="1"

        android:layout_height="match_parent"

        android:layout_height="wrap_content"

        android:paddingEnd="@dimen/signal_cluster_battery_padding"

        android:paddingEnd="@dimen/signal_cluster_battery_padding"

        android:gravity="center_vertical"

        android:gravity="center_vertical"

        android:orientation="horizontal"/>

        android:orientation="horizontal"/>





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

    <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:layout_width="wrap_content"

        android:clipToPadding="false"

        android:clipToPadding="false"

        android:clipChildren="false"

        android:clipChildren="false"

packages/SystemUI/res/values-sw720dp/dimens.xml

+8 −1
Original line number Original line Diff line number Diff line
@@ -16,8 +16,15 @@ 
*/

*/

-->

-->

<resources>

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

    <!-- 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_header_horizontal_padding">28dp</dimen>

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

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

packages/SystemUI/res/values/dimens.xml

+11 −2
Original line number Original line Diff line number Diff line
@@ -326,8 +326,16 @@ 
    <!-- opacity at which Notification icons will be drawn in the status bar -->

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

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

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

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

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

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

    <dimen name="status_bar_padding_start">8dp</dimen>
@@ -1560,7 +1568,8 @@ 




    <!-- Status bar user chip -->

    <!-- Status bar user chip -->

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

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

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





    <!-- System UI Dialog -->

    <!-- System UI Dialog -->