cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2145 from open-keychain/ditch-android-beam

Browse Source 
Ditch Android Beam feature
This commit is contained in:
Dominik Schürmann
2017-08-02 23:45:36 +02:00
committed by GitHub
parent dd5d57d06c b94a8c9dee
commit 7a9673fe47
5 changed files with 0 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
OpenKeychain/src/main/res/layout/view_key_activity.xml
View File

@@ -111,17 +111,6 @@
android:src="@drawable/ic_action_encrypt_text_24dp"
android:visibility="invisible"
tools:visibility="visible" />
<ImageButton
android:id="@+id/view_key_action_nfc"
style="?android:attr/borderlessButtonStyle"
android:contentDescription="@string/cd_share_nfc"
android:layout_width="64dp"
android:layout_height="64dp"
android:src="@drawable/ic_nfc_white_24dp"
android:visibility="invisible"
tools:visibility="visible" />
</LinearLayout>
<ImageView

17
OpenKeychain/src/main/res/layout/view_key_adv_share_fragment.xml
View File

@@ -125,23 +125,6 @@
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"
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_clipboard"
android:layout_width="wrap_content"