am 9bd1d320: am f0ca959b: Merge "Fix overlapping app icon & info in notifications with large icons." into honeycomb

* commit '9bd1d3204f4048b902d0fdf0ea0809f29eddeafd':
  Fix overlapping app icon & info in notifications with large icons.
This commit is contained in:
Daniel Sandler
2011-01-28 12:22:38 -08:00
committed by Android Git Automerger
3 changed files with 21 additions and 25 deletions

View File

@@ -30,27 +30,21 @@
android:fadingEdge="horizontal"
/>
</LinearLayout>
<RelativeLayout
<TextView android:id="@+id/info"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
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"
/>
<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:scaleType="center"
/>
</RelativeLayout>
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>

View File

@@ -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>

View File

@@ -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"