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

Support more items in the Notification.InboxStyle, plus an overflow.

Browse Source 
Bug: 6500113
Change-Id: I9f6b45ef0821c45000afa8a23ee51033b51df298
This commit is contained in:
Chris Wren
2012-05-17 18:09:42 -04:00
committed by Android (Google) Code Review
parent d7ba814370
commit 29bb6d925b
3 changed files with 38 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/java/android/app/Notification.java
View File

@@ -1850,7 +1850,7 @@ public class Notification implements Parcelable
contentView.setViewVisibility(R.id.text2, View.GONE);
int[] rowIds = {R.id.inbox_text0, R.id.inbox_text1, R.id.inbox_text2, R.id.inbox_text3,
R.id.inbox_text4};
R.id.inbox_text4, R.id.inbox_text5, R.id.inbox_text6};
// Make sure all rows are gone in case we reuse a view.
for (int rowId : rowIds) {
@@ -1867,6 +1867,12 @@ public class Notification implements Parcelable
i++;
}
if (mTexts.size() > rowIds.length) {
contentView.setViewVisibility(R.id.inbox_more, View.VISIBLE);
} else {
contentView.setViewVisibility(R.id.inbox_more, View.GONE);
}
return contentView;
}

28
core/res/res/layout/notification_template_inbox.xml
View File

@@ -132,6 +132,34 @@
android:visibility="gone"
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_text5"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_text6"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
android:layout_weight="1"
/>
<TextView android:id="@+id/inbox_more"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent"
android:layout_height="0dp"
android:singleLine="true"
android:ellipsize="end"
android:visibility="gone"
android:layout_weight="1"
android:text="@android:string/ellipsis"
/>
<include
layout="@layout/notification_action_list"
android:id="@+id/actions"

3
core/res/res/values/public.xml
View File

@@ -208,6 +208,9 @@
<java-symbol type="id" name="inbox_text2" />
<java-symbol type="id" name="inbox_text3" />
<java-symbol type="id" name="inbox_text4" />
<java-symbol type="id" name="inbox_text5" />
<java-symbol type="id" name="inbox_text6" />
<java-symbol type="id" name="inbox_more" />
<java-symbol type="id" name="status_bar_latest_event_content" />
<java-symbol type="attr" name="actionModeShareDrawable" />