diff options
Diffstat (limited to 'OpenKeychain')
16 files changed, 3 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml index b3a4d5960..48677431c 100644 --- a/OpenKeychain/src/main/AndroidManifest.xml +++ b/OpenKeychain/src/main/AndroidManifest.xml @@ -65,7 +65,7 @@ android:name=".KeychainApplication" android:allowBackup="false" android:hardwareAccelerated="true" - android:icon="@drawable/icon" + android:icon="@drawable/ic_launcher" android:theme="@style/KeychainTheme" android:label="@string/app_name"> <activity diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png Binary files differnew file mode 100644 index 000000000..635633709 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_nfc.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png Binary files differindex e15a055db..1c65e5af8 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_qr_code.png diff --git a/OpenKeychain/src/main/res/drawable-hdpi/icon.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png Binary files differindex f5487599b..f5487599b 100644 --- a/OpenKeychain/src/main/res/drawable-hdpi/icon.png +++ b/OpenKeychain/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-ldpi/icon.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png Binary files differindex 7cd482bff..7cd482bff 100644 --- a/OpenKeychain/src/main/res/drawable-ldpi/icon.png +++ b/OpenKeychain/src/main/res/drawable-ldpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png Binary files differnew file mode 100644 index 000000000..da5e267d0 --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_nfc.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png Binary files differindex 1c65e5af8..570212461 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_qr_code.png diff --git a/OpenKeychain/src/main/res/drawable-mdpi/icon.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png Binary files differindex 34f1420ac..34f1420ac 100644 --- a/OpenKeychain/src/main/res/drawable-mdpi/icon.png +++ b/OpenKeychain/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png Binary files differnew file mode 100644 index 000000000..ff569927c --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_nfc.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png Binary files differindex c56b128e4..ce8965396 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_qr_code.png diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png Binary files differindex 32584f3ff..32584f3ff 100644 --- a/OpenKeychain/src/main/res/drawable-xhdpi/icon.png +++ b/OpenKeychain/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png Binary files differnew file mode 100644 index 000000000..1f96ce37b --- /dev/null +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_nfc.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png Binary files differindex c718aee0b..c56b128e4 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_qr_code.png diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png Binary files differindex b2922309f..b2922309f 100644 --- a/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png +++ b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png Binary files differindex 93ea6b0f5..93ea6b0f5 100644 --- a/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png +++ b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml index 09a31b4a8..3f131b9ce 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml @@ -33,12 +33,12 @@ android:layout_marginTop="8dp" android:background="?android:attr/listDivider" /> - <Button + <ImageButton android:id="@+id/import_nfc_button" android:layout_width="wrap_content" android:layout_height="match_parent" android:padding="8dp" - android:text="NFC?" + android:src="@drawable/ic_action_nfc" android:layout_gravity="center_vertical" style="@style/SelectableItem" /> |
