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

Side by Side Diff: chrome/android/java/res/layout/fre_data_reduction_proxy.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 2015 The Chromium Authors. All rights reserved. 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.
3 3
4 Use of this source code is governed by a BSD-style license that can be 4 Use of this source code is governed by a BSD-style license that can be
5 found in the LICENSE file. 5 found in the LICENSE file.
6 --> 6 -->
7 <org.chromium.chrome.browser.firstrun.FirstRunView 7 <org.chromium.chrome.browser.firstrun.FirstRunView
8 xmlns:android="http://schemas.android.com/apk/res/android" 8 xmlns:android="http://schemas.android.com/apk/res/android"
9 xmlns:chrome="http://schemas.android.com/apk/res-auto" 9 xmlns:chrome="http://schemas.android.com/apk/res-auto"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
59 android:layout_width="wrap_content" 59 android:layout_width="wrap_content"
60 android:layout_height="wrap_content" 60 android:layout_height="wrap_content"
61 android:layout_marginBottom="@dimen/fre_vertical_spacing " 61 android:layout_marginBottom="@dimen/fre_vertical_spacing "
62 android:gravity="start" 62 android:gravity="start"
63 android:lineSpacingMultiplier="1.4" 63 android:lineSpacingMultiplier="1.4"
64 android:text="@string/data_reduction_promo_summary" 64 android:text="@string/data_reduction_promo_summary"
65 android:textColor="@color/fre_text_color" 65 android:textColor="@color/fre_text_color"
66 android:textSize="@dimen/fre_normal_text_size" /> 66 android:textSize="@dimen/fre_normal_text_size" />
67 67
68 <android.support.v7.widget.SwitchCompat 68 <android.support.v7.widget.SwitchCompat
69 style="@style/RobotoMediumStyle"
69 android:id="@+id/enable_data_saver_switch" 70 android:id="@+id/enable_data_saver_switch"
70 android:layout_width="match_parent" 71 android:layout_width="match_parent"
71 android:layout_height="wrap_content" 72 android:layout_height="wrap_content"
72 android:lineSpacingMultiplier="1.4" 73 android:lineSpacingMultiplier="1.4"
73 android:showText="false" 74 android:showText="false"
74 android:text="@string/data_reduction_enabled_switch" 75 android:text="@string/data_reduction_enabled_switch"
75 android:textColor="@color/fre_text_color" 76 android:textColor="@color/fre_text_color"
76 android:textSize="@dimen/fre_normal_text_size" 77 android:textSize="@dimen/fre_normal_text_size" />
77 android:fontFamily="sans-serif-medium" />
78 78
79 </LinearLayout> 79 </LinearLayout>
80 </LinearLayout> 80 </LinearLayout>
81 </LinearLayout> 81 </LinearLayout>
82 </ScrollView> 82 </ScrollView>
83 83
84 <!-- fre_button_bar_height = 52dp = layout_height + layout_marginBottom --> 84 <!-- fre_button_bar_height = 52dp = layout_height + layout_marginBottom -->
85 <org.chromium.ui.widget.ButtonCompat 85 <org.chromium.ui.widget.ButtonCompat
86 android:id="@+id/next_button" 86 android:id="@+id/next_button"
87 android:layout_width="wrap_content" 87 android:layout_width="wrap_content"
88 android:layout_height="36dp" 88 android:layout_height="36dp"
89 android:layout_marginBottom="16dp" 89 android:layout_marginBottom="16dp"
90 android:layout_gravity="bottom|center_horizontal" 90 android:layout_gravity="bottom|center_horizontal"
91 android:paddingStart="@dimen/fre_button_padding" 91 android:paddingStart="@dimen/fre_button_padding"
92 android:paddingEnd="@dimen/fre_button_padding" 92 android:paddingEnd="@dimen/fre_button_padding"
93 android:text="@string/next" 93 android:text="@string/next"
94 android:textAllCaps="true" 94 android:textAllCaps="true"
95 android:textColor="@android:color/white" 95 android:textColor="@android:color/white"
96 android:textSize="@dimen/fre_button_text_size" 96 android:textSize="@dimen/fre_button_text_size"
97 chrome:buttonColor="@color/light_active_color" 97 chrome:buttonColor="@color/light_active_color"
98 chrome:buttonRaised="false"/> 98 chrome:buttonRaised="false"/>
99 </org.chromium.chrome.browser.firstrun.FirstRunView> 99 </org.chromium.chrome.browser.firstrun.FirstRunView>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/dialog_with_titlebar.xml ('k') | chrome/android/java/res/layout/new_tab_page_incognito.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698