Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'f0ca959b02cb9e81c116f7dece0bc345fb54de0c':
  Fix overlapping app icon & info in notifications with large icons.
This commit is contained in:
Daniel Sandler
2011-01-28 12:20:11 -08:00
committed by Android Git Automerger
parent 35a1f77175 f0ca959b02
commit 9bd1d3204f
3 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
View File

@@ -30,27 +30,21 @@
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
/> />
</LinearLayout> </LinearLayout>
<RelativeLayout <TextView android:id="@+id/info"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
> android:singleLine="true"
<TextView android:id="@+id/info" android:gravity="center_vertical"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info" android:paddingLeft="4dp"
android:layout_width="wrap_content" android:paddingRight="4dp"
android:layout_height="match_parent" />
android:singleLine="true" <ImageView android:id="@+id/icon"
android:gravity="center_vertical" android:layout_width="wrap_content"
android:layout_alignParentLeft="true" android:layout_height="wrap_content"
android:paddingLeft="8dp" android:layout_gravity="bottom"
/> android:layout_marginBottom="13dip"
<ImageView android:id="@+id/icon" android:scaleType="center"
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>
</LinearLayout> </LinearLayout>

10
core/res/res/layout-xlarge/status_bar_latest_event_ticker_large_icon.xml
View File

@@ -37,11 +37,13 @@
android:layout_marginTop="-10dp" android:layout_marginTop="-10dp"
/> />
<ImageView android:id="@+id/icon" <ImageView android:id="@+id/icon"
android:layout_width="48dp" android:layout_width="wrap_content"
android:layout_height="32dp" android:layout_height="wrap_content"
android:layout_gravity="top" android:layout_gravity="bottom"
android:layout_marginTop="6dp" android:layout_marginBottom="13dip"
android:scaleType="center" android:scaleType="center"
android:layout_marginRight="4dip"
android:layout_marginLeft="16dip"
/> />
</LinearLayout> </LinearLayout>

2
packages/SystemUI/res/layout-xlarge/status_bar_notification_row.xml
View File

@@ -27,7 +27,7 @@
<com.android.systemui.statusbar.LatestItemView android:id="@+id/content" <com.android.systemui.statusbar.LatestItemView android:id="@+id/content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="64sp" android:layout_height="64dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_toRightOf="@id/large_icon" android:layout_toRightOf="@id/large_icon"
android:layout_toLeftOf="@id/veto" android:layout_toLeftOf="@id/veto"