aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-10-16 13:18:14 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-10-16 13:18:14 +0200
commit995003af60204e0520c55d6e3113842a02c07095 (patch)
tree0d385c12eb7c0b13ff92053b9a3b3c52ec08dcfa /OpenKeychain/src/main/res/layout
parent703e0b34e7fb0720dfb601ed3faf5fc2918107db (diff)
downloadopen-keychain-995003af60204e0520c55d6e3113842a02c07095.tar.gz
open-keychain-995003af60204e0520c55d6e3113842a02c07095.tar.bz2
open-keychain-995003af60204e0520c55d6e3113842a02c07095.zip
nfc dialog: button placeholder to retain size
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/nfc_operation_activity.xml26
1 files changed, 24 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml b/OpenKeychain/src/main/res/layout/nfc_operation_activity.xml
index 30d5013dc..d3ee363d5 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="0">
+ custom:initialView="3">
<RelativeLayout
android:layout_width="match_parent"
@@ -46,8 +46,8 @@
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_alignParentStart="true"
android:layout_below="@+id/nfc_activity_0_image"
android:layout_margin="8dp"
android:text="@string/progress_cancel" />
@@ -89,6 +89,17 @@
android:src="@drawable/yubikey_phone"
android:visibility="invisible" />
+ <Button
+ android:id="@+id/nfc_activity_1_button_placeholder"
+ android:layout_width="wrap_content"
+ android:layout_height="48dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/nfc_activity_1_placeholder"
+ android:layout_margin="8dp"
+ android:text=""
+ android:visibility="invisible" />
+
</RelativeLayout>
<RelativeLayout
@@ -128,6 +139,17 @@
android:background="@android:color/transparent"
android:src="@drawable/ic_check_circle_black_48dp" />
+ <Button
+ android:id="@+id/nfc_activity_2_button_placeholder"
+ android:layout_width="wrap_content"
+ android:layout_height="48dp"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentStart="true"
+ android:layout_below="@+id/nfc_activity_2_placeholder"
+ android:layout_margin="8dp"
+ android:text=""
+ android:visibility="invisible" />
+
</RelativeLayout>
<RelativeLayout