diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-11-13 16:56:35 +0100 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2016-01-06 16:24:07 +0100 |
| commit | 840d57bf3b2c91f63f0df9d8988c16eb467b4a29 (patch) | |
| tree | 7398afaf2f024d097b72e78e82ac305c8bcfab79 /OpenKeychain/src/main/res/layout | |
| parent | f8d6b0bb467cf126b3e1bf295f584b533280ebef (diff) | |
| download | open-keychain-840d57bf3b2c91f63f0df9d8988c16eb467b4a29.tar.gz open-keychain-840d57bf3b2c91f63f0df9d8988c16eb467b4a29.tar.bz2 open-keychain-840d57bf3b2c91f63f0df9d8988c16eb467b4a29.zip | |
passphraseactivity: add inline spinner to password dialog
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/passphrase_dialog.xml | 22 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/simple_item.xml | 16 |
2 files changed, 38 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml index cd6b3e87b..fe09fb405 100644 --- a/OpenKeychain/src/main/res/layout/passphrase_dialog.xml +++ b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml @@ -4,6 +4,7 @@ xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" + xmlns:tools="http://schemas.android.com/tools" android:paddingTop="16dp" android:paddingBottom="16dp" android:paddingLeft="24dp" @@ -33,6 +34,27 @@ android:ems="10" android:layout_gravity="center_horizontal" /> + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:gravity="center_vertical" + android:layout_margin="6dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Remember for " + android:textAppearance="@android:style/TextAppearance.Medium" /> + + <org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner + android:id="@+id/ttl_spinner" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + </org.sufficientlysecure.keychain.ui.widget.CacheTTLSpinner> + + </LinearLayout> + </LinearLayout> <LinearLayout diff --git a/OpenKeychain/src/main/res/layout/simple_item.xml b/OpenKeychain/src/main/res/layout/simple_item.xml new file mode 100644 index 000000000..9a7bc58e3 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/simple_item.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/simple_item_text" + android:textAppearance="@android:style/TextAppearance.Medium" + tools:text="itemtext" /> +</LinearLayout>
\ No newline at end of file |