aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout/view_key_fragment.xml
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-09-01 13:58:04 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-09-01 13:58:04 +0200
commit6225c940f9dbc639a90e4627f312329dd99dd2a3 (patch)
tree7344378782f3874aef0a255428cd7738a4639319 /OpenKeychain/src/main/res/layout/view_key_fragment.xml
parent47ef8cbe558a442fd7206208d941c0dcaa907f6a (diff)
downloadopen-keychain-6225c940f9dbc639a90e4627f312329dd99dd2a3.tar.gz
open-keychain-6225c940f9dbc639a90e4627f312329dd99dd2a3.tar.bz2
open-keychain-6225c940f9dbc639a90e4627f312329dd99dd2a3.zip
linked: redesign github resource creation, implement ouath flow
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_fragment.xml')
-rw-r--r--OpenKeychain/src/main/res/layout/view_key_fragment.xml62
1 files changed, 31 insertions, 31 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
index f060636a2..5bf36f564 100644
--- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml
@@ -10,37 +10,6 @@
android:paddingTop="16dp">
<android.support.v7.widget.CardView
- android:id="@+id/card_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- card_view:cardBackgroundColor="?attr/colorCardViewBackground"
- card_view:cardCornerRadius="4dp"
- card_view:cardElevation="2dp"
- card_view:cardUseCompatPadding="true">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical">
-
- <TextView
- style="@style/CardViewHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/section_user_ids" />
-
- <org.sufficientlysecure.keychain.ui.widget.FixedListView
- android:id="@+id/view_key_user_ids"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="4dp" />
-
- </LinearLayout>
-
- </android.support.v7.widget.CardView>
-
- <android.support.v7.widget.CardView
android:id="@+id/card_linked_ids"
android:transitionName="card_linked_ids"
android:layout_gravity="center"
@@ -95,6 +64,37 @@
</android.support.v7.widget.CardView>
<android.support.v7.widget.CardView
+ android:id="@+id/card_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ card_view:cardBackgroundColor="?attr/colorCardViewBackground"
+ card_view:cardCornerRadius="4dp"
+ card_view:cardElevation="2dp"
+ card_view:cardUseCompatPadding="true">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TextView
+ style="@style/CardViewHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/section_user_ids" />
+
+ <org.sufficientlysecure.keychain.ui.widget.FixedListView
+ android:id="@+id/view_key_user_ids"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="4dp" />
+
+ </LinearLayout>
+
+ </android.support.v7.widget.CardView>
+
+ <android.support.v7.widget.CardView
android:id="@+id/linked_system_contact_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"