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

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

Issue 1745563002: Revert of 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
Index: chrome/android/java/res/layout/confirm_import_sync_data.xml
diff --git a/chrome/android/java/res/layout/confirm_import_sync_data.xml b/chrome/android/java/res/layout/confirm_import_sync_data.xml
deleted file mode 100644
index 5e6d1e9a843807dd249ce80845d0816c727f3004..0000000000000000000000000000000000000000
--- a/chrome/android/java/res/layout/confirm_import_sync_data.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright 2016 The Chromium Authors. All rights reserved.
- Use of this source code is governed by a BSD-style license that can be
- found in the LICENSE file. -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:app="http://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:overScrollMode="ifContentScrolls"
- android:paddingEnd="25dp"
- android:paddingStart="25dp">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:paddingTop="8dp">
-
- <TextView
- android:id="@+id/sync_import_data_prompt"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#de000000"
- android:textSize="16sp" />
-
- <org.chromium.chrome.browser.widget.RadioButtonWithDescription
- android:id="@+id/sync_confirm_import_choice"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="16dp"
- app:titleText="@string/sync_import_existing_data" />
-
- <org.chromium.chrome.browser.widget.RadioButtonWithDescription
- android:id="@+id/sync_keep_separate_choice"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingTop="16dp"
- app:titleText="@string/sync_keep_existing_data_separate" />
-
- </LinearLayout>
-</ScrollView>

Powered by Google App Engine
This is Rietveld 408576698