cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prevent nfc dialog from closing when touching outside of it, add cancel button

Browse Source
This commit is contained in:
Dominik Schürmann
2015-10-16 13:11:28 +02:00
parent de3791de3f
commit 703e0b34e7
5 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
OpenKeychain/src/main/res/layout/create_yubi_key_pin_repeat_fragment.xml → OpenKeychain/src/main/res/layout/create_yubi_key_pin_fragment.xml
View File

12
OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
View File

@@ -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