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

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

Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb

parents 79c46485 db173394

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

+14 −20
Original line number Diff line number Diff line
@@ -30,27 +30,21 @@ 
            android:fadingEdge="horizontal"

            />

    </LinearLayout>

    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        >

    <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:layout_alignParentLeft="true"

            android:paddingLeft="8dp"

        android:paddingLeft="4dp"

        android:paddingRight="4dp"

        />

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

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

            android:layout_alignParentBottom="true"

            android:layout_alignRight="@id/info"

            android:layout_marginBottom="8dip"

        android:layout_gravity="bottom"

        android:layout_marginBottom="13dip"

        android:scaleType="center"

        />

    </RelativeLayout>

</LinearLayout>

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

+6 −4
Original line number Diff line number Diff line
@@ -37,11 +37,13 @@ 
        android:layout_marginTop="-10dp"

        />

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

        android:layout_width="48dp"

        android:layout_height="32dp"

        android:layout_gravity="top"

        android:layout_marginTop="6dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom"

        android:layout_marginBottom="13dip"

        android:scaleType="center"

        android:layout_marginRight="4dip"

        android:layout_marginLeft="16dip"

        />

</LinearLayout>

packages/SystemUI/res/layout-xlarge/status_bar_notification_row.xml

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


    <com.android.systemui.statusbar.LatestItemView android:id="@+id/content"

        android:layout_width="match_parent"

        android:layout_height="64sp"

        android:layout_height="64dp"

        android:layout_alignParentTop="true"

        android:layout_toRightOf="@id/large_icon"

        android:layout_toLeftOf="@id/veto"