chrome/android/java/res/layout/sync_custom_passphrase.xml - Issue 1660353002: Update account and sync management UX

Side by Side Diff: chrome/android/java/res/layout/sync_custom_passphrase.xml

Issue 1660353002: Update account and sync management UX (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Minor formatting changes 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

« no previous file with comments | « chrome/android/java/res/drawable-xxxhdpi/add_circle_blue.png ('k') | chrome/android/java/res/values-v17/styles.xml » ('j') | chrome/android/java/res/values-v17/styles.xml » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <ScrollView	6 <ScrollView

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

8 android:layout_width="match_parent"	8 android:layout_width="match_parent"

9 android:layout_height="wrap_content"	9 android:layout_height="wrap_content"

10 android:overScrollMode="ifContentScrolls">	10 android:overScrollMode="ifContentScrolls">

11 <LinearLayout	11 <LinearLayout

12 android:orientation="vertical"	12 android:orientation="vertical"

13 style="@style/AlertDialogContent">	13 style="@style/AlertDialogContent">

14 <TextView

15 android:layout_width="match_parent"

16 android:layout_height="wrap_content"

17 android:layout_marginBottom="25dp"

18 android:text="@string/sync_custom_passphrase"/>

19 <org.chromium.chrome.browser.widget.AlertDialogEditText	14 <org.chromium.chrome.browser.widget.AlertDialogEditText

20 android:id="@+id/passphrase"	15 android:id="@+id/passphrase"

21 android:hint="@string/sync_enter_custom_passphrase_hint"	16 android:hint="@string/sync_enter_custom_passphrase_hint"

22 android:layout_width="match_parent"	17 android:layout_width="match_parent"

23 android:layout_height="wrap_content"	18 android:layout_height="wrap_content"

24 android:inputType="textPassword"	19 android:inputType="textPassword"

25 android:singleLine="true"	20 android:singleLine="true"

26 android:imeOptions="actionNext" />	21 android:imeOptions="actionNext" />

27 <org.chromium.chrome.browser.widget.AlertDialogEditText	22 <org.chromium.chrome.browser.widget.AlertDialogEditText

28 android:id="@+id/confirm_passphrase"	23 android:id="@+id/confirm_passphrase"

29 android:hint="@string/sync_enter_custom_passphrase_hint_confirm"	24 android:hint="@string/sync_enter_custom_passphrase_hint_confirm"

30 android:layout_width="match_parent"	25 android:layout_width="match_parent"

31 android:layout_height="wrap_content"	26 android:layout_height="wrap_content"

32 android:inputType="textPassword"	27 android:inputType="textPassword"

33 android:singleLine="true"	28 android:singleLine="true"

34 android:imeOptions="actionDone" />	29 android:imeOptions="actionDone" />

	30 <TextView

	31 android:id="@+id/custom_passphrase_instructions"

	32 android:layout_width="match_parent"

	33 android:layout_height="wrap_content"

	34 android:layout_marginBottom="25dp"
	newt (away) 2016/02/12 22:03:49 Is this still the right margin size? Is this still the right margin size? May 2016/02/16 17:32:06 Changed to margin top instead. Show quoted text On 2016/02/12 22:03:49, newt wrote: > Is this still the right margin size? Changed to margin top instead.
	35 android:text="@string/sync_custom_passphrase"/>

35 </LinearLayout>	36 </LinearLayout>

36 </ScrollView>	37 </ScrollView>

OLD	NEW