chrome/android/java/res/layout/confirm_import_sync_data.xml - Issue 1698043006: Created the dialog offering the user to merge their account data or keep it

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/android/java/res/layout/confirm_import_sync_data.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

« chrome/android/java/AndroidManifest.xml ('K') | « chrome/android/java/res/layout/account_signin_view.xml ('k') | chrome/android/java/res/layout/fre_choose_account.xml » ('j') | chrome/android/java/res/layout/radio_button_with_description.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <?xml version="1.0" encoding="utf-8"?>

	2 <!-- Copyright 2016 The Chromium Authors. All rights reserved.

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

	4 found in the LICENSE file. -->

	5

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

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

	8 android:layout_width="match_parent"

	9 android:layout_height="wrap_content"

	10 android:overScrollMode="ifContentScrolls"

	11 android:paddingEnd="25dp"

	12 android:paddingStart="25dp">

	13

	14 <LinearLayout

	15 android:layout_width="match_parent"

	16 android:layout_height="wrap_content"

	17 android:orientation="vertical"

	18 android:paddingTop="8dp">

	19

	20 <TextView

	21 android:id="@+id/sync_import_data_prompt"

	22 android:layout_width="wrap_content"

	23 android:layout_height="wrap_content"

	24 android:fontFamily="sans-serif"
	newt (away) 2016/02/25 06:25:52 not needed not needed PEConn 2016/02/25 14:19:51 Done. Show quoted text On 2016/02/25 06:25:52, newt wrote: > not needed Done.
	25 android:layout_gravity="center_horizontal"
	newt (away) 2016/02/25 06:25:52 not needed? not needed? PEConn 2016/02/25 14:19:51 Done. Show quoted text On 2016/02/25 06:25:52, newt wrote: > not needed? Done.
	26 android:textColor="#de000000"

	27 android:textSize="16sp" />

	28

	29 <org.chromium.chrome.browser.widget.RadioButtonWithDescription

	30 android:id="@+id/sync_confirm_import_choice"

	31 android:layout_width="match_parent"

	32 android:layout_height="wrap_content"

	33 android:layout_gravity="center_horizontal"

	34 android:paddingTop="16dp"

	35 app:titleText="@string/sync_import_existing_data" />

	36

	37 <org.chromium.chrome.browser.widget.RadioButtonWithDescription

	38 android:id="@+id/sync_keep_separate_choice"

	39 android:layout_width="match_parent"

	40 android:layout_height="wrap_content"

	41 android:layout_gravity="center_horizontal"

	42 android:paddingTop="16dp"

	43 app:titleText="@string/sync_keep_existing_data_separate" />

	44

	45 </LinearLayout>

	46 </ScrollView>

OLD	NEW