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

Commit 39c615be authored by Alina Zaidi's avatar Alina Zaidi Committed by Android (Google) Code Review
Browse files

Merge "Make the hover highlight height on the left of status bar same as that... 

Merge "Make the hover highlight height on the left of status bar same as that of the right" into main
parents 5add4db1 cc85ad38

packages/SystemUI/res/layout/status_bar.xml

+3 −7
Original line number Original line Diff line number Diff line
@@ -63,12 +63,10 @@ 
            <!-- Container that is wrapped around the views on the start half of the status bar.

            <!-- Container that is wrapped around the views on the start half of the status bar.

                 Its width will change with the number of visible children and sub-children.

                 Its width will change with the number of visible children and sub-children.

                 It is useful when we want to know the visible bounds of the content. -->

                 It is useful when we want to know the visible bounds of the content. -->

            <!-- IMPORTANT: The height of this view *must* be match_parent so that the activity

                 chips don't get cropped when they appear. See b/302160300 and b/366988057. -->

            <FrameLayout

            <FrameLayout

                android:id="@+id/status_bar_start_side_content"

                android:id="@+id/status_bar_start_side_content"

                android:layout_width="wrap_content"

                android:layout_width="wrap_content"

                android:layout_height="match_parent"

                android:layout_height="@dimen/status_bar_icon_container_height"

                android:layout_gravity="center_vertical|start"

                android:layout_gravity="center_vertical|start"

                android:clipChildren="false">

                android:clipChildren="false">
@@ -77,8 +75,6 @@ 
                <!-- The alpha of the start side is controlled by PhoneStatusBarTransitions, and the

                <!-- The alpha of the start side is controlled by PhoneStatusBarTransitions, and the

                     individual views are controlled by StatusBarManager disable flags DISABLE_CLOCK

                     individual views are controlled by StatusBarManager disable flags DISABLE_CLOCK

                     and DISABLE_NOTIFICATION_ICONS, respectively -->

                     and DISABLE_NOTIFICATION_ICONS, respectively -->

                <!-- IMPORTANT: The height of this view *must* be match_parent so that the activity

                 chips don't get cropped when they appear. See b/302160300 and b/366988057. -->

                <LinearLayout

                <LinearLayout

                    android:id="@+id/status_bar_start_side_except_heads_up"

                    android:id="@+id/status_bar_start_side_except_heads_up"

                    android:layout_height="match_parent"

                    android:layout_height="match_parent"
@@ -95,7 +91,7 @@ 
                        android:id="@+id/clock"

                        android:id="@+id/clock"

                        android:layout_width="wrap_content"

                        android:layout_width="wrap_content"

                        android:layout_height="wrap_content"

                        android:layout_height="wrap_content"

                        android:minHeight="@dimen/status_bar_system_icons_height"

                        android:minHeight="@dimen/status_bar_icon_container_height"

                        android:layout_gravity="center_vertical"

                        android:layout_gravity="center_vertical"

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

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

                        android:singleLine="true"

                        android:singleLine="true"
@@ -162,7 +158,7 @@ 
                <include layout="@layout/system_icons"

                <include layout="@layout/system_icons"

                     android:layout_gravity="center_vertical"

                     android:layout_gravity="center_vertical"

                     android:layout_width="wrap_content"

                     android:layout_width="wrap_content"

                     android:layout_height="@dimen/status_bar_system_icons_height" />

                     android:layout_height="@dimen/status_bar_icon_container_height" />

            </com.android.keyguard.AlphaOptimizedLinearLayout>

            </com.android.keyguard.AlphaOptimizedLinearLayout>

        </FrameLayout>

        </FrameLayout>

    </LinearLayout>

    </LinearLayout>

packages/SystemUI/res/values-sw1500dp-110dpi/status-bar-dimens.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,8 @@ 
        If adding new dimension resources, please add them here with 1.5x of their original value.

        If adding new dimension resources, please add them here with 1.5x of their original value.

    -->

    -->





    <!-- Height of the system icons container view in the status bar -->

    <!-- Height of the icon container views in the status bar -->

    <dimen name="status_bar_system_icons_height">@dimen/status_bar_icon_size_sp</dimen>

    <dimen name="status_bar_icon_container_height">@dimen/status_bar_icon_size_sp</dimen>





    <!-- New sp height of notification icons in the status bar -->

    <!-- New sp height of notification icons in the status bar -->

    <dimen name="status_bar_icon_size_sp">@*android:dimen/status_bar_icon_size_sp</dimen>

    <dimen name="status_bar_icon_size_sp">@*android:dimen/status_bar_icon_size_sp</dimen>

packages/SystemUI/res/values-sw1900dp-90dpi/status-bar-dimens.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -22,8 +22,8 @@ 
        If adding new dimension resources, please add me here with 2x of their original value.

        If adding new dimension resources, please add me here with 2x of their original value.

    -->

    -->





    <!-- Height of the system icons container view in the status bar -->

    <!-- Height of the icon container views in the status bar -->

    <dimen name="status_bar_system_icons_height">@dimen/status_bar_icon_size_sp</dimen>

    <dimen name="status_bar_icon_container_height">@dimen/status_bar_icon_size_sp</dimen>





    <!-- New sp height of notification icons in the status bar -->

    <!-- New sp height of notification icons in the status bar -->

    <dimen name="status_bar_icon_size_sp">@*android:dimen/status_bar_icon_size_sp</dimen>

    <dimen name="status_bar_icon_size_sp">@*android:dimen/status_bar_icon_size_sp</dimen>

packages/SystemUI/res/values/dimens.xml

+2 −2
Original line number Original line Diff line number Diff line
@@ -144,8 +144,8 @@ 
    <dimen name="status_bar_bottom_aligned_margin_rotation_180">-1px</dimen>

    <dimen name="status_bar_bottom_aligned_margin_rotation_180">-1px</dimen>

    <dimen name="status_bar_bottom_aligned_margin_rotation_270">-1px</dimen>

    <dimen name="status_bar_bottom_aligned_margin_rotation_270">-1px</dimen>





    <!-- Height of the system icons container view in the status bar -->

    <!-- Height of the icon container views in the status bar -->

    <dimen name="status_bar_system_icons_height">@dimen/status_bar_icon_size_sp</dimen>

    <dimen name="status_bar_icon_container_height">@dimen/status_bar_icon_size_sp</dimen>





    <!-- New sp height of notification icons in the status bar -->

    <!-- New sp height of notification icons in the status bar -->

    <dimen name="status_bar_icon_size_sp">@*android:dimen/status_bar_icon_size_sp</dimen>

    <dimen name="status_bar_icon_size_sp">@*android:dimen/status_bar_icon_size_sp</dimen>

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBarView.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -303,7 +303,7 @@ public class PhoneStatusBarView extends FrameLayout { 
        View systemIconsContainer = findViewById(R.id.system_icons);

        View systemIconsContainer = findViewById(R.id.system_icons);

        ViewGroup.LayoutParams layoutParams = systemIconsContainer.getLayoutParams();

        ViewGroup.LayoutParams layoutParams = systemIconsContainer.getLayoutParams();

        int newSystemIconsHeight =

        int newSystemIconsHeight =

                getResources().getDimensionPixelSize(R.dimen.status_bar_system_icons_height);

                getResources().getDimensionPixelSize(R.dimen.status_bar_icon_container_height);

        if (layoutParams.height != newSystemIconsHeight) {

        if (layoutParams.height != newSystemIconsHeight) {

            layoutParams.height = newSystemIconsHeight;

            layoutParams.height = newSystemIconsHeight;

            systemIconsContainer.setLayoutParams(layoutParams);

            systemIconsContainer.setLayoutParams(layoutParams);