diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2016-04-26 23:23:48 +0200 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2016-04-26 23:23:48 +0200 |
| commit | 9c3e910dc4c5605e0edad5ca876fff085f2150cb (patch) | |
| tree | 5ad81d3bbcdb190071b45290e5ceddad343f7db6 /src/main/res | |
| parent | 59652ecaf2d249d2e0046614fa0f3a3063b4b604 (diff) | |
prevent user from accidentally changing password after using magic create
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/activity_change_password.xml | 22 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 1 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index 1a4d00d81..6fb1d0131 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -2,23 +2,25 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/grey50"> + android:background="@color/grey200"> <ScrollView android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_above="@+id/button_bar"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:layout_marginBottom="@dimen/activity_vertical_margin"> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:background="@drawable/infocard_border" + android:padding="@dimen/infocard_padding" + android:orientation="vertical"> <TextView + android:id="@+id/current_password_label" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/current_password" diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 7b96240fd..b5f08d910 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -635,4 +635,5 @@ <string name="presence_away">Away</string> <string name="presence_xa">Not Available</string> <string name="presence_dnd">Busy</string> + <string name="secure_password_generated">A secure password has been generated</string> </resources> |