chrome/android/java/res/layout/sync_passphrase_activity.xml - Issue 1017783004: Copy PassphraseActivity upstream.

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

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

Issue 1017783004: Copy PassphraseActivity upstream. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Revert PassphraseDialogFragment change until downstream side lands. Created 5 years, 9 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:

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

diff --git a/components/cronet/android/sample/res/layout/cronet_sample_activity.xml b/chrome/android/java/res/layout/sync_passphrase_activity.xml

similarity index 77%

copy from components/cronet/android/sample/res/layout/cronet_sample_activity.xml

copy to chrome/android/java/res/layout/sync_passphrase_activity.xml

index 56e3e709c4df7b3056651d7e9aaf9568174c85f9..a93b1af3faaff3e45a9095027b0b135b737f0450 100644

--- a/components/cronet/android/sample/res/layout/cronet_sample_activity.xml

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

@@ -1,12 +1,12 @@

<?xml version="1.0" encoding="utf-8"?>

newt (away) 2015/03/18 20:34:23 This layout isn't needed.

maxbogue 2015/03/18 21:05:57 Done.

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

found in the LICENSE file.

- -->

+-->

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

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

android:layout_width="match_parent"

android:layout_height="match_parent"

android:orientation="vertical">