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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1698043006: Created the dialog offering the user to merge their account data or keep it (Closed) Base URL: maybelle.lon.corp.google.com:/usr/local/google/code/clankium/src@sync_settings
Patch Set: Created 4 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
« no previous file with comments | « chrome/android/java/AndroidManifest.xml ('k') | chrome/android/java/res/layout/confirm_import_sync_data.xml » ('j') | ui/android/java/src/org/chromium/ui/widget/RadioButtonWithDescription.java » ('J')
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 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.AccountFirstRunView 7 <org.chromium.chrome.browser.signin.AccountSigninView
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:id="@+id/fre_account_layout" 10 android:id="@+id/account_layout"
11 android:layout_width="match_parent" 11 android:layout_width="match_parent"
12 android:layout_height="match_parent" > 12 android:layout_height="match_parent" >
13 13
14 <ScrollView 14 <ScrollView
15 android:layout_width="match_parent" 15 android:layout_width="match_parent"
16 android:layout_height="match_parent" 16 android:layout_height="match_parent"
17 android:layout_marginBottom="76dp" 17 android:layout_marginBottom="76dp"
18 android:fillViewport="true" 18 android:fillViewport="true"
19 android:scrollbarStyle="outsideOverlay" > 19 android:scrollbarStyle="outsideOverlay" >
20 20
21 <LinearLayout 21 <LinearLayout
22 android:id="@+id/fre_account_linear_layout" 22 android:id="@+id/account_linear_layout"
23 android:layout_width="match_parent" 23 android:layout_width="match_parent"
24 android:layout_height="wrap_content" 24 android:layout_height="wrap_content"
25 android:gravity="center" 25 android:gravity="center"
26 android:orientation="vertical" > 26 android:orientation="vertical" >
27 27
28 <TextView 28 <TextView
29 android:id="@+id/title" 29 android:id="@+id/title"
30 android:layout_width="wrap_content" 30 android:layout_width="wrap_content"
31 android:layout_height="wrap_content" 31 android:layout_height="wrap_content"
32 android:layout_marginTop="@dimen/fre_margin" 32 android:layout_marginTop="@dimen/signin_margin"
33 android:gravity="center" 33 android:gravity="center"
34 android:lineSpacingMultiplier="1.4" 34 android:lineSpacingMultiplier="1.4"
35 android:text="@string/fre_set_up_chrome" 35 android:text="@string/signin_set_up_chrome"
36 android:textColor="@color/fre_title_color" 36 android:textColor="@color/signin_title_color"
37 android:textSize="@dimen/fre_title_text_size" /> 37 android:textSize="@dimen/signin_title_text_size" />
38 38
39 <LinearLayout 39 <LinearLayout
40 android:id="@+id/fre_content" 40 android:id="@+id/content"
41 android:layout_width="match_parent" 41 android:layout_width="match_parent"
42 android:layout_height="wrap_content" 42 android:layout_height="wrap_content"
43 android:layout_marginTop="@dimen/fre_margin" 43 android:layout_marginTop="@dimen/signin_margin"
44 android:gravity="center_horizontal" 44 android:gravity="center_horizontal"
45 android:orientation="vertical" > 45 android:orientation="vertical" >
46 46
47 <org.chromium.chrome.browser.firstrun.ImageCarousel 47 <org.chromium.chrome.browser.firstrun.ImageCarousel
48 android:id="@+id/image_slider" 48 android:id="@+id/image_slider"
49 android:layout_width="@dimen/fre_image_carousel_width" 49 android:layout_width="@dimen/signin_image_carousel_width"
50 android:layout_height="@dimen/fre_image_carousel_height" 50 android:layout_height="@dimen/signin_image_carousel_height"
51 android:layout_marginBottom="@dimen/fre_margin"/> 51 android:layout_marginBottom="@dimen/signin_margin"/>
52 52
53 <LinearLayout 53 <LinearLayout
54 android:layout_width="match_parent" 54 android:layout_width="match_parent"
55 android:layout_height="wrap_content" 55 android:layout_height="wrap_content"
56 android:layout_marginBottom="@dimen/fre_margin" 56 android:layout_marginBottom="@dimen/signin_margin"
57 android:orientation="vertical" 57 android:orientation="vertical"
58 android:gravity="center_horizontal" 58 android:gravity="center_horizontal"
59 android:paddingEnd="24dp" 59 android:paddingEnd="24dp"
60 android:paddingStart="24dp" > 60 android:paddingStart="24dp" >
61 61
62 <Spinner 62 <Spinner
63 style="@style/Widget.AppCompat.Spinner.Underlined" 63 style="@style/Widget.AppCompat.Spinner.Underlined"
64 android:id="@+id/google_accounts_spinner" 64 android:id="@+id/google_accounts_spinner"
65 android:layout_width="wrap_content" 65 android:layout_width="wrap_content"
66 android:layout_height="wrap_content" 66 android:layout_height="wrap_content"
67 android:layout_marginBottom="@dimen/fre_margin" 67 android:layout_marginBottom="@dimen/signin_margin"
68 android:padding="0dp" 68 android:padding="0dp"
69 android:textColor="@color/fre_text_color" /> 69 android:textColor="@color/signin_text_color" />
70 70
71 71
72 <FrameLayout 72 <FrameLayout
73 android:layout_width="wrap_content" 73 android:layout_width="wrap_content"
74 android:layout_height="wrap_content"> 74 android:layout_height="wrap_content">
75 75
76 <org.chromium.ui.widget.TextViewWithClickableSpans 76 <org.chromium.ui.widget.TextViewWithClickableSpans
77 android:id="@+id/description" 77 android:id="@+id/description"
78 android:layout_width="match_parent" 78 android:layout_width="match_parent"
79 android:layout_height="wrap_content" 79 android:layout_height="wrap_content"
80 android:gravity="center_horizontal" 80 android:gravity="center_horizontal"
81 android:lineSpacingMultiplier="1.4" 81 android:lineSpacingMultiplier="1.4"
82 android:text="@string/fre_account_choice_description " 82 android:text="@string/signin_account_choice_descript ion"
83 android:textColor="@color/fre_light_text_color" 83 android:textColor="@color/signin_light_text_color"
84 android:textSize="@dimen/fre_normal_text_size" 84 android:textSize="@dimen/signin_normal_text_size"
85 android:visibility="visible"/> 85 android:visibility="visible"/>
86 86
87 <!-- We use an invisible TextView overlapping with the v isible one to keep 87 <!-- We use an invisible TextView overlapping with the v isible one to keep
88 the layout constant between text changes. This TextView will have its 88 the layout constant between text changes. This TextView will have its
89 contents programmatically set to the longest string the above TextView can 89 contents programmatically set to the longest string the above TextView can
90 contain. --> 90 contain. -->
91 91
92 <org.chromium.ui.widget.TextViewWithClickableSpans 92 <org.chromium.ui.widget.TextViewWithClickableSpans
93 android:id="@+id/longest_description" 93 android:id="@+id/longest_description"
94 android:layout_width="match_parent" 94 android:layout_width="match_parent"
95 android:layout_height="wrap_content" 95 android:layout_height="wrap_content"
96 android:gravity="center" 96 android:gravity="center"
97 android:lineSpacingMultiplier="1.4" 97 android:lineSpacingMultiplier="1.4"
98 android:textColor="@color/fre_light_text_color" 98 android:textColor="@color/signin_light_text_color"
99 android:textSize="@dimen/fre_normal_text_size" 99 android:textSize="@dimen/signin_normal_text_size"
100 android:visibility="invisible"/> 100 android:visibility="invisible"/>
101 101
102 </FrameLayout> 102 </FrameLayout>
103 103
104 </LinearLayout> 104 </LinearLayout>
105 </LinearLayout> 105 </LinearLayout>
106 </LinearLayout> 106 </LinearLayout>
107 </ScrollView> 107 </ScrollView>
108 108
109 <LinearLayout 109 <LinearLayout
110 android:id="@+id/button_bar" 110 android:id="@+id/button_bar"
111 android:layout_width="match_parent" 111 android:layout_width="match_parent"
112 android:layout_height="76dp" 112 android:layout_height="76dp"
113 android:layout_gravity="bottom" 113 android:layout_gravity="bottom"
114 android:orientation="horizontal" 114 android:orientation="horizontal"
115 android:padding="@dimen/fre_button_padding" > 115 android:padding="@dimen/signin_button_padding" >
116 116
117 <!--suppress ButtonStyle --> 117 <!--suppress ButtonStyle -->
118 <Button 118 <Button
119 android:id="@+id/negative_button" 119 android:id="@+id/negative_button"
120 style="@style/ButtonCompatBorderless" 120 style="@style/ButtonCompatBorderless"
121 android:layout_width="wrap_content" 121 android:layout_width="wrap_content"
122 android:layout_height="wrap_content" 122 android:layout_height="wrap_content"
123 android:text="@string/fre_skip_text" 123 android:text="@string/no_thanks"
124 android:textAllCaps="true" 124 android:textAllCaps="true"
125 android:textColor="@color/light_normal_color" 125 android:textColor="@color/light_normal_color"
126 android:textSize="15sp" /> 126 android:textSize="15sp" />
127 127
128 <View 128 <View
129 android:layout_width="0dp" 129 android:layout_width="0dp"
130 android:layout_height="0dp" 130 android:layout_height="0dp"
131 android:layout_weight="1" 131 android:layout_weight="1"
132 android:visibility="invisible"/> 132 android:visibility="invisible"/>
133 133
134 <!--suppress ButtonStyle --> 134 <!--suppress ButtonStyle -->
135 <org.chromium.ui.widget.ButtonCompat 135 <org.chromium.ui.widget.ButtonCompat
136 android:id="@+id/positive_button" 136 android:id="@+id/positive_button"
137 android:layout_width="wrap_content" 137 android:layout_width="wrap_content"
138 android:layout_height="wrap_content" 138 android:layout_height="wrap_content"
139 android:text="@string/choose_account_sign_in" 139 android:text="@string/choose_account_sign_in"
140 android:textAllCaps="true" 140 android:textAllCaps="true"
141 android:textColor="@android:color/white" 141 android:textColor="@android:color/white"
142 android:textSize="15sp" 142 android:textSize="15sp"
143 chrome:buttonColor="@color/light_active_color" /> 143 chrome:buttonColor="@color/light_active_color" />
144 144
145 <View 145 <View
146 android:id="@+id/positive_button_end_padding" 146 android:id="@+id/positive_button_end_padding"
147 android:layout_width="0dp" 147 android:layout_width="0dp"
148 android:layout_height="0dp" 148 android:layout_height="0dp"
149 android:layout_weight="1" 149 android:layout_weight="1"
150 android:visibility="gone"/> 150 android:visibility="gone"/>
151 </LinearLayout> 151 </LinearLayout>
152 152
153 </org.chromium.chrome.browser.firstrun.AccountFirstRunView> 153 </org.chromium.chrome.browser.signin.AccountSigninView>
OLDNEW
« no previous file with comments | « chrome/android/java/AndroidManifest.xml ('k') | chrome/android/java/res/layout/confirm_import_sync_data.xml » ('j') | ui/android/java/src/org/chromium/ui/widget/RadioButtonWithDescription.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698