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

Commit 63dfeee6 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Consolidate notification layouts by removing xlarge versions."

parents 06f20d3e f8d704b5

core/res/res/layout-xlarge/status_bar_latest_event_content.xml

deleted100644 → 0
+0 −48
Original line number Diff line number Diff line 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    >

    <ImageView android:id="@+id/icon"

        android:layout_width="@dimen/notification_large_icon_width"

        android:layout_height="@dimen/notification_large_icon_height"

        android:background="@drawable/notify_panel_notification_icon_bg"

        android:scaleType="center"

        />

    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingLeft="16dp"

        >

        <TextView android:id="@+id/title"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:layout_marginBottom="-3dp"

            />

        <TextView android:id="@+id/text"

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginTop="-2dp"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            />

    </LinearLayout>

    <TextView android:id="@+id/info"

        android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:singleLine="true"

        android:gravity="center_vertical"

        android:paddingLeft="8dp"

        />

</LinearLayout>

core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml

deleted100644 → 0
+0 −50
Original line number Diff line number Diff line 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    >

    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingLeft="16dp"

        >

        <TextView android:id="@+id/title"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:layout_marginBottom="-3dp"

            />

        <TextView android:id="@+id/text"

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:layout_marginTop="-2dp"

            android:singleLine="true"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            />

    </LinearLayout>

    <TextView android:id="@+id/info"

        android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:singleLine="true"

        android:gravity="center_vertical"

        android:paddingLeft="4dp"

        android:paddingRight="4dp"

        />

    <ImageView android:id="@+id/icon"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom"

        android:layout_marginBottom="13dip"

        android:scaleType="center"

        />

</LinearLayout>