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

Commit e06900b7 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "QS: Fix header layout when alarm set"

parents 0543b236 6923bc80

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+7 −7
Original line number Original line Diff line number Diff line
@@ -96,14 +96,14 @@ 
    <LinearLayout

    <LinearLayout

        android:id="@+id/date_time_group"

        android:id="@+id/date_time_group"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="28dp"

        android:layout_alignParentStart="true"

        android:layout_alignParentStart="true"

        android:layout_alignParentTop="true"

        android:layout_alignParentTop="true"

        android:orientation="horizontal">

        android:orientation="horizontal">





        <include layout="@layout/split_clock_view"

        <include layout="@layout/split_clock_view"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="match_parent"

            android:layout_marginStart="16dp"

            android:layout_marginStart="16dp"

            android:layout_marginTop="2dp"

            android:layout_marginTop="2dp"

            android:id="@+id/clock" />

            android:id="@+id/clock" />
@@ -111,28 +111,28 @@ 
        <com.android.systemui.statusbar.policy.DateView

        <com.android.systemui.statusbar.policy.DateView

            android:id="@+id/date"

            android:id="@+id/date"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="match_parent"

            android:layout_marginStart="6dp"

            android:layout_marginStart="6dp"

            android:layout_marginTop="8dp"

            android:layout_marginTop="8dp"

            android:layout_alignParentTop="true"

            android:drawableStart="@drawable/header_dot"

            android:drawableStart="@drawable/header_dot"

            android:drawablePadding="6dp"

            android:drawablePadding="6dp"

            android:singleLine="true"

            android:singleLine="true"

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

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

            android:textSize="@dimen/qs_time_collapsed_size"

            android:textSize="@dimen/qs_time_collapsed_size"

            android:gravity="top"

            systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />

            systemui:datePattern="@string/abbrev_wday_month_day_no_year_alarm" />





        <com.android.systemui.statusbar.AlphaOptimizedButton

        <com.android.systemui.statusbar.AlphaOptimizedButton

            android:id="@+id/alarm_status"

            android:id="@+id/alarm_status"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_height="match_parent"

            android:layout_alignParentTop="true"

            android:layout_marginTop="8dp"

            android:drawablePadding="6dp"

            android:drawablePadding="6dp"

            android:drawableStart="@drawable/ic_access_alarms_small"

            android:drawableStart="@drawable/ic_access_alarms_small"

            android:textColor="#64ffffff"

            android:textColor="#64ffffff"

            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"

            android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Date"

            android:minHeight="36dp"

            android:paddingStart="6dp"

            android:paddingStart="6dp"

            android:gravity="top"

            android:background="?android:attr/selectableItemBackground"

            android:background="?android:attr/selectableItemBackground"

            android:visibility="gone" />

            android:visibility="gone" />

    </LinearLayout>

    </LinearLayout>