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

Commit 5e9e73ac authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Move carrier package to shade" into udc-dev am: 4c6f5787 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22458682



Change-Id: If8d2790878aac5c829e88aa76098557b2b1f9e7f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 1ac905e8 4c6f5787

packages/SystemUI/res/layout/combined_qs_header.xml

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ 


    <include

        android:id="@+id/carrier_group"

        layout="@layout/qs_carrier_group"

        layout="@layout/shade_carrier_group"

        app:layout_constraintHeight_min="@dimen/large_screen_shade_header_min_height"

        android:minHeight="@dimen/large_screen_shade_header_min_height"

        app:layout_constraintWidth_min="48dp"

packages/SystemUI/res/layout/qs_carrier.xml→packages/SystemUI/res/layout/shade_carrier.xml

+3 −3
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
  ~ limitations under the License

  -->



<com.android.systemui.qs.carrier.QSCarrier

<com.android.systemui.shade.carrier.ShadeCarrier

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

    android:id="@+id/linear_carrier"

    android:layout_width="wrap_content"
@@ -29,7 +29,7 @@ 
    android:focusable="true" >



    <com.android.systemui.util.AutoMarqueeTextView

        android:id="@+id/qs_carrier_text"

        android:id="@+id/shade_carrier_text"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"
@@ -53,4 +53,4 @@ 
        android:layout_marginStart="@dimen/qs_carrier_margin_width"

        android:visibility="gone" />



</com.android.systemui.qs.carrier.QSCarrier>
 
 No newline at end of file
 
</com.android.systemui.shade.carrier.ShadeCarrier>
 
 No newline at end of file

packages/SystemUI/res/layout/qs_carrier_group.xml→packages/SystemUI/res/layout/shade_carrier_group.xml

+7 −7
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
  -->



<!-- Extends LinearLayout -->

<com.android.systemui.qs.carrier.QSCarrierGroup

<com.android.systemui.shade.carrier.ShadeCarrierGroup

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

    android:id="@+id/qs_mobile"

    android:layout_width="0dp"
@@ -39,25 +39,25 @@ 
        android:visibility="gone"/>



    <include

        layout="@layout/qs_carrier"

        layout="@layout/shade_carrier"

        android:id="@+id/carrier1"

        android:layout_weight="1"/>



    <View

        android:id="@+id/qs_carrier_divider1"

        android:id="@+id/shade_carrier_divider1"

        android:layout_width="@dimen/qs_header_carrier_separator_width"

        android:layout_height="match_parent"

        android:visibility="gone"

        android:importantForAccessibility="no"/>



    <include

        layout="@layout/qs_carrier"

        layout="@layout/shade_carrier"

        android:id="@+id/carrier2"

        android:layout_weight="1"

        android:visibility="gone"/>



    <View

        android:id="@+id/qs_carrier_divider2"

        android:id="@+id/shade_carrier_divider2"

        android:layout_width="@dimen/qs_header_carrier_separator_width"

        android:layout_height="match_parent"

        android:layout_weight="1"
@@ -65,9 +65,9 @@ 
        android:importantForAccessibility="no"/>



    <include

        layout="@layout/qs_carrier"

        layout="@layout/shade_carrier"

        android:id="@+id/carrier3"

        android:layout_weight="1"

        android:visibility="gone"/>



</com.android.systemui.qs.carrier.QSCarrierGroup>
 
 No newline at end of file
 
</com.android.systemui.shade.carrier.ShadeCarrierGroup>
 
 No newline at end of file