diff options
| author | Matthew Wong <wongma@protonmail.ch> | 2015-07-18 15:57:19 -0400 |
|---|---|---|
| committer | Matthew Wong <wongma@protonmail.ch> | 2015-07-18 15:57:19 -0400 |
| commit | 01b7b2102dd40ed2bdbad3eefd91a4ed03d10a73 (patch) | |
| tree | 1aadf7abc4e5d4e19a254a265edcfdd2e9f4c9a4 /app/src/main/res | |
| parent | 8c6142bca6ca825ac937b0faebe38f5b626c283e (diff) | |
| parent | 608f61b6051d8bd03fd75628c225cccb9c0bedde (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
app/src/main/java/com/zeapo/pwdstore/pwgenDialogFragment.java
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/encrypt_layout.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 1 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/src/main/res/layout/encrypt_layout.xml b/app/src/main/res/layout/encrypt_layout.xml index dcb6bf88..84fe99c3 100644 --- a/app/src/main/res/layout/encrypt_layout.xml +++ b/app/src/main/res/layout/encrypt_layout.xml @@ -66,12 +66,11 @@ android:layout_height="wrap_content" android:typeface="monospace" android:layout_weight="1"/> - <ImageButton + <Button android:layout_height="wrap_content" android:layout_width="wrap_content" - android:src="@drawable/ic_action_new" - android:background="@drawable/blue_rectangle" android:id="@+id/generate_password" + android:text="@string/pwd_generate_button" android:onClick="handleClick"/> </LinearLayout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f77b732d..f60e4b15 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -149,5 +149,6 @@ <string name="show_password_pref_title">Show the password</string> <string name="show_password_pref_summary">Control the visibility of the passwords once decrypted, this does not disable the password copy</string> <string name="toast_password_copied">Password copied into the clipboard</string> + <string name="pwd_generate_button">Generate</string> </resources> |