Skip to content

Commit 683ab00

Browse files
cwrencwren
committed
fix underfull content bug in inbox and big text templates.
Bug: 7172721 Change-Id: I22019009eec31ca18b54eec5f6ed5b626cee1540
1 parent e0de5bf commit 683ab00

File tree

5 files changed

+164
-145
lines changed

5 files changed

+164
-145
lines changed

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

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1923,6 +1923,7 @@ private RemoteViews makeBigContentView() {
19231923
contentView.setViewVisibility(rowId, View.GONE);
19241924
}
19251925

1926+
19261927
int i=0;
19271928
while (i < mTexts.size() && i < rowIds.length) {
19281929
CharSequence str = mTexts.get(i);
@@ -1933,11 +1934,11 @@ private RemoteViews makeBigContentView() {
19331934
i++;
19341935
}
19351936

1936-
if (mTexts.size() > rowIds.length) {
1937-
contentView.setViewVisibility(R.id.inbox_more, View.VISIBLE);
1938-
} else {
1939-
contentView.setViewVisibility(R.id.inbox_more, View.GONE);
1940-
}
1937+
contentView.setViewVisibility(R.id.inbox_end_pad,
1938+
mTexts.size() > 0 ? View.VISIBLE : View.GONE);
1939+
1940+
contentView.setViewVisibility(R.id.inbox_more,
1941+
mTexts.size() > rowIds.length ? View.VISIBLE : View.GONE);
19411942

19421943
return contentView;
19431944
}

‎core/res/res/layout/notification_action_list.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
android:layout_height="wrap_content"
2222
android:orientation="horizontal"
2323
android:visibility="gone"
24+
android:layout_marginBottom="8dp"
2425
android:showDividers="middle"
2526
android:divider="?android:attr/listDivider"
2627
android:dividerPadding="12dp"

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@
3434
android:layout_gravity="fill_vertical"
3535
android:layout_marginStart="@dimen/notification_large_icon_width"
3636
android:orientation="vertical"
37-
android:paddingTop="2dp"
37+
android:paddingTop="0dp"
3838
android:paddingBottom="2dp"
3939
android:gravity="top"
4040
>
4141
<LinearLayout
4242
android:layout_width="match_parent"
4343
android:layout_height="wrap_content"
44+
android:minHeight="@dimen/notification_large_icon_height"
4445
android:orientation="vertical"
4546
android:layout_marginStart="8dp"
4647
android:layout_marginEnd="8dp"
@@ -50,7 +51,7 @@
5051
android:id="@+id/line1"
5152
android:layout_width="match_parent"
5253
android:layout_height="wrap_content"
53-
android:paddingTop="6dp"
54+
android:paddingTop="8dp"
5455
android:orientation="horizontal"
5556
android:layout_gravity="top"
5657
android:layout_weight="0"

‎core/res/res/layout/notification_template_inbox.xml‎

Lines changed: 153 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -36,163 +36,178 @@
3636
android:layout_marginStart="@dimen/notification_large_icon_width"
3737
android:minHeight="@dimen/notification_large_icon_height"
3838
android:orientation="vertical"
39-
android:paddingTop="2dp"
39+
android:paddingTop="0dp"
4040
android:paddingBottom="2dp"
4141
android:gravity="top"
4242
>
4343
<LinearLayout
44-
android:id="@+id/line1"
4544
android:layout_width="match_parent"
4645
android:layout_height="wrap_content"
47-
android:layout_marginStart="8dp"
48-
android:layout_marginEnd="8dp"
49-
android:paddingTop="6dp"
50-
android:orientation="horizontal"
51-
android:layout_weight="0"
46+
android:minHeight="@dimen/notification_large_icon_height"
47+
android:paddingTop="2dp"
48+
android:orientation="vertical"
5249
>
53-
<TextView android:id="@+id/title"
54-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
50+
<LinearLayout
51+
android:id="@+id/line1"
52+
android:layout_width="match_parent"
53+
android:layout_height="wrap_content"
54+
android:layout_marginStart="8dp"
55+
android:layout_marginEnd="8dp"
56+
android:paddingTop="6dp"
57+
android:orientation="horizontal"
58+
android:layout_weight="0"
59+
>
60+
<TextView android:id="@+id/title"
61+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
62+
android:layout_width="match_parent"
63+
android:layout_height="wrap_content"
64+
android:singleLine="true"
65+
android:ellipsize="marquee"
66+
android:fadingEdge="horizontal"
67+
android:layout_weight="1"
68+
/>
69+
<ViewStub android:id="@+id/time"
70+
android:layout_width="wrap_content"
71+
android:layout_height="wrap_content"
72+
android:layout_gravity="center"
73+
android:layout_weight="0"
74+
android:visibility="gone"
75+
android:layout="@layout/notification_template_part_time"
76+
/>
77+
<ViewStub android:id="@+id/chronometer"
78+
android:layout_width="wrap_content"
79+
android:layout_height="wrap_content"
80+
android:layout_gravity="center"
81+
android:layout_weight="0"
82+
android:visibility="gone"
83+
android:layout="@layout/notification_template_part_chronometer"
84+
/>
85+
</LinearLayout>
86+
<TextView android:id="@+id/text2"
87+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"
5588
android:layout_width="match_parent"
5689
android:layout_height="wrap_content"
90+
android:layout_marginTop="-2dp"
91+
android:layout_marginBottom="-2dp"
92+
android:layout_marginStart="8dp"
93+
android:layout_marginEnd="8dp"
5794
android:singleLine="true"
58-
android:ellipsize="marquee"
5995
android:fadingEdge="horizontal"
60-
android:layout_weight="1"
96+
android:ellipsize="marquee"
97+
android:visibility="gone"
98+
android:layout_weight="0"
6199
/>
62-
<ViewStub android:id="@+id/time"
63-
android:layout_width="wrap_content"
64-
android:layout_height="wrap_content"
65-
android:layout_gravity="center"
100+
<ProgressBar
101+
android:id="@android:id/progress"
102+
android:layout_width="match_parent"
103+
android:layout_height="12dp"
104+
android:layout_marginStart="8dp"
105+
android:layout_marginEnd="8dp"
106+
android:visibility="gone"
66107
android:layout_weight="0"
108+
style="?android:attr/progressBarStyleHorizontal"
109+
/>
110+
<TextView android:id="@+id/inbox_text0"
111+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
112+
android:layout_width="match_parent"
113+
android:layout_height="0dp"
114+
android:layout_marginStart="8dp"
115+
android:layout_marginEnd="8dp"
116+
android:singleLine="true"
117+
android:ellipsize="end"
67118
android:visibility="gone"
68-
android:layout="@layout/notification_template_part_time"
119+
android:layout_weight="1"
69120
/>
70-
<ViewStub android:id="@+id/chronometer"
71-
android:layout_width="wrap_content"
72-
android:layout_height="wrap_content"
73-
android:layout_gravity="center"
74-
android:layout_weight="0"
121+
<TextView android:id="@+id/inbox_text1"
122+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
123+
android:layout_width="match_parent"
124+
android:layout_height="0dp"
125+
android:layout_marginStart="8dp"
126+
android:layout_marginEnd="8dp"
127+
android:singleLine="true"
128+
android:ellipsize="end"
75129
android:visibility="gone"
76-
android:layout="@layout/notification_template_part_chronometer"
130+
android:layout_weight="1"
77131
/>
78-
</LinearLayout>
79-
<TextView android:id="@+id/text2"
80-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"
81-
android:layout_width="match_parent"
82-
android:layout_height="wrap_content"
83-
android:layout_marginTop="-2dp"
84-
android:layout_marginBottom="-2dp"
85-
android:layout_marginStart="8dp"
86-
android:layout_marginEnd="8dp"
87-
android:singleLine="true"
88-
android:fadingEdge="horizontal"
89-
android:ellipsize="marquee"
90-
android:visibility="gone"
91-
android:layout_weight="0"
92-
/>
93-
<ProgressBar
94-
android:id="@android:id/progress"
95-
android:layout_width="match_parent"
96-
android:layout_height="12dp"
97-
android:layout_marginStart="8dp"
98-
android:layout_marginEnd="8dp"
99-
android:visibility="gone"
100-
android:layout_weight="0"
101-
style="?android:attr/progressBarStyleHorizontal"
102-
/>
103-
<TextView android:id="@+id/inbox_text0"
104-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
105-
android:layout_width="match_parent"
106-
android:layout_height="0dp"
107-
android:layout_marginStart="8dp"
108-
android:layout_marginEnd="8dp"
109-
android:singleLine="true"
110-
android:ellipsize="end"
111-
android:visibility="gone"
112-
android:layout_weight="1"
113-
/>
114-
<TextView android:id="@+id/inbox_text1"
115-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
116-
android:layout_width="match_parent"
117-
android:layout_height="0dp"
118-
android:layout_marginStart="8dp"
119-
android:layout_marginEnd="8dp"
120-
android:singleLine="true"
121-
android:ellipsize="end"
122-
android:visibility="gone"
123-
android:layout_weight="1"
124-
/>
125-
<TextView android:id="@+id/inbox_text2"
126-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
127-
android:layout_width="match_parent"
128-
android:layout_height="0dp"
129-
android:layout_marginStart="8dp"
130-
android:layout_marginEnd="8dp"
131-
android:singleLine="true"
132-
android:ellipsize="end"
133-
android:visibility="gone"
134-
android:layout_weight="1"
135-
/>
136-
<TextView android:id="@+id/inbox_text3"
137-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
138-
android:layout_width="match_parent"
139-
android:layout_height="0dp"
140-
android:layout_marginStart="8dp"
141-
android:layout_marginEnd="8dp"
142-
android:singleLine="true"
143-
android:ellipsize="end"
144-
android:visibility="gone"
145-
android:layout_weight="1"
146-
/>
147-
<TextView android:id="@+id/inbox_text4"
148-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
149-
android:layout_width="match_parent"
150-
android:layout_height="0dp"
151-
android:layout_marginStart="8dp"
152-
android:singleLine="true"
153-
android:ellipsize="end"
154-
android:visibility="gone"
155-
android:layout_weight="1"
156-
/>
157-
<TextView android:id="@+id/inbox_text5"
158-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
159-
android:layout_width="match_parent"
160-
android:layout_height="0dp"
161-
android:layout_marginStart="8dp"
162-
android:layout_marginEnd="8dp"
163-
android:singleLine="true"
164-
android:ellipsize="end"
165-
android:visibility="gone"
166-
android:layout_weight="1"
167-
/>
168-
<TextView android:id="@+id/inbox_text6"
169-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
170-
android:layout_width="match_parent"
171-
android:layout_height="0dp"
172-
android:layout_marginStart="8dp"
173-
android:layout_marginEnd="8dp"
174-
android:singleLine="true"
175-
android:ellipsize="end"
176-
android:visibility="gone"
177-
android:layout_weight="1"
178-
/>
179-
<TextView android:id="@+id/inbox_more"
180-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
181-
android:layout_width="match_parent"
182-
android:layout_height="0dp"
183-
android:layout_marginStart="8dp"
184-
android:layout_marginEnd="8dp"
185-
android:singleLine="true"
186-
android:ellipsize="end"
187-
android:visibility="gone"
188-
android:layout_weight="1"
189-
android:text="@android:string/ellipsis"
132+
<TextView android:id="@+id/inbox_text2"
133+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
134+
android:layout_width="match_parent"
135+
android:layout_height="0dp"
136+
android:layout_marginStart="8dp"
137+
android:layout_marginEnd="8dp"
138+
android:singleLine="true"
139+
android:ellipsize="end"
140+
android:visibility="gone"
141+
android:layout_weight="1"
142+
/>
143+
<TextView android:id="@+id/inbox_text3"
144+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
145+
android:layout_width="match_parent"
146+
android:layout_height="0dp"
147+
android:layout_marginStart="8dp"
148+
android:layout_marginEnd="8dp"
149+
android:singleLine="true"
150+
android:ellipsize="end"
151+
android:visibility="gone"
152+
android:layout_weight="1"
153+
/>
154+
<TextView android:id="@+id/inbox_text4"
155+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
156+
android:layout_width="match_parent"
157+
android:layout_height="0dp"
158+
android:layout_marginStart="8dp"
159+
android:singleLine="true"
160+
android:ellipsize="end"
161+
android:visibility="gone"
162+
android:layout_weight="1"
163+
/>
164+
<TextView android:id="@+id/inbox_text5"
165+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
166+
android:layout_width="match_parent"
167+
android:layout_height="0dp"
168+
android:layout_marginStart="8dp"
169+
android:layout_marginEnd="8dp"
170+
android:singleLine="true"
171+
android:ellipsize="end"
172+
android:visibility="gone"
173+
android:layout_weight="1"
174+
/>
175+
<TextView android:id="@+id/inbox_text6"
176+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
177+
android:layout_width="match_parent"
178+
android:layout_height="0dp"
179+
android:layout_marginStart="8dp"
180+
android:layout_marginEnd="8dp"
181+
android:singleLine="true"
182+
android:ellipsize="end"
183+
android:visibility="gone"
184+
android:layout_weight="1"
185+
/>
186+
<TextView android:id="@+id/inbox_more"
187+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
188+
android:layout_width="match_parent"
189+
android:layout_height="0dp"
190+
android:layout_marginStart="8dp"
191+
android:layout_marginEnd="8dp"
192+
android:singleLine="true"
193+
android:ellipsize="end"
194+
android:visibility="gone"
195+
android:layout_weight="1"
196+
android:text="@android:string/ellipsis"
197+
/>
198+
<FrameLayout
199+
android:id="@+id/inbox_end_pad"
200+
android:layout_width="match_parent"
201+
android:layout_height="8dip"
202+
android:visibility="gone"
203+
android:layout_weight="0"
190204
/>
205+
</LinearLayout>
191206
<ImageView
192207
android:layout_width="match_parent"
193-
android:layout_height="1px"
208+
android:layout_height="1dip"
209+
android:layout_marginTop="-1px"
194210
android:id="@+id/action_divider"
195-
android:visibility="gone"
196211
android:background="?android:attr/dividerHorizontal" />
197212
<include
198213
layout="@layout/notification_action_list"
@@ -202,9 +217,9 @@
202217
/>
203218
<ImageView
204219
android:layout_width="match_parent"
205-
android:layout_height="1px"
220+
android:layout_height="1dip"
221+
android:layout_marginTop="-1px"
206222
android:id="@+id/overflow_divider"
207-
android:layout_marginTop="8dp"
208223
android:visibility="visible"
209224
android:background="?android:attr/dividerHorizontal" />
210225
<LinearLayout

‎core/res/res/values/symbols.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,7 @@
208208
<java-symbol type="id" name="inbox_text5" />
209209
<java-symbol type="id" name="inbox_text6" />
210210
<java-symbol type="id" name="inbox_more" />
211+
<java-symbol type="id" name="inbox_end_pad" />
211212
<java-symbol type="id" name="status_bar_latest_event_content" />
212213
<java-symbol type="id" name="action_divider" />
213214
<java-symbol type="id" name="overflow_divider" />

0 commit comments

Comments
 (0)