Skip to content

Commit 1243b96

Browse files
cwrenAndroid (Google) Code Review
cwren
authored and
Android (Google) Code Review
committed
Merge "rework big text to handle gmail use case" into jb-dev
2 parents 7196464 + e4a2a4f commit 1243b96

File tree

3 files changed

+55
-54
lines changed

3 files changed

+55
-54
lines changed

‎core/java/android/app/Notification.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1651,11 +1651,11 @@ public BigTextStyle bigText(CharSequence cs) {
16511651
}
16521652

16531653
private RemoteViews makeBigContentView() {
1654-
RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(R.layout.notification_template_big_text);
1655-
1654+
int bigTextId = R.layout.notification_template_big_text;
1655+
RemoteViews contentView = mBuilder.applyStandardTemplateWithActions(bigTextId);
16561656
contentView.setTextViewText(R.id.big_text, mBigText);
16571657
contentView.setViewVisibility(R.id.big_text, View.VISIBLE);
1658-
contentView.setTextViewText(R.id.text, ""); // XXX: what do do with this spot?
1658+
contentView.setViewVisibility(R.id.text2, View.GONE);
16591659

16601660
return contentView;
16611661
}
@@ -1665,7 +1665,6 @@ public Notification build() {
16651665
if (mBuilder == null) {
16661666
throw new IllegalArgumentException("Style requires a valid Builder object");
16671667
}
1668-
mBuilder.mSubText = null;
16691668
Notification wip = mBuilder.buildUnstyled();
16701669
wip.bigContentView = makeBigContentView();
16711670
return wip;

‎core/res/res/layout/notification_template_base.xml‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,6 @@
8585
android:ellipsize="marquee"
8686
android:visibility="gone"
8787
/>
88-
<TextView android:id="@+id/big_text"
89-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
90-
android:layout_width="match_parent"
91-
android:layout_height="wrap_content"
92-
android:singleLine="false"
93-
android:visibility="gone"
94-
/>
9588
<LinearLayout
9689
android:id="@+id/line3"
9790
android:layout_width="match_parent"

‎core/res/res/layout/notification_template_big_text.xml‎

Lines changed: 52 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
android:layout_height="wrap_content"
3434
android:layout_gravity="fill_vertical"
3535
android:layout_marginLeft="@dimen/notification_large_icon_width"
36-
android:minHeight="@dimen/notification_large_icon_height"
3736
android:orientation="vertical"
3837
android:paddingLeft="12dp"
3938
android:paddingRight="12dp"
@@ -42,55 +41,73 @@
4241
android:gravity="center_vertical"
4342
>
4443
<LinearLayout
45-
android:id="@+id/line1"
4644
android:layout_width="match_parent"
4745
android:layout_height="wrap_content"
48-
android:orientation="horizontal"
49-
>
50-
<TextView android:id="@+id/title"
51-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
46+
android:minHeight="@dimen/notification_large_icon_height"
47+
android:orientation="vertical"
48+
>
49+
<LinearLayout
50+
android:id="@+id/line1"
51+
android:layout_width="match_parent"
52+
android:layout_height="wrap_content"
53+
android:orientation="horizontal"
54+
>
55+
<TextView android:id="@+id/title"
56+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
57+
android:layout_width="match_parent"
58+
android:layout_height="wrap_content"
59+
android:singleLine="true"
60+
android:ellipsize="marquee"
61+
android:fadingEdge="horizontal"
62+
android:layout_weight="1"
63+
/>
64+
<ViewStub android:id="@+id/time"
65+
android:layout_width="wrap_content"
66+
android:layout_height="wrap_content"
67+
android:layout_gravity="center"
68+
android:layout_weight="0"
69+
android:visibility="gone"
70+
android:layout="@layout/notification_template_part_time"
71+
/>
72+
<ViewStub android:id="@+id/chronometer"
73+
android:layout_width="wrap_content"
74+
android:layout_height="wrap_content"
75+
android:layout_gravity="center"
76+
android:layout_weight="0"
77+
android:visibility="gone"
78+
android:layout="@layout/notification_template_part_chronometer"
79+
/>
80+
</LinearLayout>
81+
<TextView android:id="@+id/text2"
82+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"
5283
android:layout_width="match_parent"
5384
android:layout_height="wrap_content"
85+
android:layout_marginTop="-2dp"
86+
android:layout_marginBottom="-2dp"
5487
android:singleLine="true"
55-
android:ellipsize="marquee"
5688
android:fadingEdge="horizontal"
57-
android:layout_weight="1"
58-
/>
59-
<ViewStub android:id="@+id/time"
60-
android:layout_width="wrap_content"
61-
android:layout_height="wrap_content"
62-
android:layout_gravity="center"
63-
android:layout_weight="0"
89+
android:ellipsize="marquee"
6490
android:visibility="gone"
65-
android:layout="@layout/notification_template_part_time"
6691
/>
67-
<ViewStub android:id="@+id/chronometer"
68-
android:layout_width="wrap_content"
92+
<TextView android:id="@+id/big_text"
93+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
94+
android:layout_width="match_parent"
6995
android:layout_height="wrap_content"
70-
android:layout_gravity="center"
71-
android:layout_weight="0"
96+
android:layout_marginTop="2dp"
97+
android:layout_marginBottom="2dp"
98+
android:singleLine="false"
7299
android:visibility="gone"
73-
android:layout="@layout/notification_template_part_chronometer"
74100
/>
75101
</LinearLayout>
76-
<TextView android:id="@+id/text2"
77-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"
78-
android:layout_width="match_parent"
79-
android:layout_height="wrap_content"
80-
android:layout_marginTop="-2dp"
81-
android:layout_marginBottom="-2dp"
82-
android:singleLine="true"
83-
android:fadingEdge="horizontal"
84-
android:ellipsize="marquee"
85-
android:visibility="gone"
86-
/>
87-
<TextView android:id="@+id/big_text"
88-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
102+
<LinearLayout
103+
android:id="@+id/actions"
89104
android:layout_width="match_parent"
90105
android:layout_height="wrap_content"
91-
android:singleLine="false"
106+
android:orientation="vertical"
92107
android:visibility="gone"
93-
/>
108+
>
109+
<!-- actions will be added here -->
110+
</LinearLayout>
94111
<LinearLayout
95112
android:id="@+id/line3"
96113
android:layout_width="match_parent"
@@ -135,13 +152,5 @@
135152
android:visibility="gone"
136153
style="?android:attr/progressBarStyleHorizontal"
137154
/>
138-
<LinearLayout
139-
android:id="@+id/actions"
140-
android:layout_width="match_parent"
141-
android:layout_height="wrap_content"
142-
android:visibility="gone"
143-
>
144-
<!-- actions will be added here -->
145-
</LinearLayout>
146155
</LinearLayout>
147156
</FrameLayout>

0 commit comments

Comments
 (0)