diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-07 17:01:07 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-07 17:01:07 +0200 |
| commit | 3ba2e0b0c16dc1d03c47b3fe6ebd3251219b2d82 (patch) | |
| tree | 48f1e288fb41b038502d4ca1efe502c883f86627 /OpenKeychain/src/main/res | |
| parent | d1e08f9305a451feab0bc7ac93e165952435a599 (diff) | |
| parent | 31cc004fe144b654533f04ed5291ea77c80d5f1c (diff) | |
| download | open-keychain-3ba2e0b0c16dc1d03c47b3fe6ebd3251219b2d82.tar.gz open-keychain-3ba2e0b0c16dc1d03c47b3fe6ebd3251219b2d82.tar.bz2 open-keychain-3ba2e0b0c16dc1d03c47b3fe6ebd3251219b2d82.zip | |
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain/src/main/res')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 69 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 1 |
2 files changed, 52 insertions, 18 deletions
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml index 4b331f0f2..ebc5615e4 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml @@ -1,24 +1,57 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="16dp" - android:paddingRight="16dp" > + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="vertical"> - <TextView - android:id="@+id/passphrase_label_passphrase" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:padding="4dp" - android:text="@string/label_passphrase" /> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="horizontal" + android:id="@+id/input"> - <EditText - android:id="@+id/passphrase_passphrase" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:imeOptions="actionDone" - android:inputType="textPassword" - android:padding="4dp" /> + <TextView + android:id="@+id/passphrase_label_passphrase" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:padding="4dp" + android:text="@string/label_passphrase" /> + + <EditText + android:id="@+id/passphrase_passphrase" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:padding="4dp" /> + </LinearLayout> + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:orientation="horizontal" + android:id="@+id/progress" + android:visibility="gone"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="4dp" + android:text="@string/label_unlock" + /> + + <ProgressBar + style="?android:attr/progressBarStyleSmall" + android:layout_width="match_parent" + android:layout_height="match_parent" + /> + </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 5a2b281e4..b329f697b 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -87,6 +87,7 @@ <string name="label_file_colon">File:</string> <string name="label_no_passphrase">No Passphrase</string> <string name="label_passphrase">Passphrase</string> + <string name="label_unlock">Unlocking…</string> <string name="label_passphrase_again">Repeat Passphrase</string> <string name="label_algorithm">Algorithm</string> <string name="label_ascii_armor">File ASCII Armor</string> |