chrome/android/java/res/layout/data_reduction_promo_screen.xml - Issue 1235033003: Move ButtonCompat to ui/android/

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

Issue 1235033003: Move ButtonCompat to ui/android/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove buttonColor from chrome/android/. Created 5 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

« no previous file with comments | « chrome/android/java/res/layout/contextual_search_opt_out_promo.xml ('k') | chrome/android/java/res/layout/eb_promo_header.xml » ('j') | ui/android/java/res/drawable-v21/button_borderless_compat.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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 <org.chromium.chrome.browser.widget.PaddedFrameLayout	6 <org.chromium.chrome.browser.widget.PaddedFrameLayout

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:background="#c000"	9 android:background="#c000"

10 chrome:maxChildWidth="@dimen/data_reduction_promo_screen_width"	10 chrome:maxChildWidth="@dimen/data_reduction_promo_screen_width"

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87 <LinearLayout	87 <LinearLayout

88 android:layout_below="@+id/data_reduction_invitation_text"	88 android:layout_below="@+id/data_reduction_invitation_text"

89 android:layout_height="wrap_content"	89 android:layout_height="wrap_content"

90 android:layout_marginTop="24dp"	90 android:layout_marginTop="24dp"

91 android:layout_width="match_parent"	91 android:layout_width="match_parent"

92 android:clipToPadding="false"	92 android:clipToPadding="false"

93 android:orientation="vertical"	93 android:orientation="vertical"

94 android:paddingStart="40dp"	94 android:paddingStart="40dp"

95 android:paddingEnd="40dp"	95 android:paddingEnd="40dp"

96 android:paddingBottom="24dp" >	96 android:paddingBottom="24dp" >

97 <org.chromium.chrome.browser.widget.ButtonCompat	97 <org.chromium.ui.widget.ButtonCompat

98 android:id="@+id/enable_button_front"	98 android:id="@+id/enable_button_front"

99 android:layout_width="match_parent"	99 android:layout_width="match_parent"

100 android:layout_height="wrap_content"	100 android:layout_height="wrap_content"

101 android:minHeight="48dp"	101 android:minHeight="48dp"

102 android:text="@string/data_reduction_enable_button"	102 android:text="@string/data_reduction_enable_button"

103 android:textColor="#fff"	103 android:textColor="#fff"

104 chrome:buttonColor="#27b4e7" />	104 chrome:buttonColor="#27b4e7" />

105 <org.chromium.chrome.browser.widget.ButtonCompat	105 <org.chromium.ui.widget.ButtonCompat

106 android:id="@+id/no_thanks_button"	106 android:id="@+id/no_thanks_button"

107 android:layout_width="match_parent"	107 android:layout_width="match_parent"

108 android:layout_height="wrap_content"	108 android:layout_height="wrap_content"

109 android:layout_marginTop="10dp"	109 android:layout_marginTop="10dp"

110 android:minHeight="48dp"	110 android:minHeight="48dp"

111 android:text="@string/no_thanks"	111 android:text="@string/no_thanks"

112 android:textColor="#666"	112 android:textColor="#666"

113 chrome:buttonColor="@color/default_primary_color" />	113 chrome:buttonColor="@color/default_primary_color" />

114 </LinearLayout>	114 </LinearLayout>

115 </RelativeLayout>	115 </RelativeLayout>

116 </ScrollView>	116 </ScrollView>

117 </org.chromium.chrome.browser.widget.PaddedFrameLayout>	117 </org.chromium.chrome.browser.widget.PaddedFrameLayout>

OLD	NEW