Skip to content

Commit 407f2fd

Browse files
cwrenAndroid (Google) Code Review
cwren
authored and
Android (Google) Code Review
committed
Merge "Don't allow actions to intrude into the notification area." into jb-dev
2 parents 05f5236 + 92c6247 commit 407f2fd

File tree

1 file changed

+83
-76
lines changed

1 file changed

+83
-76
lines changed

‎core/res/res/layout/notification_template_big_base.xml‎

Lines changed: 83 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -43,99 +43,106 @@
4343
android:gravity="center_vertical"
4444
>
4545
<LinearLayout
46-
android:id="@+id/line1"
4746
android:layout_width="match_parent"
4847
android:layout_height="wrap_content"
49-
android:orientation="horizontal"
48+
android:minHeight="@dimen/notification_large_icon_height"
49+
android:orientation="vertical"
5050
>
51-
<TextView android:id="@+id/title"
52-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
51+
<LinearLayout
52+
android:id="@+id/line1"
5353
android:layout_width="match_parent"
5454
android:layout_height="wrap_content"
55+
android:orientation="horizontal"
56+
>
57+
<TextView android:id="@+id/title"
58+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
59+
android:layout_width="match_parent"
60+
android:layout_height="wrap_content"
61+
android:singleLine="true"
62+
android:ellipsize="marquee"
63+
android:fadingEdge="horizontal"
64+
android:layout_weight="1"
65+
/>
66+
<ViewStub android:id="@+id/time"
67+
android:layout_width="wrap_content"
68+
android:layout_height="wrap_content"
69+
android:layout_gravity="center"
70+
android:layout_weight="0"
71+
android:visibility="gone"
72+
android:layout="@layout/notification_template_part_time"
73+
/>
74+
<ViewStub android:id="@+id/chronometer"
75+
android:layout_width="wrap_content"
76+
android:layout_height="wrap_content"
77+
android:layout_gravity="center"
78+
android:layout_weight="0"
79+
android:visibility="gone"
80+
android:layout="@layout/notification_template_part_chronometer"
81+
/>
82+
</LinearLayout>
83+
<TextView android:id="@+id/text2"
84+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"
85+
android:layout_width="match_parent"
86+
android:layout_height="wrap_content"
87+
android:layout_marginTop="-2dp"
88+
android:layout_marginBottom="-2dp"
5589
android:singleLine="true"
56-
android:ellipsize="marquee"
5790
android:fadingEdge="horizontal"
58-
android:layout_weight="1"
59-
/>
60-
<ViewStub android:id="@+id/time"
61-
android:layout_width="wrap_content"
62-
android:layout_height="wrap_content"
63-
android:layout_gravity="center"
64-
android:layout_weight="0"
65-
android:visibility="gone"
66-
android:layout="@layout/notification_template_part_time"
67-
/>
68-
<ViewStub android:id="@+id/chronometer"
69-
android:layout_width="wrap_content"
70-
android:layout_height="wrap_content"
71-
android:layout_gravity="center"
72-
android:layout_weight="0"
91+
android:ellipsize="marquee"
7392
android:visibility="gone"
74-
android:layout="@layout/notification_template_part_chronometer"
7593
/>
76-
</LinearLayout>
77-
<TextView android:id="@+id/text2"
78-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"
79-
android:layout_width="match_parent"
80-
android:layout_height="wrap_content"
81-
android:layout_marginTop="-2dp"
82-
android:layout_marginBottom="-2dp"
83-
android:singleLine="true"
84-
android:fadingEdge="horizontal"
85-
android:ellipsize="marquee"
86-
android:visibility="gone"
87-
/>
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-
/>
95-
<LinearLayout
96-
android:id="@+id/line3"
97-
android:layout_width="match_parent"
98-
android:layout_height="wrap_content"
99-
android:orientation="horizontal"
100-
>
101-
<TextView android:id="@+id/text"
94+
<TextView android:id="@+id/big_text"
10295
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
103-
android:layout_width="0dp"
96+
android:layout_width="match_parent"
10497
android:layout_height="wrap_content"
105-
android:layout_weight="1"
106-
android:layout_gravity="center"
107-
android:singleLine="true"
108-
android:ellipsize="marquee"
109-
android:fadingEdge="horizontal"
98+
android:singleLine="false"
99+
android:visibility="gone"
110100
/>
111-
<TextView android:id="@+id/info"
112-
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
113-
android:layout_width="wrap_content"
101+
<LinearLayout
102+
android:id="@+id/line3"
103+
android:layout_width="match_parent"
114104
android:layout_height="wrap_content"
115-
android:layout_gravity="center"
116-
android:layout_weight="0"
117-
android:singleLine="true"
118-
android:gravity="center"
119-
android:paddingLeft="8dp"
120-
/>
121-
<ImageView android:id="@+id/right_icon"
122-
android:layout_width="wrap_content"
105+
android:orientation="horizontal"
106+
>
107+
<TextView android:id="@+id/text"
108+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
109+
android:layout_width="0dp"
110+
android:layout_height="wrap_content"
111+
android:layout_weight="1"
112+
android:layout_gravity="center"
113+
android:singleLine="true"
114+
android:ellipsize="marquee"
115+
android:fadingEdge="horizontal"
116+
/>
117+
<TextView android:id="@+id/info"
118+
android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Info"
119+
android:layout_width="wrap_content"
120+
android:layout_height="wrap_content"
121+
android:layout_gravity="center"
122+
android:layout_weight="0"
123+
android:singleLine="true"
124+
android:gravity="center"
125+
android:paddingLeft="8dp"
126+
/>
127+
<ImageView android:id="@+id/right_icon"
128+
android:layout_width="wrap_content"
129+
android:layout_height="wrap_content"
130+
android:layout_gravity="center"
131+
android:layout_weight="0"
132+
android:scaleType="center"
133+
android:paddingLeft="8dp"
134+
android:visibility="gone"
135+
android:drawableAlpha="180"
136+
/>
137+
</LinearLayout>
138+
<ProgressBar
139+
android:id="@android:id/progress"
140+
android:layout_width="match_parent"
123141
android:layout_height="wrap_content"
124-
android:layout_gravity="center"
125-
android:layout_weight="0"
126-
android:scaleType="center"
127-
android:paddingLeft="8dp"
128142
android:visibility="gone"
129-
android:drawableAlpha="180"
143+
style="?android:attr/progressBarStyleHorizontal"
130144
/>
131145
</LinearLayout>
132-
<ProgressBar
133-
android:id="@android:id/progress"
134-
android:layout_width="match_parent"
135-
android:layout_height="wrap_content"
136-
android:visibility="gone"
137-
style="?android:attr/progressBarStyleHorizontal"
138-
/>
139146
<LinearLayout
140147
android:id="@+id/actions"
141148
android:layout_width="match_parent"

0 commit comments

Comments
 (0)