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

Merge "Don't allow notificaitons to be larger than 4U, even with actions. Limit BigText template to a fixed number of lines. Optimize layout of BigText and Inbox for expansion." into jb-dev

Browse Source
This commit is contained in:
Chris Wren
2012-05-11 09:28:08 -07:00
committed by Android (Google) Code Review
parent b23341e4c5 ca7b7d0566
commit 156c79289d
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/res/res/layout/notification_template_big_text.xml
View File

@@ -43,14 +43,16 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/notification_large_icon_height"
android:orientation="vertical" android:orientation="vertical"
> android:layout_weight="1"
>
<LinearLayout <LinearLayout
android:id="@+id/line1" android:id="@+id/line1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_gravity="top"
android:layout_weight="0"
> >
<TextView android:id="@+id/title" <TextView android:id="@+id/title"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title" android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
@@ -87,24 +89,29 @@
android:singleLine="true" android:singleLine="true"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:ellipsize="marquee" android:ellipsize="marquee"
android:layout_weight="0"
android:visibility="gone" android:visibility="gone"
/> />
<TextView android:id="@+id/big_text" <TextView android:id="@+id/big_text"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
android:singleLine="false" android:singleLine="false"
android:visibility="gone" android:visibility="gone"
android:maxLines="8"
android:ellipsize="end"
android:layout_weight="1"
/> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/actions" android:id="@+id/actions"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone" android:visibility="gone"
android:layout_weight="1"
> >
<!-- actions will be added here --> <!-- actions will be added here -->
</LinearLayout> </LinearLayout>
@@ -116,13 +123,14 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:visibility="gone" android:visibility="gone"
android:layout_weight="1" android:layout_weight="0"
/> />
<LinearLayout <LinearLayout
android:id="@+id/line3" android:id="@+id/line3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_weight="1"
> >
<TextView android:id="@+id/text" <TextView android:id="@+id/text"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
@@ -160,6 +168,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
android:layout_weight="0"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
/> />
</LinearLayout> </LinearLayout>

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

@@ -47,6 +47,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_weight="0"
> >
<TextView android:id="@+id/title" <TextView android:id="@+id/title"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title" android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
@@ -84,62 +85,69 @@
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:ellipsize="marquee" android:ellipsize="marquee"
android:visibility="gone" android:visibility="gone"
android:layout_weight="0"
/> />
<TextView android:id="@+id/inbox_text0" <TextView android:id="@+id/inbox_text0"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:visibility="gone" android:visibility="gone"
android:layout_weight="1"
/> />
<TextView android:id="@+id/inbox_text1" <TextView android:id="@+id/inbox_text1"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:visibility="gone" android:visibility="gone"
android:layout_weight="1"
/> />
<TextView android:id="@+id/inbox_text2" <TextView android:id="@+id/inbox_text2"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:visibility="gone" android:visibility="gone"
android:layout_weight="1"
/> />
<TextView android:id="@+id/inbox_text3" <TextView android:id="@+id/inbox_text3"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:visibility="gone" android:visibility="gone"
android:layout_weight="1"
/> />
<TextView android:id="@+id/inbox_text4" <TextView android:id="@+id/inbox_text4"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:singleLine="true" android:singleLine="true"
android:ellipsize="end" android:ellipsize="end"
android:paddingTop="4dp" android:paddingTop="4dp"
android:paddingBottom="4dp" android:paddingBottom="4dp"
android:visibility="gone" android:visibility="gone"
android:layout_weight="1"
/> />
<LinearLayout <LinearLayout
android:id="@+id/actions" android:id="@+id/actions"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_weight="0"
android:visibility="gone" android:visibility="gone"
> >
<!-- actions will be added here --> <!-- actions will be added here -->
@@ -152,13 +160,14 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:visibility="gone" android:visibility="gone"
android:layout_weight="1" android:layout_weight="0"
/> />
<LinearLayout <LinearLayout
android:id="@+id/line3" android:id="@+id/line3"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:layout_weight="0"
> >
<TextView android:id="@+id/text" <TextView android:id="@+id/text"
android:textAppearance="@style/TextAppearance.StatusBar.EventContent" android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
@@ -196,6 +205,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" android:visibility="gone"
android:layout_weight="0"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
/> />
</LinearLayout> </LinearLayout>

5
packages/SystemUI/res/values/dimens.xml
View File

@@ -58,9 +58,8 @@
<!-- Height of a small notification in the status bar plus glow, padding, etc --> <!-- Height of a small notification in the status bar plus glow, padding, etc -->
<dimen name="notification_min_height">72dp</dimen> <dimen name="notification_min_height">72dp</dimen>
<!-- Height of a small notification in the status bar --> <!-- Height of a large notification in the status bar -->
<!-- TODO: change this back to 256dp once we deal with actions. --> <dimen name="notification_max_height">256dp</dimen>
<dimen name="notification_max_height">320dp</dimen>
<!-- size at which Notification icons will be drawn in the status bar --> <!-- size at which Notification icons will be drawn in the status bar -->
<dimen name="status_bar_icon_drawing_size">18dip</dimen> <dimen name="status_bar_icon_drawing_size">18dip</dimen>