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

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

Issue 1947693002: Add a Learn More link to the Physical Web opt-in activity (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: nits Created 4 years, 7 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
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 <merge 6 <merge
7 xmlns:android="http://schemas.android.com/apk/res/android" > 7 xmlns:android="http://schemas.android.com/apk/res/android" >
8 8
9 <ScrollView 9 <ScrollView
10 android:layout_height="match_parent" 10 android:layout_height="match_parent"
(...skipping 17 matching lines...) Expand all
28 android:contentDescription="@null" /> 28 android:contentDescription="@null" />
29 <TextView 29 <TextView
30 android:layout_height="wrap_content" 30 android:layout_height="wrap_content"
31 android:layout_width="wrap_content" 31 android:layout_width="wrap_content"
32 android:layout_marginTop="10dp" 32 android:layout_marginTop="10dp"
33 android:layout_marginBottom="20dp" 33 android:layout_marginBottom="20dp"
34 android:text="@string/physical_web_optin_title" 34 android:text="@string/physical_web_optin_title"
35 android:textSize="24sp" 35 android:textSize="24sp"
36 android:textColor="@android:color/black" /> 36 android:textColor="@android:color/black" />
37 <TextView 37 <TextView
38 android:id="@+id/physical_web_optin_description"
38 android:layout_height="wrap_content" 39 android:layout_height="wrap_content"
39 android:layout_width="match_parent" 40 android:layout_width="match_parent"
40 android:text="@string/physical_web_optin_description" 41 android:text="@string/physical_web_optin_description"
41 android:textSize="16sp" 42 android:textSize="16sp"
42 android:textColor="@color/light_normal_color" /> 43 android:textColor="@color/light_normal_color"
44 android:textColorLink="@color/light_active_color" />
43 45
44 </LinearLayout> 46 </LinearLayout>
45 47
46 </ScrollView> 48 </ScrollView>
47 49
48 <View 50 <View
49 style="@style/ButtonBarTopDivider" 51 style="@style/ButtonBarTopDivider"
50 android:layout_gravity="bottom" 52 android:layout_gravity="bottom"
51 android:layout_marginBottom="56dp" /> 53 android:layout_marginBottom="56dp" />
52 54
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 android:paddingStart="16dp" 86 android:paddingStart="16dp"
85 android:paddingEnd="16dp" 87 android:paddingEnd="16dp"
86 android:text="@string/enable" 88 android:text="@string/enable"
87 android:textAllCaps="true" 89 android:textAllCaps="true"
88 android:textColor="@color/light_active_color" 90 android:textColor="@color/light_active_color"
89 android:textSize="14sp" /> 91 android:textSize="14sp" />
90 92
91 </LinearLayout> 93 </LinearLayout>
92 94
93 </merge> 95 </merge>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698