diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-09 21:04:03 +0100 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-03-09 21:27:32 +0100 |
commit | ebf359634139ff2125233a78a976388082abf00c (patch) | |
tree | f32f235b3563b1eece4da8c399b75b65cb3f43e9 /OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml | |
parent | 159b197930457fc58b251d6a18d2db44a6e30d24 (diff) | |
download | open-keychain-ebf359634139ff2125233a78a976388082abf00c.tar.gz open-keychain-ebf359634139ff2125233a78a976388082abf00c.tar.bz2 open-keychain-ebf359634139ff2125233a78a976388082abf00c.zip |
rearrange linked id layouts, add CertListWidget
Diffstat (limited to 'OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml | 69 |
1 files changed, 58 insertions, 11 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 b453167ea..4244de962 100644 --- a/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_id_view_fragment.xml @@ -32,21 +32,68 @@ <include layout="@layout/linked_id_item" /> - <LinearLayout + <ViewAnimator android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical" - android:animateLayoutChanges="true" - android:id="@+id/linked_id_certs"> + android:id="@+id/linked_verify_container" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out"> + + <include layout="@layout/cert_list_widget" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" + android:singleLine="true"> + + <LinearLayout + android:orientation="vertical" + android:layout_gravity="center_vertical" + android:layout_width="0dip" + android:layout_marginLeft="16dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" + android:layout_height="wrap_content" + android:layout_weight="1"> + + <TextView + android:id="@+id/linked_cert_text" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Verifying…" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + </LinearLayout> + + <ViewAnimator + android:layout_width="22dp" + android:layout_height="22dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_gravity="center" + android:id="@+id/linked_cert_progress" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out"> + + <ProgressBar + android:layout_width="22dp" + android:layout_height="22dp" + android:indeterminate="true" + /> + + <ImageView + android:layout_width="22dp" + android:layout_height="wrap_content" + android:src="@drawable/status_signature_unknown_cutout_24dp" + android:id="@+id/linked_cert_icon" + /> + </ViewAnimator> + </LinearLayout> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:animateLayoutChanges="true" - android:id="@+id/linked_id_verify"> - </LinearLayout> + </ViewAnimator> <org.sufficientlysecure.keychain.ui.widget.CertifyKeySpinner android:layout_marginLeft="14dp" |