Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(348)

Side by Side Diff: chrome/android/java/res/layout/web_notification_big.xml

Issue 1569783005: Notification custom layouts: move settings button to the footer. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | chrome/android/java/res/values-v17/styles.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 Use of this source code is governed by a BSD-style license that can be 3 Use of this source code is governed by a BSD-style license that can be
4 found in the LICENSE file. --> 4 found in the LICENSE file. -->
5 5
6 <!-- 6 <!--
7 Web notification custom layout, big state. 7 Web notification custom layout, big state.
8 _______________________________________________________ 8 _______________________________________________________
9 | | | 9 | | |
10 | Icon | Title text 1:23 pm | 10 | Icon | Title text 1:23 pm |
11 | | | 11 | | |
12 | | Body text which may run to multiple lines | 12 | | Body text which may run to multiple lines |
13 |________| if there is a lot of it. | 13 |________| if there is a lot of it. |
14 | __________________________________________| 14 | __________________________________________|
15 | | 15 | |
16 | Button Button Settings | 16 | Button Button |
17 | __________________________________________| 17 | __________________________________________|
18 | | 18 | |
19 | www.example.com | 19 | www.example.com |
20 |_____________________________________________________| 20 |_____________________________________________________|
21 --> 21 -->
22 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" 22 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
23 android:layout_width="match_parent" 23 android:layout_width="match_parent"
24 android:layout_height="wrap_content"> 24 android:layout_height="wrap_content">
25 25
26 <include layout="@layout/web_notification_icon_frame" 26 <include layout="@layout/web_notification_icon_frame"
27 android:id="@+id/icon_frame"/> 27 android:id="@+id/icon_frame"/>
28 28
29 <!-- 29 <!--
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 android:layout_width="match_parent" 114 android:layout_width="match_parent"
115 android:layout_height="wrap_content" 115 android:layout_height="wrap_content"
116 android:orientation="horizontal" 116 android:orientation="horizontal"
117 android:visibility="gone" 117 android:visibility="gone"
118 style="@style/WebNotificationButtons"/> 118 style="@style/WebNotificationButtons"/>
119 119
120 <ImageView 120 <ImageView
121 android:id="@+id/footer_divider" 121 android:id="@+id/footer_divider"
122 android:layout_width="match_parent" 122 android:layout_width="match_parent"
123 android:layout_height="1dp" 123 android:layout_height="1dp"
124 android:layout_marginBottom="8dp"
125 android:contentDescription="@null" 124 android:contentDescription="@null"
126 style="@style/WebNotificationDivider"/> 125 style="@style/WebNotificationDivider"/>
127 126
128 <RelativeLayout 127 <RelativeLayout
129 android:layout_width="match_parent" 128 android:layout_width="match_parent"
130 android:layout_height="wrap_content" 129 android:layout_height="wrap_content">
131 android:layout_marginBottom="10dp">
132 130
133 <TextView 131 <ImageView
132 android:id="@+id/origin_settings_icon"
133 android:layout_width="wrap_content"
134 android:layout_height="40dp"
135 android:layout_alignParentStart="true"
136 android:layout_alignParentTop="true"
137 android:contentDescription="@null"
138 android:src="@drawable/settings_cog"
139 android:scaleType="centerInside"/>
140
141 <Button
134 android:id="@+id/origin" 142 android:id="@+id/origin"
135 android:layout_width="match_parent" 143 android:layout_width="match_parent"
136 android:layout_height="wrap_content" 144 android:layout_height="wrap_content"
137 android:layout_marginEnd="8dp" 145 android:layout_marginEnd="8dp"
138 android:layout_alignParentStart="true" 146 android:layout_alignParentStart="true"
139 android:layout_alignParentTop="true" 147 android:layout_alignParentTop="true"
140 android:layout_toStartOf="@+id/small_icon_footer" 148 android:layout_toStartOf="@+id/small_icon_footer"
149 android:minHeight="40dp"
150 android:gravity="start|center_vertical"
151 android:paddingStart="32dp"
141 android:singleLine="true" 152 android:singleLine="true"
142 android:ellipsize="start" 153 android:ellipsize="start"
143 style="@style/WebNotificationOrigin"/> 154 style="@style/WebNotificationSettingsButton"/>
144 155
145 <ViewStub 156 <ViewStub
146 android:id="@id/small_icon_footer" 157 android:id="@id/small_icon_footer"
147 android:inflatedId="@id/small_icon_footer" 158 android:inflatedId="@id/small_icon_footer"
148 android:layout="@layout/web_notification_small_icon" 159 android:layout="@layout/web_notification_small_icon"
149 android:layout_width="16dp" 160 android:layout_width="16dp"
150 android:layout_height="16dp" 161 android:layout_height="16dp"
151 android:layout_marginEnd="8dp" 162 android:layout_marginEnd="8dp"
152 android:layout_alignParentEnd="true" 163 android:layout_alignParentEnd="true"
153 android:layout_alignParentTop="true"/> 164 android:layout_centerVertical="true"/>
154 165
155 </RelativeLayout> 166 </RelativeLayout>
156 167
157 </LinearLayout> 168 </LinearLayout>
158 169
159 </RelativeLayout> 170 </RelativeLayout>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/values-v17/styles.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698