aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <inputmice@siacs.eu>2015-01-03 00:11:02 +0100
committerDaniel Gultsch <inputmice@siacs.eu>2015-01-03 00:11:02 +0100
commit969044b1133fa2fd82d209953a1970a2a5b2eb97 (patch)
tree4c6b0fe8671ad354b0d01a25eee048013b5311be /src/main/res
parent1988e244ef035da5ddc309c3ad587f967518509e (diff)
migrated change password into separate activity
Diffstat (limited to '')
-rw-r--r--src/main/res/layout/activity_edit_account.xml9
-rw-r--r--src/main/res/menu/editaccount.xml4
-rw-r--r--src/main/res/values/strings.xml4
3 files changed, 8 insertions, 9 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index d2987253..36987072 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -79,15 +79,6 @@
android:textColor="@color/primarytext"
android:textSize="?attr/TextSizeBody" />
- <CheckBox
- android:id="@+id/account_change_password"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginTop="8dp"
- android:text="@string/change_password_on_server"
- android:textColor="@color/primarytext"
- android:textSize="?attr/TextSizeBody" />
-
<TextView
android:id="@+id/account_confirm_password_desc"
android:layout_width="wrap_content"
diff --git a/src/main/res/menu/editaccount.xml b/src/main/res/menu/editaccount.xml
index fc362836..4ce9e1f3 100644
--- a/src/main/res/menu/editaccount.xml
+++ b/src/main/res/menu/editaccount.xml
@@ -16,4 +16,8 @@
android:checkable="true"
android:checked="false"
android:showAsAction="never" />
+
+ <item android:id="@+id/action_change_password_on_server"
+ android:title="@string/change_password"
+ android:showAsAction="never" />
</menu> \ No newline at end of file
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 1d1f609d..ebb95278 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -399,4 +399,8 @@
<string name="shared_secret_hint_should_not_be_empty">Your hint should not be empty</string>
<string name="shared_secret_can_not_be_empty">Your shared secret can not be empty</string>
<string name="manual_verification_explanation">Carefully compare the fingerprint shown below with the fingerprint of your contact.\nYou can use any trusted form of communication like an encrypted e-mail or a telephone call to exchange those.</string>
+ <string name="change_password">Change password</string>
+ <string name="current_password">Current password</string>
+ <string name="new_password">New password</string>
+ <string name="password_should_not_be_empty">Password should not be empty</string>
</resources>