diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-06 11:27:45 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-07-06 11:27:45 +0200 |
commit | baf059843ef51c57e47cd74fa695485b93482669 (patch) | |
tree | 46f94d97239385f14d6f5364663812bafb828519 /OpenKeychain/src/main/res/layout/nfc_activity.xml | |
parent | e4bd25613ccac4fd426630f8ed1c50016bbd6ec5 (diff) | |
download | open-keychain-baf059843ef51c57e47cd74fa695485b93482669.tar.gz open-keychain-baf059843ef51c57e47cd74fa695485b93482669.tar.bz2 open-keychain-baf059843ef51c57e47cd74fa695485b93482669.zip |
In NfcOperationsActivity, show NFC errors inline, in others show as Notify
Diffstat (limited to 'OpenKeychain/src/main/res/layout/nfc_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/nfc_activity.xml | 41 |
1 files changed, 40 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml index 90ee4f9ca..992f8c14d 100644 --- a/OpenKeychain/src/main/res/layout/nfc_activity.xml +++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:custom="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content"> @@ -17,7 +18,7 @@ android:paddingLeft="24dp" android:paddingRight="24dp" android:paddingTop="16dp" - custom:initialView="0"> + custom:initialView="3"> <RelativeLayout android:layout_width="match_parent" @@ -114,6 +115,44 @@ </RelativeLayout> + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/nfc_activity_text_placeholder" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="@android:style/TextAppearance.Medium" /> + + <!-- placeholder to retain dialog size --> + <ImageView + android:id="@+id/nfc_image_placeholder3" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_below="@+id/nfc_activity_text_placeholder" + android:layout_marginTop="8dp" + android:adjustViewBounds="true" + android:background="@android:color/transparent" + android:src="@drawable/yubikey_phone" + android:visibility="invisible" /> + + <TextView + android:id="@+id/nfc_activity_error_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_centerVertical="true" + android:textAppearance="@android:style/TextAppearance.Medium" + android:textColor="@color/android_red_dark" + tools:text="Error text" /> + + + </RelativeLayout> + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> </LinearLayout>
\ No newline at end of file |