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

Unified 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 side-by-side diff with in-line comments

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')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/android/java/res/layout/account_signin_view.xml

diff --git a/chrome/android/java/res/layout/fre_choose_account.xml b/chrome/android/java/res/layout/account_signin_view.xml

similarity index 77%

rename from chrome/android/java/res/layout/fre_choose_account.xml

rename to chrome/android/java/res/layout/account_signin_view.xml

index b6bccdda1e505fc73155f69774b70d0a07912033..01f884e5849b30d2ec76ec3f8dce01a998c6733e 100644

--- a/chrome/android/java/res/layout/fre_choose_account.xml

+++ b/chrome/android/java/res/layout/account_signin_view.xml

@@ -4,10 +4,10 @@

Use of this source code is governed by a BSD-style license that can be

found in the LICENSE file.

-->

-<org.chromium.chrome.browser.firstrun.AccountFirstRunView

+<org.chromium.chrome.browser.signin.AccountSigninView

xmlns:android="http://schemas.android.com/apk/res/android"

xmlns:chrome="http://schemas.android.com/apk/res-auto"

- android:id="@+id/fre_account_layout"

+ android:id="@+id/account_layout"

android:layout_width="match_parent"

android:layout_height="match_parent" >

@@ -19,7 +19,7 @@

android:scrollbarStyle="outsideOverlay" >

<LinearLayout

- android:id="@+id/fre_account_linear_layout"

+ android:id="@+id/account_linear_layout"

android:layout_width="match_parent"

android:layout_height="wrap_content"

android:gravity="center"

@@ -29,31 +29,31 @@

android:id="@+id/title"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

- android:layout_marginTop="@dimen/fre_margin"

+ android:layout_marginTop="@dimen/signin_margin"

android:gravity="center"

android:lineSpacingMultiplier="1.4"

- android:text="@string/fre_set_up_chrome"

- android:textColor="@color/fre_title_color"

- android:textSize="@dimen/fre_title_text_size" />

+ android:text="@string/signin_set_up_chrome"

+ android:textColor="@color/signin_title_color"

+ android:textSize="@dimen/signin_title_text_size" />

<LinearLayout

- android:id="@+id/fre_content"

+ android:id="@+id/content"

android:layout_width="match_parent"

android:layout_height="wrap_content"

- android:layout_marginTop="@dimen/fre_margin"

+ android:layout_marginTop="@dimen/signin_margin"

android:gravity="center_horizontal"

android:orientation="vertical" >

<org.chromium.chrome.browser.firstrun.ImageCarousel

android:id="@+id/image_slider"

- android:layout_width="@dimen/fre_image_carousel_width"

- android:layout_height="@dimen/fre_image_carousel_height"

- android:layout_marginBottom="@dimen/fre_margin"/>

+ android:layout_width="@dimen/signin_image_carousel_width"

+ android:layout_height="@dimen/signin_image_carousel_height"

+ android:layout_marginBottom="@dimen/signin_margin"/>

<LinearLayout

android:layout_width="match_parent"

android:layout_height="wrap_content"

- android:layout_marginBottom="@dimen/fre_margin"

+ android:layout_marginBottom="@dimen/signin_margin"

android:orientation="vertical"

android:gravity="center_horizontal"

android:paddingEnd="24dp"

@@ -64,9 +64,9 @@

android:id="@+id/google_accounts_spinner"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

- android:layout_marginBottom="@dimen/fre_margin"

+ android:layout_marginBottom="@dimen/signin_margin"

android:padding="0dp"

- android:textColor="@color/fre_text_color" />

+ android:textColor="@color/signin_text_color" />

<FrameLayout

@@ -79,9 +79,9 @@

android:layout_height="wrap_content"

android:gravity="center_horizontal"

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:text="@string/signin_account_choice_description"

+ android:textColor="@color/signin_light_text_color"

+ android:textSize="@dimen/signin_normal_text_size"

android:visibility="visible"/>

<!-- We use an invisible TextView overlapping with the visible one to keep

@@ -95,8 +95,8 @@

android:layout_height="wrap_content"

android:gravity="center"

android:lineSpacingMultiplier="1.4"

- android:textColor="@color/fre_light_text_color"

- android:textSize="@dimen/fre_normal_text_size"

+ android:textColor="@color/signin_light_text_color"

+ android:textSize="@dimen/signin_normal_text_size"

android:visibility="invisible"/>

</FrameLayout>

@@ -112,7 +112,7 @@

android:layout_height="76dp"

android:layout_gravity="bottom"

android:orientation="horizontal"

- android:padding="@dimen/fre_button_padding" >

+ android:padding="@dimen/signin_button_padding" >

<Button

@@ -120,7 +120,7 @@

style="@style/ButtonCompatBorderless"

android:layout_width="wrap_content"

android:layout_height="wrap_content"

- android:text="@string/fre_skip_text"

+ android:text="@string/no_thanks"

android:textAllCaps="true"

android:textColor="@color/light_normal_color"

android:textSize="15sp" />

@@ -150,4 +150,4 @@

android:visibility="gone"/>

</LinearLayout>

-</org.chromium.chrome.browser.firstrun.AccountFirstRunView>

+</org.chromium.chrome.browser.signin.AccountSigninView>