diff options
author | Kent <itaqmail@gmail.com> | 2015-03-20 06:31:18 +0800 |
---|---|---|
committer | Kent <itaqmail@gmail.com> | 2015-03-20 06:31:18 +0800 |
commit | 8d6d4328f23b527be9ea794433b3f160cd58e5a5 (patch) | |
tree | 8a70b181eb6d23d878c53b957adf7ec983842518 /OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml | |
parent | cfef53be01f72da477d0cb66e40865d7dcd9b125 (diff) | |
download | open-keychain-8d6d4328f23b527be9ea794433b3f160cd58e5a5.tar.gz open-keychain-8d6d4328f23b527be9ea794433b3f160cd58e5a5.tar.bz2 open-keychain-8d6d4328f23b527be9ea794433b3f160cd58e5a5.zip |
Implemented #1162: Invoke NFC in Advanced View
- Extracted NFC code from ViewKeyActivity to NfcHelper to share code between classes
- Changed the private anonymous Handler for NFC into a static private subclass, that uses WeakReference to avoid memory leaks
- Added resources needed (retrieved from Graphics) for the NFC button inside ViewKeyAdvShareFragment.
- Fixed the ripple boundary of the Share With... button to prevent it from bleeding to other buttons on the right (UX improvement)
Diffstat (limited to 'OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml')
-rw-r--r-- | OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml index 6a21e0dc1..c08d66cc1 100644 --- a/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml +++ b/OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml @@ -99,14 +99,12 @@ android:layout_weight="1" /> <LinearLayout - android:id="@+id/view_key_action_key_share" android:layout_width="match_parent" android:layout_height="?android:attr/listPreferredItemHeight" - android:clickable="true" - android:background="?android:selectableItemBackground" android:orientation="horizontal"> <TextView + android:id="@+id/view_key_action_key_share" android:paddingLeft="8dp" android:paddingRight="8dp" android:textAppearance="?android:attr/textAppearanceMedium" @@ -116,7 +114,25 @@ android:layout_weight="1" android:drawableRight="@drawable/ic_share_grey_24dp" android:drawablePadding="8dp" - android:gravity="center_vertical" /> + android:gravity="center_vertical" + android:background="?android:selectableItemBackground"/> + + <View + android:layout_width="1dip" + android:layout_height="match_parent" + android:gravity="right" + android:layout_marginBottom="8dp" + android:layout_marginTop="8dp" + android:background="?android:attr/listDivider" /> + + <ImageButton + android:id="@+id/view_key_action_key_nfc" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:padding="8dp" + android:src="@drawable/ic_nfc_grey_24dp" + android:layout_gravity="center_vertical" + android:background="?android:selectableItemBackground" /> <View android:layout_width="1dip" @@ -154,6 +170,7 @@ </LinearLayout> + <View android:layout_width="match_parent" android:layout_height="1dip" |