aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/res/layout
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-03-26 17:52:18 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-03-26 17:52:18 +0100
commitab5a7d409450d6e7451ec8ea62ca091df83e2933 (patch)
tree8d2bd7e8f57fec05f068d8cc49f0c9c9c12845fe /OpenKeychain/src/main/res/layout
parentdc8b04a79333d13f3e9903757502521348ccec57 (diff)
downloadopen-keychain-ab5a7d409450d6e7451ec8ea62ca091df83e2933.tar.gz
open-keychain-ab5a7d409450d6e7451ec8ea62ca091df83e2933.tar.bz2
open-keychain-ab5a7d409450d6e7451ec8ea62ca091df83e2933.zip
more (subtle) ui work
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
-rw-r--r--OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml41
1 files changed, 19 insertions, 22 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
index e25dfca70..c4f9279a2 100644
--- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
+++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml
@@ -60,17 +60,18 @@
android:layout_marginBottom="4dp"
android:inAnimation="@anim/fade_in_quick"
android:outAnimation="@anim/fade_out_quick"
+ android:measureAllChildren="false"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textAppearance="?android:attr/textAppearanceMedium" />
+ android:textAppearance="?android:attr/textAppearanceSmall" />
</TextSwitcher>
@@ -110,32 +111,28 @@
</ViewAnimator>
- <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
- android:layout_marginLeft="14dp"
- android:layout_marginRight="14dp"
+ <FrameLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
- android:id="@+id/cert_key_spinner"
- android:visibility="gone">
- </org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner>
+ android:id="@+id/cert_key_spincontainer"
+ android:visibility="gone"
+ >
+
+ <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner
+ android:layout_marginLeft="14dp"
+ android:layout_marginRight="14dp"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:id="@+id/cert_key_spinner">
+ </org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner>
+
+ </FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="horizontal">
-
- <ImageView
- android:id="@+id/back_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:src="@drawable/ic_chevron_left_grey_24dp"
- android:visibility="gone"
- style="?android:attr/borderlessButtonStyle" />
-
- <Space
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1" />
+ android:orientation="horizontal"
+ android:gravity="right|end">
<Button
android:id="@+id/button_view"