diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-13 23:15:13 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-13 23:15:13 +0100 |
commit | d8ff737fc5392362707ad70fbe964ac9e299457f (patch) | |
tree | 7af64313395f2d13f2e7129a573d4ef7333fadef /OpenKeychain/src/main/res/layout/nfc_activity.xml | |
parent | 862d1f1971a16d639dec47bd60226a959efe76b0 (diff) | |
download | open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.tar.gz open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.tar.bz2 open-keychain-d8ff737fc5392362707ad70fbe964ac9e299457f.zip |
Use Toolbar and new BaseActivity
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 |