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

Commit 4b2cecbb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Center switch vertically with primary text" into oc-dev

parents 63398bbd 747f25cc

packages/SystemUI/res/layout/notification_info.xml

+31 −31
Original line number Diff line number Diff line
@@ -71,20 +71,29 @@ 
        android:layout_height="wrap_content"

        android:layout_marginBottom="20dp"

        android:layout_marginEnd="@*android:dimen/notification_content_margin_end"

        android:orientation="horizontal">

        android:orientation="vertical">

        <!-- Channel Text -->

        <LinearLayout

            android:layout_width="0dp"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:orientation="vertical">

            android:orientation="horizontal">

            <!-- Channel Name -->

            <TextView

                android:id="@+id/channel_name"

                android:layout_width="wrap_content"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:layout_marginBottom="6dp"

                style="@style/TextAppearance.NotificationInfo.Primary" />

            <!-- Ban Channel Switch -->

            <Switch

                android:id="@+id/channel_enabled_switch"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="end|center_vertical"

                android:contentDescription="@string/notification_channel_switch_accessibility"

                android:background="@null" />

        </LinearLayout>

        <!-- Secondary Text - only one shows at a time -->

        <TextView

            android:id="@+id/channel_disabled"
@@ -108,15 +117,6 @@ 
            android:maxLines="1"

            style="@style/TextAppearance.NotificationInfo.Secondary.Link"/>

    </LinearLayout>

        <!-- Ban Channel Switch -->

        <Switch

            android:id="@+id/channel_enabled_switch"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="end|center_vertical"

            android:contentDescription="@string/notification_channel_switch_accessibility"

            android:background="@null" />

    </LinearLayout>



    <!-- Settings and Done buttons -->

    <LinearLayout