diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-16 13:11:28 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-10-16 13:11:28 +0200 |
| commit | 703e0b34e7fb0720dfb601ed3faf5fc2918107db (patch) | |
| tree | f7a661b05ad351f44d5182f876985ae855b5e991 /OpenKeychain/src/main/res/layout | |
| parent | de3791de3f73523926f6f5293992504c8cca5d57 (diff) | |
| download | open-keychain-703e0b34e7fb0720dfb601ed3faf5fc2918107db.tar.gz open-keychain-703e0b34e7fb0720dfb601ed3faf5fc2918107db.tar.bz2 open-keychain-703e0b34e7fb0720dfb601ed3faf5fc2918107db.zip | |
Prevent nfc dialog from closing when touching outside of it, add cancel button
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
| -rw-r--r-- | OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml (renamed from OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml) | 0 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/layout/nfc_operation_activity.xml | 12 |
2 files changed, 11 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml index c3b73d91f..c3b73d91f 100644 --- a/OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml index 9a9738825..30d5013dc 100644 --- a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml +++ b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml @@ -14,7 +14,7 @@ android:measureAllChildren="false" android:minHeight="?listPreferredItemHeightSmall" android:outAnimation="@anim/fade_out" - custom:initialView="3"> + custom:initialView="0"> <RelativeLayout android:layout_width="match_parent" @@ -41,6 +41,16 @@ android:adjustViewBounds="true" android:background="@android:color/transparent" android:src="@drawable/yubikey_phone" /> + + <Button + android:id="@+id/nfc_activity_0_cancel" + android:layout_width="wrap_content" + android:layout_height="48dp" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_below="@+id/nfc_activity_0_image" + android:layout_margin="8dp" + android:text="@string/progress_cancel" /> </RelativeLayout> <RelativeLayout |