aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/view_key_activity.xml
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-02-25 19:38:13 +0100
committerDominik Schürmann <dominik@dominikschuermann.de>2015-02-25 19:38:13 +0100
commit57fa702cbf28368994810c33dcc9afeebf60932d (patch)
tree2ad65ffdcf84efc394a5b6d928934ed9d4ee79da /OpenKeychain/src/main/res/layout/view_key_activity.xml
parent27263edda5ffba4241e54e2f64f35eb1058663e7 (diff)
downloadopen-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.tar.gz
open-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.tar.bz2
open-keychain-57fa702cbf28368994810c33dcc9afeebf60932d.zip
Design fixes for header, QR Code shared element transitions
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_activity.xml')
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_activity.xml13
1 files changed, 5 insertions, 8 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml
index 25b978e37..bc46ac85f 100644
--- a/OpenKeychain/src/main/res/layout/view_key_activity.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_activity.xml
@@ -56,9 +56,7 @@
android:text=""
android:textColor="@color/icons"
android:textAppearance="?android:attr/textAppearanceLarge"
- android:layout_above="@+id/view_key_status"
- android:layout_toLeftOf="@+id/view_key_qr_code_layout"
- android:layout_toStartOf="@+id/view_key_qr_code_layout" />
+ android:layout_above="@+id/view_key_status" />
<TextView
android:id="@+id/view_key_status"
@@ -71,9 +69,7 @@
android:text=""
android:textColor="@color/tab_text"
android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_above="@+id/toolbar2"
- android:layout_toLeftOf="@+id/view_key_qr_code_layout"
- android:layout_toStartOf="@+id/view_key_qr_code_layout" />
+ android:layout_above="@+id/toolbar2" />
<LinearLayout
android:id="@+id/toolbar2"
@@ -135,8 +131,9 @@
<android.support.v7.widget.CardView
android:id="@+id/view_key_qr_code_layout"
- android:visibility="gone"
- android:layout_below="@id/toolbar"
+ android:transitionName="qr_code"
+ android:visibility="visible"
+ android:layout_above="@id/toolbar2"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_marginRight="20dp"