diff options
| author | Christian S <christian@pix-art.de> | 2016-04-21 21:06:32 +0200 |
|---|---|---|
| committer | Christian S <christian@pix-art.de> | 2016-04-21 21:06:32 +0200 |
| commit | e5fef315b4421c57743f1243c956d52d684cdc82 (patch) | |
| tree | 579520291ebb6e0df780470af5d107a33d7a4287 /src/main/res | |
| parent | f7c700880a537064ab88001431b6040909920b44 (diff) | |
modified welcome screen
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 23 | ||||
| -rw-r--r-- | src/main/res/layout/welcome.xml | 4 |
2 files changed, 3 insertions, 24 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index bc2a0624a..62cc947dc 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="textPassword" + android:inputType="text" android:textColor="@color/black87" android:textColorHint="@color/black54" android:textSize="?attr/TextSizeBody" /> @@ -153,27 +153,6 @@ 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> diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml index 52ebefdd2..3af3f6e63 100644 --- a/src/main/res/layout/welcome.xml +++ b/src/main/res/layout/welcome.xml @@ -43,12 +43,12 @@ android:background="@color/grey50"> android:text="@string/create_account" android:textColor="@color/accent"/> <Button - android:id="@+id/use_own_provider" + android:id="@+id/use_existing_account" style="?android:attr/borderlessButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right" - android:text="@string/use_own_provider" + android:text="@string/use_existing_accout" android:textColor="@color/black54"/> </LinearLayout> <RelativeLayout |