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

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

Issue 1235033003: Move ButtonCompat to ui/android/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. 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
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 <org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSea rchOptOutPromo 6 <org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSea rchOptOutPromo
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_opt_out_promo" 9 android:id="@+id/contextual_search_opt_out_promo"
10 android:layout_width="match_parent" 10 android:layout_width="match_parent"
11 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
12 android:background="@drawable/contextual_search_promo_background" 12 android:background="@drawable/contextual_search_promo_background"
13 android:orientation="vertical"> 13 android:orientation="vertical">
14 14
15 <!-- marginTop = 16dp - 9dp (margin above) --> 15 <!-- marginTop = 16dp - 9dp (margin above) -->
16 <org.chromium.ui.widget.TextViewWithClickableSpans 16 <org.chromium.ui.widget.TextViewWithClickableSpans
17 android:id="@+id/contextual_search_opt_out_text" 17 android:id="@+id/contextual_search_opt_out_text"
18 android:color="@color/contextual_search_promo_text_color" 18 android:color="@color/contextual_search_promo_text_color"
19 android:layout_alignParentTop="true" 19 android:layout_alignParentTop="true"
20 android:layout_alignParentStart="true" 20 android:layout_alignParentStart="true"
21 android:layout_alignParentEnd="true" 21 android:layout_alignParentEnd="true"
22 android:layout_width="match_parent" 22 android:layout_width="match_parent"
23 android:layout_height="wrap_content" 23 android:layout_height="wrap_content"
24 android:layout_marginTop="7dp" 24 android:layout_marginTop="7dp"
25 android:layout_marginStart="16dp" 25 android:layout_marginStart="16dp"
26 android:layout_marginEnd="16dp" 26 android:layout_marginEnd="16dp"
27 android:bufferType="spannable" 27 android:bufferType="spannable"
28 android:textSize="16sp" /> 28 android:textSize="16sp" />
29 29
30 <org.chromium.chrome.browser.widget.ButtonCompat 30 <org.chromium.ui.widget.ButtonCompat
31 android:id="@+id/contextual_search_got_it_button" 31 android:id="@+id/contextual_search_got_it_button"
32 android:layout_below="@id/contextual_search_opt_out_text" 32 android:layout_below="@id/contextual_search_opt_out_text"
33 android:layout_alignParentEnd="true" 33 android:layout_alignParentEnd="true"
34 android:layout_width="wrap_content" 34 android:layout_width="wrap_content"
35 android:layout_height="wrap_content" 35 android:layout_height="wrap_content"
36 android:layout_gravity="end" 36 android:layout_gravity="end"
37 android:layout_marginTop="16dp" 37 android:layout_marginTop="16dp"
38 android:layout_marginEnd="16dp" 38 android:layout_marginEnd="16dp"
39 android:fontFamily="sans-serif-medium" 39 android:fontFamily="sans-serif-medium"
40 android:paddingStart="8dp" 40 android:paddingStart="8dp"
(...skipping 23 matching lines...) Expand all
64 style="@style/ButtonCompatBorderless" /> 64 style="@style/ButtonCompatBorderless" />
65 65
66 <View 66 <View
67 android:layout_below="@id/contextual_search_got_it_button" 67 android:layout_below="@id/contextual_search_got_it_button"
68 android:layout_width="match_parent" 68 android:layout_width="match_parent"
69 android:layout_height="1px" 69 android:layout_height="1px"
70 android:layout_marginTop="16dp" 70 android:layout_marginTop="16dp"
71 android:background="#c2c2c2" /> 71 android:background="#c2c2c2" />
72 72
73 </org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSe archOptOutPromo> 73 </org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSe archOptOutPromo>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698