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

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

Issue 2962713002: Fix inconsistent and incorrect Roboto Medium usage (Closed)
Patch Set: Fix inconsistent and incorrect Roboto Medium usage Created 3 years, 5 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 2016 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2016 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 <RelativeLayout 6 <RelativeLayout
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 xmlns:chrome="http://schemas.android.com/apk/res-auto" 8 xmlns:chrome="http://schemas.android.com/apk/res-auto"
9 android:id="@+id/contextual_search_promo" 9 android:id="@+id/contextual_search_promo"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
(...skipping 21 matching lines...) Expand all
32 32
33 <org.chromium.ui.widget.ButtonCompat 33 <org.chromium.ui.widget.ButtonCompat
34 android:id="@+id/contextual_search_allow_button" 34 android:id="@+id/contextual_search_allow_button"
35 android:layout_below="@id/contextual_search_promo_text" 35 android:layout_below="@id/contextual_search_promo_text"
36 android:layout_alignParentEnd="true" 36 android:layout_alignParentEnd="true"
37 android:layout_width="wrap_content" 37 android:layout_width="wrap_content"
38 android:layout_height="wrap_content" 38 android:layout_height="wrap_content"
39 android:layout_gravity="end" 39 android:layout_gravity="end"
40 android:layout_marginTop="16dp" 40 android:layout_marginTop="16dp"
41 android:layout_marginEnd="16dp" 41 android:layout_marginEnd="16dp"
42 android:fontFamily="sans-serif-medium"
43 android:paddingStart="8dp" 42 android:paddingStart="8dp"
44 android:paddingEnd="8dp" 43 android:paddingEnd="8dp"
45 android:text="@string/contextual_search_allow_button" 44 android:text="@string/contextual_search_allow_button"
46 android:textAllCaps="true" 45 android:textAllCaps="true"
47 android:textColor="#FFF" 46 android:textColor="#FFF"
48 android:textSize="14sp" 47 android:textSize="14sp"
49 chrome:buttonColor="@color/light_active_color" /> 48 chrome:buttonColor="@color/light_active_color" />
50 49
51 <Button 50 <Button
52 android:id="@+id/contextual_search_no_thanks_button" 51 android:id="@+id/contextual_search_no_thanks_button"
53 android:layout_below="@id/contextual_search_promo_text" 52 android:layout_below="@id/contextual_search_promo_text"
54 android:layout_toStartOf="@id/contextual_search_allow_button" 53 android:layout_toStartOf="@id/contextual_search_allow_button"
55 android:layout_width="wrap_content" 54 android:layout_width="wrap_content"
56 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
57 android:layout_gravity="end" 56 android:layout_gravity="end"
58 android:layout_marginTop="16dp" 57 android:layout_marginTop="16dp"
59 android:layout_marginEnd="16dp" 58 android:layout_marginEnd="16dp"
60 android:fontFamily="sans-serif-medium"
61 android:paddingStart="8dp" 59 android:paddingStart="8dp"
62 android:paddingEnd="8dp" 60 android:paddingEnd="8dp"
63 android:text="@string/contextual_search_no_thanks_button" 61 android:text="@string/contextual_search_no_thanks_button"
64 android:textAllCaps="true" 62 android:textAllCaps="true"
65 android:textColor="@color/light_active_color" 63 android:textColor="@color/light_active_color"
66 android:textSize="14sp" 64 android:textSize="14sp"
67 style="@style/ButtonCompatBorderless" /> 65 style="@style/ButtonCompatBorderless" />
68 66
69 <View 67 <View
70 android:layout_below="@id/contextual_search_allow_button" 68 android:layout_below="@id/contextual_search_allow_button"
71 android:layout_width="match_parent" 69 android:layout_width="match_parent"
72 android:layout_height="1px" 70 android:layout_height="1px"
73 android:layout_marginTop="16dp" 71 android:layout_marginTop="16dp"
74 android:background="@color/contextual_search_promo_border_color" /> 72 android:background="@color/contextual_search_promo_border_color" />
75 73
76 </RelativeLayout> 74 </RelativeLayout>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698