diff options
author | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-03-10 01:05:40 +0530 |
---|---|---|
committer | Adithya Abraham Philip <adithyaphilip@gmail.com> | 2015-03-10 01:08:09 +0530 |
commit | f8a6f814dd4f4e015707085c297b91abf237ed14 (patch) | |
tree | 61645e70ea19d7a97441760e36c19d9177a1d72b /OpenKeychain/src/main/res | |
parent | bc43797c32542aa48a34f44d486645d24fca06ba (diff) | |
download | open-keychain-f8a6f814dd4f4e015707085c297b91abf237ed14.tar.gz open-keychain-f8a6f814dd4f4e015707085c297b91abf237ed14.tar.bz2 open-keychain-f8a6f814dd4f4e015707085c297b91abf237ed14.zip |
added contact linking
Diffstat (limited to 'OpenKeychain/src/main/res')
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_fragment.xml | 23 | ||||
-rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 2 |
2 files changed, 22 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_fragment.xml index 7f3ef0f1e..d8584bca6 100644 --- a/OpenKeychain/src/main/res/layout/view_key_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_fragment.xml @@ -62,11 +62,28 @@ android:layout_height="wrap_content" android:text="@string/section_linked_system_contact"/> - <org.sufficientlysecure.keychain.ui.widget.FixedListView - android:id="@+id/view_key_linked_system_contact" + <LinearLayout + android:id='@+id/system_contact_layout' android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="4dp"/> + android:orientation="horizontal"> + + <ImageView + android:id="@+id/system_contact_picture" + android:layout_margin="6dp" + android:layout_width="60dp" + android:layout_height="60dp" + android:scaleType="centerCrop" + android:src="@color/bg_gray"/> + + <TextView + android:id="@+id/system_contact_name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="@string/view_key_fragment_no_system_contact"/> + </LinearLayout> </LinearLayout> </android.support.v7.widget.CardView> diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 61c406d48..784f2825c 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -639,6 +639,8 @@ <string name="view_key_verified">"Confirmed Key"</string> <string name="view_key_unverified">"Unconfirmed: Scan QR Code to confirm key!"</string> + <string name="view_key_fragment_no_system_contact">"<none>"</string> + <!-- Navigation Drawer --> <string name="nav_keys">"Keys"</string> <string name="nav_encrypt_decrypt">"Encrypt/Decrypt"</string> |