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

Commit 1d0861dd authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Move Carrier label into universal status bar header."

parents 07bb4c30 9054d94c

packages/Keyguard/res/layout/keyguard_status_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:gravity="center_horizontal|top"

    android:layout_marginTop="32dp"

    android:layout_marginTop="48dp"

    android:layout_marginBottom="32dp"

    android:contentDescription="@string/keyguard_accessibility_status">

    <LinearLayout

packages/SystemUI/res/drawable/notification_header_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    </item>

    <item>

        <shape>

            <solid android:color="#ff374248" />

            <solid android:color="#ff384248" />

            <corners android:radius="@*android:dimen/notification_quantum_rounded_rect_radius" />

        </shape>

    </item>

packages/SystemUI/res/layout/status_bar_expanded.xml

+0 −9
Original line number Diff line number Diff line
@@ -34,15 +34,6 @@ 
        android:layout_gravity="bottom"

        />



    <com.android.keyguard.CarrierText

        android:id="@+id/keyguard_carrier_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="2dp"

        android:layout_marginLeft="8dp"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium" />



    <include

        layout="@layout/keyguard_status_view"

        android:layout_height="wrap_content"

packages/SystemUI/res/layout/status_bar_expanded_header.xml

+9 −0
Original line number Diff line number Diff line
@@ -65,6 +65,15 @@ 
            />

    </RelativeLayout>



    <com.android.keyguard.CarrierText

        android:id="@+id/keyguard_carrier_text"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/status_bar_header_height_keyguard"

        android:layout_marginLeft="8dp"

        android:gravity="center_vertical"

        android:ellipsize="marquee"

        android:textAppearance="?android:attr/textAppearanceMedium" />



    <FrameLayout android:id="@+id/system_icons_container"

        android:layout_width="wrap_content"

        android:layout_height="@dimen/status_bar_header_height"

packages/SystemUI/res/values/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -158,6 +158,9 @@ 
    <!-- Height of the status bar header bar when expanded -->

    <dimen name="status_bar_header_height_expanded">144dp</dimen>



    <!-- Height of the status bar header bar when on Keyguard -->

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



    <!-- Gravity for the notification panel -->

    <!-- 0x37 = fill_horizontal|top -->

    <integer name="notification_panel_layout_gravity">0x37</integer>