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

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

Issue 914003002: Use ButtonCompat to get Material-y buttons in more places. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 <!-- 2 <!--
3 Copyright 2013 The Chromium Authors. All rights reserved. 3 Copyright 2013 The Chromium Authors. All rights reserved.
4 4
5 Use of this source code is governed by a BSD-style license that can be 5 Use of this source code is governed by a BSD-style license that can be
6 found in the LICENSE file. 6 found in the LICENSE file.
7 --> 7 -->
8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 8 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="match_parent" 10 android:layout_height="match_parent"
(...skipping 21 matching lines...) Expand all
32 android:id="@+id/website_settings_connection_message" 32 android:id="@+id/website_settings_connection_message"
33 android:layout_width="match_parent" 33 android:layout_width="match_parent"
34 android:layout_height="wrap_content" 34 android:layout_height="wrap_content"
35 android:lineSpacingExtra="3dp" 35 android:lineSpacingExtra="3dp"
36 android:paddingTop="12dp" 36 android:paddingTop="12dp"
37 android:textColor="#444444" 37 android:textColor="#444444"
38 android:textSize="14sp" /> 38 android:textSize="14sp" />
39 39
40 <Button 40 <Button
41 android:id="@+id/website_settings_copy_url_button" 41 android:id="@+id/website_settings_copy_url_button"
42 android:background="?attr/selectableItemBackground"
43 android:layout_gravity="end" 42 android:layout_gravity="end"
44 android:layout_width="wrap_content" 43 android:layout_width="wrap_content"
45 android:layout_height="@dimen/website_settings_popup_button_height" 44 android:layout_height="@dimen/website_settings_popup_button_height"
46 android:layout_marginEnd="@dimen/website_settings_popup_button_margi n_sides" 45 android:layout_marginEnd="@dimen/website_settings_popup_button_margi n_sides"
47 android:layout_marginStart="@dimen/website_settings_popup_button_mar gin_sides" 46 android:layout_marginStart="@dimen/website_settings_popup_button_mar gin_sides"
48 android:layout_marginBottom="8dp" 47 android:layout_marginBottom="8dp"
49 android:layout_marginTop="24dp" 48 android:layout_marginTop="24dp"
50 android:paddingEnd="@dimen/website_settings_popup_button_padding_sid es" 49 android:paddingEnd="@dimen/website_settings_popup_button_padding_sid es"
51 android:paddingStart="@dimen/website_settings_popup_button_padding_s ides" 50 android:paddingStart="@dimen/website_settings_popup_button_padding_s ides"
52 android:text="@string/page_info_copy_url_button" 51 android:text="@string/page_info_copy_url_button"
53 android:textAllCaps="true" 52 android:textColor="@color/light_active_color"
54 android:textColor="#4184f3" 53 style="@style/ButtonBorderlessCompat" />
55 android:textSize="@dimen/website_settings_popup_button_text_size"
56 android:textStyle="bold" />
57 </LinearLayout> 54 </LinearLayout>
58 55
59 <!-- Horizontal separator --> 56 <!-- Horizontal separator -->
60 <View 57 <View
61 android:id="@+id/website_settings_horizontal_separator" 58 android:id="@+id/website_settings_horizontal_separator"
62 android:layout_width="match_parent" 59 android:layout_width="match_parent"
63 android:layout_height="1dip" 60 android:layout_height="1dip"
64 android:background="#e7e7e7" /> 61 android:background="#e7e7e7" />
65 62
66 <LinearLayout 63 <LinearLayout
(...skipping 13 matching lines...) Expand all
80 77
81 <FrameLayout 78 <FrameLayout
82 android:layout_width="match_parent" 79 android:layout_width="match_parent"
83 android:layout_height="wrap_content" 80 android:layout_height="wrap_content"
84 android:gravity="end" 81 android:gravity="end"
85 android:paddingTop="16dp" 82 android:paddingTop="16dp"
86 android:paddingBottom="16dp" > 83 android:paddingBottom="16dp" >
87 84
88 <Button 85 <Button
89 android:id="@+id/website_settings_site_settings_button" 86 android:id="@+id/website_settings_site_settings_button"
90 android:background="?attr/selectableItemBackground"
91 android:layout_width="wrap_content" 87 android:layout_width="wrap_content"
92 android:layout_height="@dimen/website_settings_popup_button_heig ht" 88 android:layout_height="@dimen/website_settings_popup_button_heig ht"
93 android:layout_marginEnd="@dimen/website_settings_popup_button_m argin_sides" 89 android:layout_marginEnd="@dimen/website_settings_popup_button_m argin_sides"
94 android:layout_marginStart="@dimen/website_settings_popup_button _margin_sides" 90 android:layout_marginStart="@dimen/website_settings_popup_button _margin_sides"
95 android:paddingEnd="@dimen/website_settings_popup_button_padding _sides" 91 android:paddingEnd="@dimen/website_settings_popup_button_padding _sides"
96 android:paddingStart="@dimen/website_settings_popup_button_paddi ng_sides" 92 android:paddingStart="@dimen/website_settings_popup_button_paddi ng_sides"
97 android:text="@string/page_info_site_settings_button" 93 android:text="@string/page_info_site_settings_button"
98 android:textAllCaps="true"
99 android:textColor="@color/website_settings_popup_button_text" 94 android:textColor="@color/website_settings_popup_button_text"
100 android:textSize="@dimen/website_settings_popup_button_text_size " 95 style="@style/ButtonBorderlessCompat" />
101 android:textStyle="bold" />
102 </FrameLayout> 96 </FrameLayout>
103 </LinearLayout> 97 </LinearLayout>
104 98
105 </LinearLayout> 99 </LinearLayout>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/sad_tab.xml ('k') | chrome/android/java/res/values-v17/styles.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698