diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-26 16:30:21 +0100 |
commit | 34a7728cec5c17ef25f3d5cd56421e4f5258862d (patch) | |
tree | f8fcf0aced9b106facff2e50405a19288931da6b /OpenKeychain/src/main/res/layout/nfc_activity.xml | |
parent | b73ad7d87e7ddef03c17b4983f526c0613403df6 (diff) | |
parent | e049895b9f8f5f9996ac678acf6810768e859695 (diff) | |
download | open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.gz open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.tar.bz2 open-keychain-34a7728cec5c17ef25f3d5cd56421e4f5258862d.zip |
Merge branch 'development' into detached-sigs-api
Conflicts:
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java
Diffstat (limited to 'OpenKeychain/src/main/res/layout/nfc_activity.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/nfc_activity.xml | 49 |
1 files changed, 30 insertions, 19 deletions
diff --git a/OpenKeychain/src/main/res/layout/nfc_activity.xml b/OpenKeychain/src/main/res/layout/nfc_activity.xml index 034b74a35..5baaafc69 100644 --- a/OpenKeychain/src/main/res/layout/nfc_activity.xml +++ b/OpenKeychain/src/main/res/layout/nfc_activity.xml @@ -1,24 +1,35 @@ -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:paddingTop="16dp" - android:paddingBottom="16dp"> + android:layout_height="match_parent"> - <TextView - android:text="@string/nfc_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="@android:style/TextAppearance.Large" - android:id="@+id/nfc_text" - android:gravity="center" - android:layout_gravity="center" /> + <include + android:id="@+id/toolbar" + layout="@layout/toolbar" /> - <ImageView + <LinearLayout + android:layout_below="@id/toolbar" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:src="@drawable/yubikey_phone" /> + android:layout_height="match_parent" + android:orientation="vertical" + android:paddingLeft="16dp" + android:paddingRight="16dp" + android:paddingTop="16dp" + android:paddingBottom="16dp"> -</LinearLayout> + <TextView + android:text="@string/nfc_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="@android:style/TextAppearance.Large" + android:id="@+id/nfc_text" + android:gravity="center" + android:layout_gravity="center" /> + + <ImageView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:src="@drawable/yubikey_phone" /> + + </LinearLayout> +</RelativeLayout>
\ No newline at end of file |