diff options
author | Christian S <christian@pix-art.de> | 2016-05-04 21:53:29 +0200 |
---|---|---|
committer | Christian S <christian@pix-art.de> | 2016-05-04 21:53:29 +0200 |
commit | 8a04ca587ab070e482f5836773ad9942584dc26c (patch) | |
tree | 2581f228d769b431b2678d6b32a908cfaf9e8397 /src/main/res/layout/activity_edit_account.xml | |
parent | d912fa1fd5a385f5e5febc19116fefeb70b347c3 (diff) |
merge upstream changes
Diffstat (limited to 'src/main/res/layout/activity_edit_account.xml')
-rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index d333ef126..d33c72bec 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -82,7 +82,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/password" - android:inputType="text|textNoSuggestions" + android:inputType="textPassword" android:textColor="@color/black87" android:textColorHint="@color/black54" android:textSize="?attr/TextSizeBody" /> @@ -153,6 +153,27 @@ android:text="@string/register_account" android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/account_confirm_password_desc" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/account_settings_confirm_password" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:visibility="gone" /> + + <EditText + android:id="@+id/account_password_confirm" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="8dp" + android:hint="@string/confirm_password" + android:inputType="textPassword" + android:textColor="@color/black87" + android:textColorHint="@color/black54" + android:textSize="?attr/TextSizeBody" + android:visibility="gone" /> </LinearLayout> </RelativeLayout> @@ -458,7 +479,7 @@ android:textColor="@color/black87" android:textSize="?attr/TextSizeBody" android:typeface="monospace" /> - + <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" |