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

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

Issue 1061063005: [Contextual Search] Fix Promo behavior. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync & rebase Created 5 years, 8 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 | « no previous file | chrome/android/java/res/values/colors.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <Button 30 <org.chromium.chrome.browser.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_marginEnd="16dp" 38 android:layout_marginEnd="16dp"
38 android:background="?attr/selectableItemBackground"
39 android:fontFamily="sans-serif-medium" 39 android:fontFamily="sans-serif-medium"
40 android:paddingStart="8dp" 40 android:paddingStart="8dp"
41 android:paddingEnd="8dp" 41 android:paddingEnd="8dp"
42 android:text="@string/contextual_search_got_it_button" 42 android:text="@string/contextual_search_got_it_button"
43 android:textAllCaps="true" 43 android:textAllCaps="true"
44 android:textColor="@color/light_active_color" 44 android:textColor="#FFF"
45 android:textSize="14sp" /> 45 android:textSize="14sp"
46 chrome:buttonColor="#4285F4" />
46 47
47 <Button 48 <Button
48 android:id="@+id/contextual_search_no_thanks_button" 49 android:id="@+id/contextual_search_no_thanks_button"
49 android:layout_below="@id/contextual_search_opt_out_text" 50 android:layout_below="@id/contextual_search_opt_out_text"
50 android:layout_toStartOf="@id/contextual_search_got_it_button" 51 android:layout_toStartOf="@id/contextual_search_got_it_button"
51 android:layout_width="wrap_content" 52 android:layout_width="wrap_content"
52 android:layout_height="wrap_content" 53 android:layout_height="wrap_content"
53 android:layout_gravity="end" 54 android:layout_gravity="end"
55 android:layout_marginTop="16dp"
54 android:layout_marginEnd="16dp" 56 android:layout_marginEnd="16dp"
55 android:background="?attr/selectableItemBackground"
56 android:fontFamily="sans-serif-medium" 57 android:fontFamily="sans-serif-medium"
57 android:paddingStart="8dp" 58 android:paddingStart="8dp"
58 android:paddingEnd="8dp" 59 android:paddingEnd="8dp"
59 android:text="@string/contextual_search_no_thanks_button" 60 android:text="@string/contextual_search_no_thanks_button"
60 android:textAllCaps="true" 61 android:textAllCaps="true"
61 android:textColor="@color/light_active_color" 62 android:textColor="@color/light_active_color"
62 android:textSize="14sp" /> 63 android:textSize="14sp"
64 style="@style/ButtonCompatBorderless" />
63 65
64 <View 66 <View
65 android:layout_below="@id/contextual_search_got_it_button" 67 android:layout_below="@id/contextual_search_got_it_button"
66 android:layout_width="match_parent" 68 android:layout_width="match_parent"
67 android:layout_height="1px" 69 android:layout_height="1px"
70 android:layout_marginTop="16dp"
68 android:background="#c2c2c2" /> 71 android:background="#c2c2c2" />
69 72
70 </org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSe archOptOutPromo> 73 </org.chromium.chrome.browser.compositor.bottombar.contextualsearch.ContextualSe archOptOutPromo>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/values/colors.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698