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

Commit 42ec695e authored by Automerger Merge Worker's avatar Automerger Merge Worker Committed by Android (Google) Code Review
Browse files

Merge "Merge changes Ia6019681,Id36f6cb0,I070bf6d5,Ifd13da3b,I99373152 into... 

Merge "Merge changes Ia6019681,Id36f6cb0,I070bf6d5,Ifd13da3b,I99373152 into udc-qpr-dev am: 852e73de" into udc-qpr-dev-plus-aosp
parents acbfc5c8 9cfcc479

packages/SystemUI/res-keyguard/layout/status_bar_mobile_signal_group_inner.xml

+6 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
        </FrameLayout>

        <ImageView

            android:id="@+id/mobile_type"

            android:layout_height="@dimen/status_bar_mobile_signal_size"

            android:layout_height="@dimen/status_bar_mobile_type_size"

            android:layout_width="wrap_content"

            android:layout_gravity="center_vertical"

            android:adjustViewBounds="true"
@@ -74,13 +74,15 @@ 
            <com.android.systemui.statusbar.AnimatedImageView

                android:id="@+id/mobile_signal"

                android:layout_height="@dimen/status_bar_mobile_signal_size"

                android:layout_width="@dimen/status_bar_mobile_signal_size"

                android:layout_width="wrap_content"

                android:adjustViewBounds="true"

                systemui:hasOverlappingRendering="false"

                />

            <ImageView

                android:id="@+id/mobile_roaming"

                android:layout_width="@dimen/status_bar_mobile_signal_size"

                android:layout_height="@dimen/status_bar_mobile_signal_size"

                android:layout_width="wrap_content"

                android:layout_height="@dimen/status_bar_mobile_roam_size"

                android:adjustViewBounds="true"

                android:layout_gravity="top|start"

                android:src="@drawable/stat_sys_roaming"

                android:contentDescription="@string/data_connection_roaming"

packages/SystemUI/res/layout/combined_qs_header.xml

+2 −1
Original line number Diff line number Diff line
@@ -133,7 +133,8 @@ frame when animating QS <-> QQS transition 


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

            android:id="@+id/statusIcons"

            android:layout_width="wrap_content"

            android:layout_width="0dp"

            android:layout_weight="1"

            android:layout_height="wrap_content"

            android:paddingEnd="@dimen/signal_cluster_battery_padding" />

packages/SystemUI/res/layout/status_bar.xml

+7 −2
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
                android:id="@+id/status_bar_start_side_content"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical|start"

                android:clipChildren="false">



                <include layout="@layout/heads_up_status_bar_layout" />
@@ -88,7 +89,8 @@ 
                    <com.android.systemui.statusbar.policy.Clock

                        android:id="@+id/clock"

                        android:layout_width="wrap_content"

                        android:layout_height="match_parent"

                        android:layout_height="@dimen/status_bar_system_icons_height"

                        android:layout_gravity="center_vertical"

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

                        android:singleLine="true"

                        android:paddingStart="@dimen/status_bar_left_clock_starting_padding"
@@ -146,7 +148,10 @@ 
                    android:layout_marginEnd="@dimen/status_bar_user_chip_end_margin"

                    layout="@layout/status_bar_user_chip_container" />



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

                <include layout="@layout/system_icons"

                     android:layout_gravity="center_vertical"

                     android:layout_width="wrap_content"

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

            </com.android.keyguard.AlphaOptimizedLinearLayout>

        </FrameLayout>

    </LinearLayout>

packages/SystemUI/res/values/dimens.xml

+17 −6
Original line number Diff line number Diff line
@@ -121,6 +121,9 @@ 
    <dimen name="navigation_edge_cancelled_arrow_height">0dp</dimen>

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



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

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



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

    <!-- Original dp height of notification icons in the status bar -->
@@ -162,13 +165,21 @@ 


    <!-- Size of the view displaying the wifi inout icon in the status bar. -->

    <dimen name="status_bar_wifi_inout_container_size">17sp</dimen>

    <!-- Size of the view displaying the wifi signal icon in the status bar. -->

    <dimen name="status_bar_wifi_signal_size">13sp</dimen>

    <!-- Size of the view displaying the wifi signal icon in the status bar. This value should

        match the core/status_bar_system_icon_size and change to sp unit -->

    <dimen name="status_bar_wifi_signal_size">15sp</dimen>



    <!-- Size of the view displaying the mobile inout icon in the status bar. -->

    <dimen name="status_bar_mobile_inout_container_size">17sp</dimen>

    <!-- Size of the view displaying the mobile signal icon in the status bar. -->

    <dimen name="status_bar_mobile_signal_size">13sp</dimen>

    <!-- Size of the view displaying the mobile signal icon in the status bar. This value should

        match the core/status_bar_system_icon_size and change to sp unit -->

    <dimen name="status_bar_mobile_signal_size">15sp</dimen>

    <!-- Size of the view displaying the mobile signal icon in the status bar. This value should

        match the viewport height of mobile signal drawables such as ic_lte_mobiledata -->

    <dimen name="status_bar_mobile_type_size">16sp</dimen>

    <!-- Size of the view displaying the mobile roam icon in the status bar. This value should

        match the viewport size of drawable stat_sys_roaming -->

    <dimen name="status_bar_mobile_roam_size">8sp</dimen>



    <!-- Spacing before the airplane mode icon if there are any icons preceding it. -->

    <dimen name="status_bar_airplane_spacer_width">4sp</dimen>
@@ -343,8 +354,8 @@ 
    <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>

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

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



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

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

packages/SystemUI/res/xml/qs_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
            android:layout_width="0dp"

            android:layout_height="@dimen/new_qs_header_non_clickable_element_height"

            app:layout_constraintWidth_default="wrap"

            app:layout_constraintStart_toEndOf="@id/date"

            app:layout_constraintEnd_toEndOf="parent"

            app:layout_constraintTop_toTopOf="@id/date"

            app:layout_constraintBottom_toBottomOf="@id/date"