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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/android/java/res/layout/fre_choose_account.xml

Issue 1574273002: Unify and Improve the Sign-In and Sync Confirmation Screens on Clank. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/res/values/dimens.xml » ('j') | chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunView.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/res/layout/fre_choose_account.xml
diff --git a/chrome/android/java/res/layout/fre_choose_account.xml b/chrome/android/java/res/layout/fre_choose_account.xml
index de5e94e6cb7461777bb50c611d6e49eb88a4c7ad..d5c1fdeed21b1c58a89dc4becf263e27b6c51bce 100644
--- a/chrome/android/java/res/layout/fre_choose_account.xml
+++ b/chrome/android/java/res/layout/fre_choose_account.xml
@@ -59,6 +59,7 @@
android:paddingStart="24dp" >
<Spinner
+ style="@style/Widget.AppCompat.Spinner.Underlined"
android:id="@+id/google_accounts_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -66,15 +67,40 @@
android:padding="0dp"
android:textColor="@color/fre_text_color" />
- <TextView
- android:id="@+id/description"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:gravity="center"
- android:lineSpacingMultiplier="1.4"
- android:text="@string/fre_account_choice_description"
- android:textColor="@color/fre_light_text_color"
- android:textSize="@dimen/fre_normal_text_size" />
+
+ <RelativeLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <org.chromium.ui.widget.TextViewWithClickableSpans
+ android:id="@+id/description"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:lineSpacingMultiplier="1.4"
+ android:text="@string/fre_account_choice_description"
+ android:textColor="@color/fre_light_text_color"
+ android:textSize="@dimen/fre_normal_text_size"
+ android:visibility="visible"/>
+
+ <!-- We use an invisible TextView overlapping with the visible one to keep
+ the layout constant between text changes. This TextView will have its
+ contents programmatically set to the longest string the above TextView can
+ contain. -->
+
+ <org.chromium.ui.widget.TextViewWithClickableSpans
+ android:id="@+id/longest_description"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:lineSpacingMultiplier="1.4"
+ android:text=""
+ android:textColor="@color/fre_light_text_color"
+ android:textSize="@dimen/fre_normal_text_size"
+ android:visibility="invisible"/>
+
+ </RelativeLayout>
+
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -83,46 +109,55 @@
<View android:id="@+id/button_bar_separator"
style="@style/ButtonBarTopDivider"
android:layout_gravity="bottom"
- android:layout_marginBottom="56dp" />
+ android:layout_marginBottom="76dp" />
<LinearLayout
android:id="@+id/button_bar"
android:layout_width="match_parent"
- android:layout_height="56dp"
+ android:layout_height="76dp"
android:layout_gravity="bottom"
- android:orientation="horizontal" >
+ android:orientation="horizontal"
+ android:padding="@dimen/fre_button_padding" >
<!--suppress ButtonStyle -->
<Button
android:id="@+id/negative_button"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
android:background="?attr/listChoiceBackgroundIndicator"
- android:gravity="start|center_vertical"
- android:textDirection="locale"
android:paddingStart="@dimen/fre_button_padding"
android:paddingEnd="@dimen/fre_button_padding"
android:text="@string/fre_skip_text"
android:textAllCaps="true"
android:textColor="@color/light_normal_color"
+ android:textDirection="locale"
android:textSize="@dimen/fre_button_text_size" />
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1" />
+
<!--suppress ButtonStyle -->
<Button
android:id="@+id/positive_button"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="?attr/listChoiceBackgroundIndicator"
- android:gravity="end|center_vertical"
- android:textDirection="locale"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:background="@color/light_active_color"
android:paddingStart="@dimen/fre_button_padding"
android:paddingEnd="@dimen/fre_button_padding"
android:text="@string/choose_account_sign_in"
android:textAllCaps="true"
- android:textColor="@color/light_active_color"
+ android:textColor="@android:color/background_light"
+ android:textDirection="locale"
android:textSize="@dimen/fre_button_text_size" />
+
+ <View
+ android:id="@+id/positive_button_right_padding"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:visibility="gone"/>
</LinearLayout>
</org.chromium.chrome.browser.firstrun.AccountFirstRunView>
« no previous file with comments | « no previous file | chrome/android/java/res/values/dimens.xml » ('j') | chrome/android/java/src/org/chromium/chrome/browser/firstrun/AccountFirstRunView.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698