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 xmlns:chrome="http://schemas.android.com/apk/res-auto" | |
8 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
9 android:layout_height="wrap_content" | 10 android:layout_height="wrap_content" |
10 android:overScrollMode="ifContentScrolls"> | 11 android:overScrollMode="ifContentScrolls"> |
11 <LinearLayout | 12 <LinearLayout |
12 android:orientation="vertical" | 13 android:orientation="vertical" |
13 style="@style/AlertDialogContent"> | 14 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 | 15 <org.chromium.chrome.browser.widget.AlertDialogEditText |
20 android:id="@+id/passphrase" | 16 android:id="@+id/passphrase" |
21 android:hint="@string/sync_enter_custom_passphrase_hint" | 17 android:hint="@string/sync_enter_custom_passphrase_hint" |
22 android:layout_width="match_parent" | 18 android:layout_width="match_parent" |
23 android:layout_height="wrap_content" | 19 android:layout_height="wrap_content" |
24 android:inputType="textPassword" | 20 android:inputType="textPassword" |
25 android:singleLine="true" | 21 android:singleLine="true" |
26 android:imeOptions="actionNext" /> | 22 android:imeOptions="actionNext" /> |
27 <org.chromium.chrome.browser.widget.AlertDialogEditText | 23 <org.chromium.chrome.browser.widget.AlertDialogEditText |
28 android:id="@+id/confirm_passphrase" | 24 android:id="@+id/confirm_passphrase" |
29 android:hint="@string/sync_enter_custom_passphrase_hint_confirm" | 25 android:hint="@string/sync_enter_custom_passphrase_hint_confirm" |
30 android:layout_width="match_parent" | 26 android:layout_width="match_parent" |
31 android:layout_height="wrap_content" | 27 android:layout_height="wrap_content" |
32 android:inputType="textPassword" | 28 android:inputType="textPassword" |
33 android:singleLine="true" | 29 android:singleLine="true" |
34 android:imeOptions="actionDone" /> | 30 android:imeOptions="actionDone" /> |
31 <TextView | |
32 android:id="@+id/custom_passphrase_instructions" | |
33 android:layout_width="match_parent" | |
34 android:layout_height="wrap_content" | |
35 android:layout_marginBottom="25dp" | |
newt (away)
2016/02/16 23:05:01
Still seems like a lot of extra padding/margin. Do
May
2016/02/17 13:24:31
It does visually. I don't have any vizd for actual
newt (away)
2016/02/17 19:34:41
Ok. Sometimes counting pixels in GIMP is the best
| |
36 android:layout_marginTop="25dp" | |
37 android:text="@string/sync_custom_passphrase" | |
38 chrome:helpContext="@string/help_context_clear_browsing_data" /> | |
newt (away)
2016/02/16 23:05:01
Huh? chrome:helpContext is used for the LearnMoreP
May
2016/02/17 13:24:31
Ugh, missed this before uploading. Removed.
| |
35 </LinearLayout> | 39 </LinearLayout> |
36 </ScrollView> | 40 </ScrollView> |
OLD | NEW |