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

better onActivityResult handling for qr code import, remove unimplemented import button

Browse Source
This commit is contained in:
Dominik Schürmann
2014-01-18 21:20:20 +01:00
parent f3638d5b44
commit 1c5acc9721
3 changed files with 25 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenPGP-Keychain/res/layout/import_keys_activity.xml
View File

@@ -37,13 +37,13 @@
bootstrapbutton:bb_icon_left="fa-download"
bootstrapbutton:bb_type="info" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/import_sign_and_upload"
android:layout_width="match_parent"
android:layout_height="60dp"
android:padding="4dp"
android:text="@string/import_sign_and_upload"
bootstrapbutton:bb_type="info" />
<!-- <com.beardedhen.androidbootstrap.BootstrapButton -->
<!-- android:id="@+id/import_sign_and_upload" -->
<!-- android:layout_width="match_parent" -->
<!-- android:layout_height="60dp" -->
<!-- android:padding="4dp" -->
<!-- android:text="@string/import_sign_and_upload" -->
<!-- bootstrapbutton:bb_type="info" /> -->
</LinearLayout>
<FrameLayout