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

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

Issue 2232893002: Display text prompting user to set screen lock in order to view password in PasswordEntryEditor Base URL: https://chromium.googlesource.com/chromium/src.git@reauthentication
Patch Set: Revert display condition Created 4 years, 4 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 | « no previous file | chrome/android/java/res/values-v21/styles.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. 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 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 xmlns:android="http://schemas.android.com/apk/res/android" 6 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
7 android:layout_width="match_parent" 7 android:layout_width="match_parent"
8 android:layout_height="match_parent" 8 android:layout_height="match_parent"
9 android:fillViewport="true" > 9 android:fillViewport="true" >
10 10
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 android:layout_height="wrap_content" 96 android:layout_height="wrap_content"
97 android:layout_gravity="end" 97 android:layout_gravity="end"
98 android:layout_marginTop="10dp" 98 android:layout_marginTop="10dp"
99 android:layout_marginEnd="15dp" 99 android:layout_marginEnd="15dp"
100 android:src="@drawable/ic_content_copy" /> 100 android:src="@drawable/ic_content_copy" />
101 101
102 </LinearLayout> 102 </LinearLayout>
103 103
104 <TextView 104 <TextView
105 android:text="@string/password_entry_editor_password" 105 android:text="@string/password_entry_editor_password"
106 android:textColor="@color/google_blue_700" 106 style="@style/PasswordEntryEditorTextView"
107 android:layout_width="wrap_content"
108 android:layout_height="wrap_content"
109 android:layout_marginTop="5dp" 107 android:layout_marginTop="5dp"
110 android:layout_marginStart="15dp" 108 android:layout_marginStart="15dp"
111 android:gravity="center_vertical" 109 android:gravity="center_vertical" />
112 android:textAppearance="?android:attr/textAppearanceMedium" /> 110
111 <TextView
112 android:id="@+id/password_entry_editor_set_device_lock"
113 android:text="@string/password_entry_editor_set_device_lock_prompt"
114 style="@style/PasswordEntryEditorTextView"
115 android:layout_marginTop="10dp"
116 android:layout_marginStart="15dp"
117 android:visibility="gone" />
113 118
114 <LinearLayout 119 <LinearLayout
120 android:id="@+id/password_entry_editor_display_password"
115 android:layout_width="wrap_content" 121 android:layout_width="wrap_content"
116 android:layout_height="wrap_content" 122 android:layout_height="wrap_content"
117 android:orientation="horizontal"> 123 android:orientation="horizontal">
118 124
119 <TextView 125 <TextView
120 android:id="@+id/password_entry_editor_password" 126 android:id="@+id/password_entry_editor_password"
121 android:textColor="@color/default_text_color" 127 android:textColor="@color/default_text_color"
122 android:layout_width="fill_parent" 128 android:layout_width="match_parent"
123 android:layout_height="wrap_content" 129 android:layout_height="match_parent"
124 android:layout_marginTop="10dp" 130 android:layout_marginTop="10dp"
125 android:layout_marginStart="15dp" 131 android:layout_marginStart="15dp"
126 android:inputType="textPassword" 132 android:inputType="textPassword"
127 android:textAppearance="?android:attr/textAppearanceMedium" /> 133 android:textAppearance="?android:attr/textAppearanceMedium" />
128 134
129 <View 135 <View
130 android:layout_width="0dp" 136 android:layout_width="0dp"
131 android:layout_height="0dp" 137 android:layout_height="0dp"
132 android:layout_weight="1" /> 138 android:layout_weight="1" />
133 139
(...skipping 19 matching lines...) Expand all
153 android:layout_marginTop="10dp" 159 android:layout_marginTop="10dp"
154 android:layout_marginEnd="15dp" 160 android:layout_marginEnd="15dp"
155 android:src="@drawable/ic_content_copy" 161 android:src="@drawable/ic_content_copy"
156 android:contentDescription="@string/password_entry_editor_copy_s tored_password" /> 162 android:contentDescription="@string/password_entry_editor_copy_s tored_password" />
157 163
158 </LinearLayout> 164 </LinearLayout>
159 165
160 </LinearLayout> 166 </LinearLayout>
161 167
162 </ScrollView> 168 </ScrollView>
OLDNEW
« no previous file with comments | « no previous file | chrome/android/java/res/values-v21/styles.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698