diff --git a/OpenPGP-Keychain-API/.gitignore b/OpenKeychain-API/.gitignore similarity index 100% rename from OpenPGP-Keychain-API/.gitignore rename to OpenKeychain-API/.gitignore diff --git a/OpenPGP-Keychain-API/build.gradle b/OpenKeychain-API/build.gradle similarity index 100% rename from OpenPGP-Keychain-API/build.gradle rename to OpenKeychain-API/build.gradle diff --git a/OpenPGP-Keychain-API/example-app/build.gradle b/OpenKeychain-API/example-app/build.gradle similarity index 100% rename from OpenPGP-Keychain-API/example-app/build.gradle rename to OpenKeychain-API/example-app/build.gradle diff --git a/OpenPGP-Keychain-API/example-app/ic_launcher-web.png b/OpenKeychain-API/example-app/ic_launcher-web.png similarity index 100% rename from OpenPGP-Keychain-API/example-app/ic_launcher-web.png rename to OpenKeychain-API/example-app/ic_launcher-web.png diff --git a/OpenPGP-Keychain-API/example-app/src/main/AndroidManifest.xml b/OpenKeychain-API/example-app/src/main/AndroidManifest.xml similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/AndroidManifest.xml rename to OpenKeychain-API/example-app/src/main/AndroidManifest.xml diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/BaseActivity.java b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/BaseActivity.java similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/BaseActivity.java rename to OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/BaseActivity.java diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/Constants.java b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/Constants.java similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/Constants.java rename to OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/Constants.java diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java rename to OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/IntentActivity.java diff --git a/OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java b/OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java rename to OpenKeychain-API/example-app/src/main/java/org/sufficientlysecure/keychain/demo/OpenPgpProviderActivity.java diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-hdpi/ic_launcher.png b/OpenKeychain-API/example-app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/res/drawable-hdpi/ic_launcher.png rename to OpenKeychain-API/example-app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-mdpi/ic_launcher.png b/OpenKeychain-API/example-app/src/main/res/drawable-mdpi/ic_launcher.png similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/res/drawable-mdpi/ic_launcher.png rename to OpenKeychain-API/example-app/src/main/res/drawable-mdpi/ic_launcher.png diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-xhdpi/ic_launcher.png b/OpenKeychain-API/example-app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/res/drawable-xhdpi/ic_launcher.png rename to OpenKeychain-API/example-app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/drawable-xxhdpi/ic_launcher.png b/OpenKeychain-API/example-app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/res/drawable-xxhdpi/ic_launcher.png rename to OpenKeychain-API/example-app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml b/OpenKeychain-API/example-app/src/main/res/layout/openpgp_provider.xml similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/res/layout/openpgp_provider.xml rename to OpenKeychain-API/example-app/src/main/res/layout/openpgp_provider.xml diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml b/OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/res/xml/base_preference.xml rename to OpenKeychain-API/example-app/src/main/res/xml/base_preference.xml diff --git a/OpenPGP-Keychain-API/example-app/src/main/res/xml/intent_preference.xml b/OpenKeychain-API/example-app/src/main/res/xml/intent_preference.xml similarity index 100% rename from OpenPGP-Keychain-API/example-app/src/main/res/xml/intent_preference.xml rename to OpenKeychain-API/example-app/src/main/res/xml/intent_preference.xml diff --git a/OpenPGP-Keychain-API/gradle/gradle/wrapper/gradle-wrapper.jar b/OpenKeychain-API/gradle/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from OpenPGP-Keychain-API/gradle/gradle/wrapper/gradle-wrapper.jar rename to OpenKeychain-API/gradle/gradle/wrapper/gradle-wrapper.jar diff --git a/OpenPGP-Keychain-API/gradle/gradle/wrapper/gradle-wrapper.properties b/OpenKeychain-API/gradle/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from OpenPGP-Keychain-API/gradle/gradle/wrapper/gradle-wrapper.properties rename to OpenKeychain-API/gradle/gradle/wrapper/gradle-wrapper.properties diff --git a/OpenPGP-Keychain-API/gradle/gradlew b/OpenKeychain-API/gradle/gradlew similarity index 100% rename from OpenPGP-Keychain-API/gradle/gradlew rename to OpenKeychain-API/gradle/gradlew diff --git a/OpenPGP-Keychain-API/gradle/gradlew.bat b/OpenKeychain-API/gradle/gradlew.bat similarity index 100% rename from OpenPGP-Keychain-API/gradle/gradlew.bat rename to OpenKeychain-API/gradle/gradlew.bat diff --git a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar b/OpenKeychain-API/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.jar rename to OpenKeychain-API/gradle/wrapper/gradle-wrapper.jar diff --git a/OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties b/OpenKeychain-API/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from OpenPGP-Keychain-API/gradle/wrapper/gradle-wrapper.properties rename to OpenKeychain-API/gradle/wrapper/gradle-wrapper.properties diff --git a/OpenPGP-Keychain-API/gradlew b/OpenKeychain-API/gradlew similarity index 100% rename from OpenPGP-Keychain-API/gradlew rename to OpenKeychain-API/gradlew diff --git a/OpenPGP-Keychain-API/gradlew.bat b/OpenKeychain-API/gradlew.bat similarity index 100% rename from OpenPGP-Keychain-API/gradlew.bat rename to OpenKeychain-API/gradlew.bat diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/.gitignore b/OpenKeychain-API/libraries/openkeychain-api-library/.gitignore similarity index 100% rename from OpenPGP-Keychain-API/libraries/openkeychain-api-library/.gitignore rename to OpenKeychain-API/libraries/openkeychain-api-library/.gitignore diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/AndroidManifest.xml b/OpenKeychain-API/libraries/openkeychain-api-library/AndroidManifest.xml similarity index 100% rename from OpenPGP-Keychain-API/libraries/openkeychain-api-library/AndroidManifest.xml rename to OpenKeychain-API/libraries/openkeychain-api-library/AndroidManifest.xml diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/LICENSE b/OpenKeychain-API/libraries/openkeychain-api-library/LICENSE similarity index 100% rename from OpenPGP-Keychain-API/libraries/openkeychain-api-library/LICENSE rename to OpenKeychain-API/libraries/openkeychain-api-library/LICENSE diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/build.gradle b/OpenKeychain-API/libraries/openkeychain-api-library/build.gradle similarity index 100% rename from OpenPGP-Keychain-API/libraries/openkeychain-api-library/build.gradle rename to OpenKeychain-API/libraries/openkeychain-api-library/build.gradle diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/build.xml b/OpenKeychain-API/libraries/openkeychain-api-library/build.xml similarity index 100% rename from OpenPGP-Keychain-API/libraries/openkeychain-api-library/build.xml rename to OpenKeychain-API/libraries/openkeychain-api-library/build.xml diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/proguard-project.txt b/OpenKeychain-API/libraries/openkeychain-api-library/proguard-project.txt similarity index 100% rename from OpenPGP-Keychain-API/libraries/openkeychain-api-library/proguard-project.txt rename to OpenKeychain-API/libraries/openkeychain-api-library/proguard-project.txt diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/project.properties b/OpenKeychain-API/libraries/openkeychain-api-library/project.properties similarity index 100% rename from OpenPGP-Keychain-API/libraries/openkeychain-api-library/project.properties rename to OpenKeychain-API/libraries/openkeychain-api-library/project.properties diff --git a/OpenPGP-Keychain-API/libraries/openkeychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java b/OpenKeychain-API/libraries/openkeychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/openkeychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java rename to OpenKeychain-API/libraries/openkeychain-api-library/src/org/sufficientlysecure/keychain/api/OpenKeychainIntents.java diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/.gitignore b/OpenKeychain-API/libraries/openpgp-api-library/.gitignore similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/.gitignore rename to OpenKeychain-API/libraries/openpgp-api-library/.gitignore diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/AndroidManifest.xml b/OpenKeychain-API/libraries/openpgp-api-library/AndroidManifest.xml similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/AndroidManifest.xml rename to OpenKeychain-API/libraries/openpgp-api-library/AndroidManifest.xml diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/LICENSE b/OpenKeychain-API/libraries/openpgp-api-library/LICENSE similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/LICENSE rename to OpenKeychain-API/libraries/openpgp-api-library/LICENSE diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/build.gradle b/OpenKeychain-API/libraries/openpgp-api-library/build.gradle similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/build.gradle rename to OpenKeychain-API/libraries/openpgp-api-library/build.gradle diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/build.xml b/OpenKeychain-API/libraries/openpgp-api-library/build.xml similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/build.xml rename to OpenKeychain-API/libraries/openpgp-api-library/build.xml diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/proguard-project.txt b/OpenKeychain-API/libraries/openpgp-api-library/proguard-project.txt similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/proguard-project.txt rename to OpenKeychain-API/libraries/openpgp-api-library/proguard-project.txt diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/project.properties b/OpenKeychain-API/libraries/openpgp-api-library/project.properties similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/project.properties rename to OpenKeychain-API/libraries/openpgp-api-library/project.properties diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png rename to OpenKeychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize.png diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png rename to OpenKeychain-API/libraries/openpgp-api-library/res/drawable-hdpi/ic_action_cancel_launchersize_light.png diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png rename to OpenKeychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize.png diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png rename to OpenKeychain-API/libraries/openpgp-api-library/res/drawable-mdpi/ic_action_cancel_launchersize_light.png diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png rename to OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize.png diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png rename to OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xhdpi/ic_action_cancel_launchersize_light.png diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png rename to OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize.png diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png b/OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png rename to OpenKeychain-API/libraries/openpgp-api-library/res/drawable-xxhdpi/ic_action_cancel_launchersize_light.png diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/res/values/strings.xml b/OpenKeychain-API/libraries/openpgp-api-library/res/values/strings.xml similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/res/values/strings.xml rename to OpenKeychain-API/libraries/openpgp-api-library/res/values/strings.xml diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl rename to OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/IOpenPgpService.aidl diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java rename to OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpError.java diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java rename to OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/OpenPgpSignatureResult.java diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java rename to OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpApi.java diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java rename to OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpListPreference.java diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java rename to OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpServiceConnection.java diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java rename to OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/OpenPgpUtils.java diff --git a/OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java b/OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java similarity index 100% rename from OpenPGP-Keychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java rename to OpenKeychain-API/libraries/openpgp-api-library/src/org/openintents/openpgp/util/ParcelFileDescriptorUtil.java diff --git a/OpenPGP-Keychain-API/settings.gradle b/OpenKeychain-API/settings.gradle similarity index 100% rename from OpenPGP-Keychain-API/settings.gradle rename to OpenKeychain-API/settings.gradle diff --git a/OpenPGP-Keychain/.gitignore b/OpenKeychain/.gitignore similarity index 100% rename from OpenPGP-Keychain/.gitignore rename to OpenKeychain/.gitignore diff --git a/OpenPGP-Keychain/build.gradle b/OpenKeychain/build.gradle similarity index 91% rename from OpenPGP-Keychain/build.gradle rename to OpenKeychain/build.gradle index ef9bcfda5..3fcdf790b 100644 --- a/OpenPGP-Keychain/build.gradle +++ b/OpenKeychain/build.gradle @@ -10,8 +10,8 @@ sourceSets { dependencies { compile 'com.android.support:support-v4:19.0.1' compile 'com.android.support:appcompat-v7:19.0.1' - compile project(':OpenPGP-Keychain-API:libraries:openpgp-api-library') - compile project(':OpenPGP-Keychain-API:libraries:openkeychain-api-library') + compile project(':OpenKeychain-API:libraries:openpgp-api-library') + compile project(':OpenKeychain-API:libraries:openkeychain-api-library') compile project(':libraries:HtmlTextView') compile project(':libraries:StickyListHeaders:library') compile project(':libraries:AndroidBootstrap') @@ -29,8 +29,8 @@ dependencies { testLocalCompile 'com.google.android:android:4.1.1.4' testLocalCompile 'com.android.support:support-v4:19.0.1' testLocalCompile 'com.android.support:appcompat-v7:19.0.1' - testLocalCompile project(':OpenPGP-Keychain-API:libraries:openpgp-api-library') - testLocalCompile project(':OpenPGP-Keychain-API:libraries:openkeychain-api-library') + testLocalCompile project(':OpenKeychain-API:libraries:openpgp-api-library') + testLocalCompile project(':OpenKeychain-API:libraries:openkeychain-api-library') testLocalCompile project(':libraries:HtmlTextView') testLocalCompile project(':libraries:StickyListHeaders:library') testLocalCompile project(':libraries:AndroidBootstrap') diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml similarity index 100% rename from OpenPGP-Keychain/src/main/AndroidManifest.xml rename to OpenKeychain/src/main/AndroidManifest.xml diff --git a/OpenPGP-Keychain/src/main/assets/fontawesome-webfont.ttf b/OpenKeychain/src/main/assets/fontawesome-webfont.ttf similarity index 100% rename from OpenPGP-Keychain/src/main/assets/fontawesome-webfont.ttf rename to OpenKeychain/src/main/assets/fontawesome-webfont.ttf diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Constants.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Constants.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Id.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Id.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/Id.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/Id.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/KeychainApplication.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ClipboardReflection.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/DialogFragmentWorkaround.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/compatibility/ListFragmentWorkaround.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ActionBarHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ContactHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/ExportHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/FileHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/OtherHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/helper/Preferences.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpConversionHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerifyResult.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpToX509.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/NoAsymmetricEncryptionException.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralException.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/exception/PgpGeneralMsgIdException.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainContract.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainDatabase.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainProvider.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobContract.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobDatabase.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/KeychainServiceBlobProvider.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AccountSettings.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/AppSettings.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/RemoteService.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/WrongPackageSignatureException.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/WrongPackageSignatureException.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/WrongPackageSignatureException.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/WrongPackageSignatureException.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountSettingsFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountsListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountsListFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountsListFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AccountsListFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppSettingsFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/AppsListFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/ui/RemoteServiceActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentServiceHandler.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/PassphraseCacheService.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/SaveKeyringParcel.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFileFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptMessageFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DrawerActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EditKeyActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptActivityInterface.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptAsymmetricFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptMessageFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptSymmetricFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptSymmetricFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptSymmetricFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptSymmetricFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpAboutFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/HelpHtmlFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysClipboardFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysFileFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysNFCFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysQrCodeFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysServerFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/PreferencesKeyServerActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectPublicKeyFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SelectSecretKeyLayoutFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewCertActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivityJB.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyCertsFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/AsyncTaskResultWrapper.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/HighlightQueryCursorAdapter.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/PagerTabStripAdapter.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/TabsAdapter.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/BadImportKeyDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/CreateKeyDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteFileDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/DeleteKeyDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/FileDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/PassphraseDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ProgressDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/SetPassphraseDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareNfcDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/Editor.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FixedListView.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/FoldableLinearLayout.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/IntegerListPreference.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyServerEditor.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/SectionView.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UnderlineTextView.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/UserIdEditor.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/AlgorithmNames.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Choice.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/InputData.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IntentIntegratorSupportV4.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/IterableIterator.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeyServer.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/KeychainServiceListener.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Log.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PRNGFixes.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PausableThreadPoolExecutor.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/PositionAwareInputStream.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/Primes.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressDialogUpdater.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/ProgressScaler.java diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java similarity index 100% rename from OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/util/QrCodeUtils.java diff --git a/OpenPGP-Keychain/src/main/res/anim/push_left_in.xml b/OpenKeychain/src/main/res/anim/push_left_in.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/anim/push_left_in.xml rename to OpenKeychain/src/main/res/anim/push_left_in.xml diff --git a/OpenPGP-Keychain/src/main/res/anim/push_left_out.xml b/OpenKeychain/src/main/res/anim/push_left_out.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/anim/push_left_out.xml rename to OpenKeychain/src/main/res/anim/push_left_out.xml diff --git a/OpenPGP-Keychain/src/main/res/anim/push_right_in.xml b/OpenKeychain/src/main/res/anim/push_right_in.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/anim/push_right_in.xml rename to OpenKeychain/src/main/res/anim/push_right_in.xml diff --git a/OpenPGP-Keychain/src/main/res/anim/push_right_out.xml b/OpenKeychain/src/main/res/anim/push_right_out.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/anim/push_right_out.xml rename to OpenKeychain/src/main/res/anim/push_right_out.xml diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/certify_small.png b/OpenKeychain/src/main/res/drawable-hdpi/certify_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/certify_small.png rename to OpenKeychain/src/main/res/drawable-hdpi/certify_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/drawer_shadow.9.png b/OpenKeychain/src/main/res/drawable-hdpi/drawer_shadow.9.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/drawer_shadow.9.png rename to OpenKeychain/src/main/res/drawable-hdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-hdpi/encrypted_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/encrypted_small.png rename to OpenKeychain/src/main/res/drawable-hdpi/encrypted_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_add_person.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_add_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cancel.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_cancel.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_cloud.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_cloud.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_discard.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_discard.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_done.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_done.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_import_export.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_import_export.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_person.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_save.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_save.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_search.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_search.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_secure.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_secure.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_select_all.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_select_all.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_action_share.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_action_share.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_dialog_alert_holo_light.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_drawer.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_drawer.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_drawer.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_search.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_menu_search.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search_list.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_menu_search_list.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_menu_search_list.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_menu_search_list.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_next.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_next.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_next.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_next.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_previous.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_previous.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/ic_previous.png rename to OpenKeychain/src/main/res/drawable-hdpi/ic_previous.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png b/OpenKeychain/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/icon.png rename to OpenKeychain/src/main/res/drawable-hdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/key_small.png b/OpenKeychain/src/main/res/drawable-hdpi/key_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/key_small.png rename to OpenKeychain/src/main/res/drawable-hdpi/key_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_error.png b/OpenKeychain/src/main/res/drawable-hdpi/overlay_error.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_error.png rename to OpenKeychain/src/main/res/drawable-hdpi/overlay_error.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_ok.png b/OpenKeychain/src/main/res/drawable-hdpi/overlay_ok.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/overlay_ok.png rename to OpenKeychain/src/main/res/drawable-hdpi/overlay_ok.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_center_bright.9.png b/OpenKeychain/src/main/res/drawable-hdpi/popup_center_bright.9.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_center_bright.9.png rename to OpenKeychain/src/main/res/drawable-hdpi/popup_center_bright.9.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_full_bright.9.png b/OpenKeychain/src/main/res/drawable-hdpi/popup_full_bright.9.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/popup_full_bright.9.png rename to OpenKeychain/src/main/res/drawable-hdpi/popup_full_bright.9.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/revoked_key_small.png b/OpenKeychain/src/main/res/drawable-hdpi/revoked_key_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/revoked_key_small.png rename to OpenKeychain/src/main/res/drawable-hdpi/revoked_key_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_large.png b/OpenKeychain/src/main/res/drawable-hdpi/signed_large.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_large.png rename to OpenKeychain/src/main/res/drawable-hdpi/signed_large.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_small.png b/OpenKeychain/src/main/res/drawable-hdpi/signed_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-hdpi/signed_small.png rename to OpenKeychain/src/main/res/drawable-hdpi/signed_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-ldpi/encrypted_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/encrypted_small.png rename to OpenKeychain/src/main/res/drawable-ldpi/encrypted_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_next.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_next.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_next.png rename to OpenKeychain/src/main/res/drawable-ldpi/ic_next.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_previous.png b/OpenKeychain/src/main/res/drawable-ldpi/ic_previous.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/ic_previous.png rename to OpenKeychain/src/main/res/drawable-ldpi/ic_previous.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png b/OpenKeychain/src/main/res/drawable-ldpi/icon.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/icon.png rename to OpenKeychain/src/main/res/drawable-ldpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/key_small.png b/OpenKeychain/src/main/res/drawable-ldpi/key_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/key_small.png rename to OpenKeychain/src/main/res/drawable-ldpi/key_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_error.png b/OpenKeychain/src/main/res/drawable-ldpi/overlay_error.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_error.png rename to OpenKeychain/src/main/res/drawable-ldpi/overlay_error.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_ok.png b/OpenKeychain/src/main/res/drawable-ldpi/overlay_ok.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/overlay_ok.png rename to OpenKeychain/src/main/res/drawable-ldpi/overlay_ok.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_large.png b/OpenKeychain/src/main/res/drawable-ldpi/signed_large.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_large.png rename to OpenKeychain/src/main/res/drawable-ldpi/signed_large.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_small.png b/OpenKeychain/src/main/res/drawable-ldpi/signed_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-ldpi/signed_small.png rename to OpenKeychain/src/main/res/drawable-ldpi/signed_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/certify_small.png b/OpenKeychain/src/main/res/drawable-mdpi/certify_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/certify_small.png rename to OpenKeychain/src/main/res/drawable-mdpi/certify_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/drawer_shadow.9.png b/OpenKeychain/src/main/res/drawable-mdpi/drawer_shadow.9.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/drawer_shadow.9.png rename to OpenKeychain/src/main/res/drawable-mdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/encrypted_small.png b/OpenKeychain/src/main/res/drawable-mdpi/encrypted_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/encrypted_small.png rename to OpenKeychain/src/main/res/drawable-mdpi/encrypted_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_add_person.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_add_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cancel.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_cancel.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_cloud.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_cloud.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_discard.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_discard.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_done.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_done.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_import_export.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_import_export.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_person.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_save.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_save.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_search.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_search.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_secure.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_secure.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_select_all.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_select_all.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_action_share.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_action_share.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_dialog_alert_holo_light.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_drawer.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_drawer.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_drawer.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_search.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_menu_search.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search_list.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_menu_search_list.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_menu_search_list.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_menu_search_list.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_next.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_next.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_next.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_next.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_previous.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_previous.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/ic_previous.png rename to OpenKeychain/src/main/res/drawable-mdpi/ic_previous.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png b/OpenKeychain/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/icon.png rename to OpenKeychain/src/main/res/drawable-mdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/key_small.png b/OpenKeychain/src/main/res/drawable-mdpi/key_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/key_small.png rename to OpenKeychain/src/main/res/drawable-mdpi/key_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_error.png b/OpenKeychain/src/main/res/drawable-mdpi/overlay_error.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_error.png rename to OpenKeychain/src/main/res/drawable-mdpi/overlay_error.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_ok.png b/OpenKeychain/src/main/res/drawable-mdpi/overlay_ok.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/overlay_ok.png rename to OpenKeychain/src/main/res/drawable-mdpi/overlay_ok.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_large.png b/OpenKeychain/src/main/res/drawable-mdpi/signed_large.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_large.png rename to OpenKeychain/src/main/res/drawable-mdpi/signed_large.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_small.png b/OpenKeychain/src/main/res/drawable-mdpi/signed_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-mdpi/signed_small.png rename to OpenKeychain/src/main/res/drawable-mdpi/signed_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png b/OpenKeychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png rename to OpenKeychain/src/main/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_add_person.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_add_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cancel.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cancel.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cancel.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cancel.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cloud.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_cloud.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_cloud.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_discard.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_discard.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_discard.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_done.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_done.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_done.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_done.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_import_export.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_import_export.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_import_export.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_person.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_person.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_save.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_save.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_save.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_search.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_search.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_secure.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_secure.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_secure.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_select_all.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_select_all.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_select_all.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_share.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_action_share.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_action_share.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_dialog_alert_holo_light.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_drawer.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_drawer.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_drawer.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_search.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_search.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png rename to OpenKeychain/src/main/res/drawable-xhdpi/ic_menu_search_list.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xhdpi/icon.png rename to OpenKeychain/src/main/res/drawable-xhdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png b/OpenKeychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/drawer_shadow.9.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_add_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_cloud.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_discard.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_discard.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_discard.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_discard.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_import_export.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_person.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_person.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_person.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_person.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_save.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_save.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_save.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_save.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_search.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_search.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_search.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_secure.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_secure.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_secure.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_secure.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_select_all.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_share.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_share.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_action_share.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_share.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_dialog_alert_holo_light.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_drawer.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_drawer.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/ic_drawer.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/ic_drawer.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxhdpi/icon.png rename to OpenKeychain/src/main/res/drawable-xxhdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable-xxxhdpi/icon.png rename to OpenKeychain/src/main/res/drawable-xxxhdpi/icon.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/certify_small.png b/OpenKeychain/src/main/res/drawable/certify_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/certify_small.png rename to OpenKeychain/src/main/res/drawable/certify_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/encrypted_small.png b/OpenKeychain/src/main/res/drawable/encrypted_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/encrypted_small.png rename to OpenKeychain/src/main/res/drawable/encrypted_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/ic_next.png b/OpenKeychain/src/main/res/drawable/ic_next.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/ic_next.png rename to OpenKeychain/src/main/res/drawable/ic_next.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/ic_previous.png b/OpenKeychain/src/main/res/drawable/ic_previous.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/ic_previous.png rename to OpenKeychain/src/main/res/drawable/ic_previous.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/key_small.png b/OpenKeychain/src/main/res/drawable/key_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/key_small.png rename to OpenKeychain/src/main/res/drawable/key_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/overlay_error.png b/OpenKeychain/src/main/res/drawable/overlay_error.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/overlay_error.png rename to OpenKeychain/src/main/res/drawable/overlay_error.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/overlay_ok.png b/OpenKeychain/src/main/res/drawable/overlay_ok.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/overlay_ok.png rename to OpenKeychain/src/main/res/drawable/overlay_ok.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/revoked_key_small.png b/OpenKeychain/src/main/res/drawable/revoked_key_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/revoked_key_small.png rename to OpenKeychain/src/main/res/drawable/revoked_key_small.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/section_header.xml b/OpenKeychain/src/main/res/drawable/section_header.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/section_header.xml rename to OpenKeychain/src/main/res/drawable/section_header.xml diff --git a/OpenPGP-Keychain/src/main/res/drawable/selector_transparent_button.xml b/OpenKeychain/src/main/res/drawable/selector_transparent_button.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/selector_transparent_button.xml rename to OpenKeychain/src/main/res/drawable/selector_transparent_button.xml diff --git a/OpenPGP-Keychain/src/main/res/drawable/signed_large.png b/OpenKeychain/src/main/res/drawable/signed_large.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/signed_large.png rename to OpenKeychain/src/main/res/drawable/signed_large.png diff --git a/OpenPGP-Keychain/src/main/res/drawable/signed_small.png b/OpenKeychain/src/main/res/drawable/signed_small.png similarity index 100% rename from OpenPGP-Keychain/src/main/res/drawable/signed_small.png rename to OpenKeychain/src/main/res/drawable/signed_small.png diff --git a/OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout-large/api_apps_list_activity.xml rename to OpenKeychain/src/main/res/layout-large/api_apps_list_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/decrypt_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout-large/decrypt_activity.xml rename to OpenKeychain/src/main/res/layout-large/decrypt_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml b/OpenKeychain/src/main/res/layout-large/encrypt_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout-large/encrypt_activity.xml rename to OpenKeychain/src/main/res/layout-large/encrypt_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml b/OpenKeychain/src/main/res/layout-large/import_keys_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout-large/import_keys_activity.xml rename to OpenKeychain/src/main/res/layout-large/import_keys_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml b/OpenKeychain/src/main/res/layout-large/key_list_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout-large/key_list_activity.xml rename to OpenKeychain/src/main/res/layout-large/key_list_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done.xml rename to OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml b/OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml rename to OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml b/OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/actionbar_include_cancel_button.xml rename to OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml b/OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/actionbar_include_done_button.xml rename to OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_account_settings_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_account_settings_activity.xml rename to OpenKeychain/src/main/res/layout/api_account_settings_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_account_settings_fragment.xml rename to OpenKeychain/src/main/res/layout/api_account_settings_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_accounts_adapter_list_item.xml rename to OpenKeychain/src/main/res/layout/api_accounts_adapter_list_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml b/OpenKeychain/src/main/res/layout/api_app_settings_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_app_settings_activity.xml rename to OpenKeychain/src/main/res/layout/api_app_settings_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml b/OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_app_settings_fragment.xml rename to OpenKeychain/src/main/res/layout/api_app_settings_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml b/OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_apps_adapter_list_item.xml rename to OpenKeychain/src/main/res/layout/api_apps_adapter_list_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml b/OpenKeychain/src/main/res/layout/api_apps_list_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_apps_list_activity.xml rename to OpenKeychain/src/main/res/layout/api_apps_list_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml b/OpenKeychain/src/main/res/layout/api_apps_list_content.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_apps_list_content.xml rename to OpenKeychain/src/main/res/layout/api_apps_list_content.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml b/OpenKeychain/src/main/res/layout/api_remote_create_account.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_remote_create_account.xml rename to OpenKeychain/src/main/res/layout/api_remote_create_account.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml b/OpenKeychain/src/main/res/layout/api_remote_error_message.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_remote_error_message.xml rename to OpenKeychain/src/main/res/layout/api_remote_error_message.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml b/OpenKeychain/src/main/res/layout/api_remote_register_app.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_remote_register_app.xml rename to OpenKeychain/src/main/res/layout/api_remote_register_app.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml b/OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/api_remote_select_pub_keys.xml rename to OpenKeychain/src/main/res/layout/api_remote_select_pub_keys.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml b/OpenKeychain/src/main/res/layout/certify_key_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/certify_key_activity.xml rename to OpenKeychain/src/main/res/layout/certify_key_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml b/OpenKeychain/src/main/res/layout/create_key_dialog.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/create_key_dialog.xml rename to OpenKeychain/src/main/res/layout/create_key_dialog.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/decrypt_activity.xml rename to OpenKeychain/src/main/res/layout/decrypt_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml b/OpenKeychain/src/main/res/layout/decrypt_content.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/decrypt_content.xml rename to OpenKeychain/src/main/res/layout/decrypt_content.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/decrypt_file_fragment.xml rename to OpenKeychain/src/main/res/layout/decrypt_file_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/decrypt_message_fragment.xml rename to OpenKeychain/src/main/res/layout/decrypt_message_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml b/OpenKeychain/src/main/res/layout/decrypt_signature_include.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/decrypt_signature_include.xml rename to OpenKeychain/src/main/res/layout/decrypt_signature_include.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list.xml b/OpenKeychain/src/main/res/layout/drawer_list.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/drawer_list.xml rename to OpenKeychain/src/main/res/layout/drawer_list.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml b/OpenKeychain/src/main/res/layout/drawer_list_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/drawer_list_item.xml rename to OpenKeychain/src/main/res/layout/drawer_list_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml b/OpenKeychain/src/main/res/layout/edit_key_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/edit_key_activity.xml rename to OpenKeychain/src/main/res/layout/edit_key_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml b/OpenKeychain/src/main/res/layout/edit_key_key_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/edit_key_key_item.xml rename to OpenKeychain/src/main/res/layout/edit_key_key_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_section.xml b/OpenKeychain/src/main/res/layout/edit_key_section.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/edit_key_section.xml rename to OpenKeychain/src/main/res/layout/edit_key_section.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml b/OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/edit_key_user_id_item.xml rename to OpenKeychain/src/main/res/layout/edit_key_user_id_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/encrypt_activity.xml rename to OpenKeychain/src/main/res/layout/encrypt_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/encrypt_asymmetric_fragment.xml rename to OpenKeychain/src/main/res/layout/encrypt_asymmetric_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml b/OpenKeychain/src/main/res/layout/encrypt_content.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/encrypt_content.xml rename to OpenKeychain/src/main/res/layout/encrypt_content.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml b/OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/encrypt_content_adv_settings.xml rename to OpenKeychain/src/main/res/layout/encrypt_content_adv_settings.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/encrypt_file_fragment.xml rename to OpenKeychain/src/main/res/layout/encrypt_file_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/encrypt_message_fragment.xml rename to OpenKeychain/src/main/res/layout/encrypt_message_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml b/OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/encrypt_symmetric_fragment.xml rename to OpenKeychain/src/main/res/layout/encrypt_symmetric_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/file_dialog.xml b/OpenKeychain/src/main/res/layout/file_dialog.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/file_dialog.xml rename to OpenKeychain/src/main/res/layout/file_dialog.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml b/OpenKeychain/src/main/res/layout/foldable_linearlayout.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/foldable_linearlayout.xml rename to OpenKeychain/src/main/res/layout/foldable_linearlayout.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/help_about_fragment.xml b/OpenKeychain/src/main/res/layout/help_about_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/help_about_fragment.xml rename to OpenKeychain/src/main/res/layout/help_about_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/help_activity.xml b/OpenKeychain/src/main/res/layout/help_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/help_activity.xml rename to OpenKeychain/src/main/res/layout/help_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_activity.xml rename to OpenKeychain/src/main/res/layout/import_keys_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_clipboard_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_clipboard_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_clipboard_fragment.xml rename to OpenKeychain/src/main/res/layout/import_keys_clipboard_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml b/OpenKeychain/src/main/res/layout/import_keys_content.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_content.xml rename to OpenKeychain/src/main/res/layout/import_keys_content.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_file_fragment.xml rename to OpenKeychain/src/main/res/layout/import_keys_file_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml rename to OpenKeychain/src/main/res/layout/import_keys_list_entry.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry_user_id.xml b/OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry_user_id.xml rename to OpenKeychain/src/main/res/layout/import_keys_list_entry_user_id.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_nfc_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_nfc_fragment.xml rename to OpenKeychain/src/main/res/layout/import_keys_nfc_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_qr_code_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_qr_code_fragment.xml rename to OpenKeychain/src/main/res/layout/import_keys_qr_code_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/import_keys_server_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/import_keys_server_fragment.xml rename to OpenKeychain/src/main/res/layout/import_keys_server_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml b/OpenKeychain/src/main/res/layout/key_list_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/key_list_activity.xml rename to OpenKeychain/src/main/res/layout/key_list_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_content.xml b/OpenKeychain/src/main/res/layout/key_list_content.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/key_list_content.xml rename to OpenKeychain/src/main/res/layout/key_list_content.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/key_list_fragment.xml rename to OpenKeychain/src/main/res/layout/key_list_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_header.xml b/OpenKeychain/src/main/res/layout/key_list_header.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/key_list_header.xml rename to OpenKeychain/src/main/res/layout/key_list_header.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/key_list_item.xml b/OpenKeychain/src/main/res/layout/key_list_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/key_list_item.xml rename to OpenKeychain/src/main/res/layout/key_list_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml b/OpenKeychain/src/main/res/layout/key_server_editor.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/key_server_editor.xml rename to OpenKeychain/src/main/res/layout/key_server_editor.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_export.xml b/OpenKeychain/src/main/res/layout/key_server_export.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/key_server_export.xml rename to OpenKeychain/src/main/res/layout/key_server_export.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml b/OpenKeychain/src/main/res/layout/key_server_preference.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/key_server_preference.xml rename to OpenKeychain/src/main/res/layout/key_server_preference.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/passphrase_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_dialog.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/passphrase_dialog.xml rename to OpenKeychain/src/main/res/layout/passphrase_dialog.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml b/OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/passphrase_repeat_dialog.xml rename to OpenKeychain/src/main/res/layout/passphrase_repeat_dialog.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/select_key_item.xml b/OpenKeychain/src/main/res/layout/select_key_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/select_key_item.xml rename to OpenKeychain/src/main/res/layout/select_key_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml b/OpenKeychain/src/main/res/layout/select_public_key_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/select_public_key_activity.xml rename to OpenKeychain/src/main/res/layout/select_public_key_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_activity.xml b/OpenKeychain/src/main/res/layout/select_secret_key_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/select_secret_key_activity.xml rename to OpenKeychain/src/main/res/layout/select_secret_key_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml b/OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/select_secret_key_layout_fragment.xml rename to OpenKeychain/src/main/res/layout/select_secret_key_layout_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/share_qr_code_dialog.xml b/OpenKeychain/src/main/res/layout/share_qr_code_dialog.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/share_qr_code_dialog.xml rename to OpenKeychain/src/main/res/layout/share_qr_code_dialog.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_cert_activity.xml b/OpenKeychain/src/main/res/layout/view_cert_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_cert_activity.xml rename to OpenKeychain/src/main/res/layout/view_cert_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml b/OpenKeychain/src/main/res/layout/view_key_activity.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_key_activity.xml rename to OpenKeychain/src/main/res/layout/view_key_activity.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_key_certs_fragment.xml rename to OpenKeychain/src/main/res/layout/view_key_certs_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_header.xml b/OpenKeychain/src/main/res/layout/view_key_certs_header.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_key_certs_header.xml rename to OpenKeychain/src/main/res/layout/view_key_certs_header.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_certs_item.xml b/OpenKeychain/src/main/res/layout/view_key_certs_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_key_certs_item.xml rename to OpenKeychain/src/main/res/layout/view_key_certs_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_key_delete_fragment.xml rename to OpenKeychain/src/main/res/layout/view_key_delete_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml b/OpenKeychain/src/main/res/layout/view_key_keys_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_key_keys_item.xml rename to OpenKeychain/src/main/res/layout/view_key_keys_item.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenKeychain/src/main/res/layout/view_key_main_fragment.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml rename to OpenKeychain/src/main/res/layout/view_key_main_fragment.xml diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml b/OpenKeychain/src/main/res/layout/view_key_userids_item.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/layout/view_key_userids_item.xml rename to OpenKeychain/src/main/res/layout/view_key_userids_item.xml diff --git a/OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml b/OpenKeychain/src/main/res/menu/api_account_settings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/menu/api_account_settings.xml rename to OpenKeychain/src/main/res/menu/api_account_settings.xml diff --git a/OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml b/OpenKeychain/src/main/res/menu/api_app_settings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/menu/api_app_settings.xml rename to OpenKeychain/src/main/res/menu/api_app_settings.xml diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list.xml b/OpenKeychain/src/main/res/menu/key_list.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/menu/key_list.xml rename to OpenKeychain/src/main/res/menu/key_list.xml diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml b/OpenKeychain/src/main/res/menu/key_list_multi.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/menu/key_list_multi.xml rename to OpenKeychain/src/main/res/menu/key_list_multi.xml diff --git a/OpenPGP-Keychain/src/main/res/menu/key_view.xml b/OpenKeychain/src/main/res/menu/key_view.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/menu/key_view.xml rename to OpenKeychain/src/main/res/menu/key_view.xml diff --git a/OpenPGP-Keychain/src/main/res/menu/view_cert.xml b/OpenKeychain/src/main/res/menu/view_cert.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/menu/view_cert.xml rename to OpenKeychain/src/main/res/menu/view_cert.xml diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_about.html rename to OpenKeychain/src/main/res/raw-cs-rCZ/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_changelog.html rename to OpenKeychain/src/main/res/raw-cs-rCZ/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-cs-rCZ/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_start.html b/OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-cs-rCZ/help_start.html rename to OpenKeychain/src/main/res/raw-cs-rCZ/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-cs-rCZ/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_about.html b/OpenKeychain/src/main/res/raw-de/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-de/help_about.html rename to OpenKeychain/src/main/res/raw-de/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenKeychain/src/main/res/raw-de/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html rename to OpenKeychain/src/main/res/raw-de/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-de/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-de/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-de/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_start.html b/OpenKeychain/src/main/res/raw-de/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-de/help_start.html rename to OpenKeychain/src/main/res/raw-de/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-de/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-de/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-de/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_about.html b/OpenKeychain/src/main/res/raw-el/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-el/help_about.html rename to OpenKeychain/src/main/res/raw-el/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html b/OpenKeychain/src/main/res/raw-el/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-el/help_changelog.html rename to OpenKeychain/src/main/res/raw-el/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-el/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-el/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-el/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-el/help_start.html b/OpenKeychain/src/main/res/raw-el/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-el/help_start.html rename to OpenKeychain/src/main/res/raw-el/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-el/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-el/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-el/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-el/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html b/OpenKeychain/src/main/res/raw-es-rCO/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es-rCO/help_about.html rename to OpenKeychain/src/main/res/raw-es-rCO/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html b/OpenKeychain/src/main/res/raw-es-rCO/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es-rCO/help_changelog.html rename to OpenKeychain/src/main/res/raw-es-rCO/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-es-rCO/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es-rCO/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-es-rCO/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html b/OpenKeychain/src/main/res/raw-es-rCO/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es-rCO/help_start.html rename to OpenKeychain/src/main/res/raw-es-rCO/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-es-rCO/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es-rCO/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-es-rCO/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_about.html b/OpenKeychain/src/main/res/raw-es/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es/help_about.html rename to OpenKeychain/src/main/res/raw-es/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html b/OpenKeychain/src/main/res/raw-es/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html rename to OpenKeychain/src/main/res/raw-es/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-es/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-es/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_start.html b/OpenKeychain/src/main/res/raw-es/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es/help_start.html rename to OpenKeychain/src/main/res/raw-es/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-es/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-es/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-es/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_about.html b/OpenKeychain/src/main/res/raw-et/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-et/help_about.html rename to OpenKeychain/src/main/res/raw-et/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html b/OpenKeychain/src/main/res/raw-et/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-et/help_changelog.html rename to OpenKeychain/src/main/res/raw-et/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-et/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-et/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-et/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-et/help_start.html b/OpenKeychain/src/main/res/raw-et/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-et/help_start.html rename to OpenKeychain/src/main/res/raw-et/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-et/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-et/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-et/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-et/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_about.html rename to OpenKeychain/src/main/res/raw-fa-rIR/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_changelog.html rename to OpenKeychain/src/main/res/raw-fa-rIR/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-fa-rIR/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_start.html b/OpenKeychain/src/main/res/raw-fa-rIR/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fa-rIR/help_start.html rename to OpenKeychain/src/main/res/raw-fa-rIR/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fa-rIR/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-fa-rIR/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fa-rIR/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-fa-rIR/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_about.html b/OpenKeychain/src/main/res/raw-fr/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fr/help_about.html rename to OpenKeychain/src/main/res/raw-fr/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html b/OpenKeychain/src/main/res/raw-fr/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fr/help_changelog.html rename to OpenKeychain/src/main/res/raw-fr/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fr/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-fr/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/help_start.html b/OpenKeychain/src/main/res/raw-fr/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fr/help_start.html rename to OpenKeychain/src/main/res/raw-fr/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-fr/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-fr/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-fr/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html b/OpenKeychain/src/main/res/raw-it-rIT/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-it-rIT/help_about.html rename to OpenKeychain/src/main/res/raw-it-rIT/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html b/OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-it-rIT/help_changelog.html rename to OpenKeychain/src/main/res/raw-it-rIT/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-it-rIT/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-it-rIT/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-it-rIT/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html b/OpenKeychain/src/main/res/raw-it-rIT/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-it-rIT/help_start.html rename to OpenKeychain/src/main/res/raw-it-rIT/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-it-rIT/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-it-rIT/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-it-rIT/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_about.html b/OpenKeychain/src/main/res/raw-ja/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ja/help_about.html rename to OpenKeychain/src/main/res/raw-ja/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html b/OpenKeychain/src/main/res/raw-ja/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ja/help_changelog.html rename to OpenKeychain/src/main/res/raw-ja/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ja/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-ja/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/help_start.html b/OpenKeychain/src/main/res/raw-ja/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ja/help_start.html rename to OpenKeychain/src/main/res/raw-ja/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-ja/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ja/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-ja/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_about.html rename to OpenKeychain/src/main/res/raw-nl-rNL/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_changelog.html rename to OpenKeychain/src/main/res/raw-nl-rNL/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-nl-rNL/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html b/OpenKeychain/src/main/res/raw-nl-rNL/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-nl-rNL/help_start.html rename to OpenKeychain/src/main/res/raw-nl-rNL/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-nl-rNL/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-nl-rNL/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-nl-rNL/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_about.html b/OpenKeychain/src/main/res/raw-pl/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pl/help_about.html rename to OpenKeychain/src/main/res/raw-pl/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html b/OpenKeychain/src/main/res/raw-pl/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pl/help_changelog.html rename to OpenKeychain/src/main/res/raw-pl/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pl/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-pl/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/help_start.html b/OpenKeychain/src/main/res/raw-pl/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pl/help_start.html rename to OpenKeychain/src/main/res/raw-pl/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pl/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-pl/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pl/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-pl/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_about.html rename to OpenKeychain/src/main/res/raw-pt-rBR/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_changelog.html rename to OpenKeychain/src/main/res/raw-pt-rBR/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-pt-rBR/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html b/OpenKeychain/src/main/res/raw-pt-rBR/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pt-rBR/help_start.html rename to OpenKeychain/src/main/res/raw-pt-rBR/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-pt-rBR/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-pt-rBR/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-pt-rBR/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_about.html b/OpenKeychain/src/main/res/raw-ru/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ru/help_about.html rename to OpenKeychain/src/main/res/raw-ru/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html b/OpenKeychain/src/main/res/raw-ru/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ru/help_changelog.html rename to OpenKeychain/src/main/res/raw-ru/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ru/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-ru/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/help_start.html b/OpenKeychain/src/main/res/raw-ru/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ru/help_start.html rename to OpenKeychain/src/main/res/raw-ru/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-ru/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-ru/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-ru/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-ru/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_about.html rename to OpenKeychain/src/main/res/raw-sl-rSI/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_changelog.html rename to OpenKeychain/src/main/res/raw-sl-rSI/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-sl-rSI/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html b/OpenKeychain/src/main/res/raw-sl-rSI/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-sl-rSI/help_start.html rename to OpenKeychain/src/main/res/raw-sl-rSI/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-sl-rSI/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-sl-rSI/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-sl-rSI/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_about.html b/OpenKeychain/src/main/res/raw-tr/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-tr/help_about.html rename to OpenKeychain/src/main/res/raw-tr/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html b/OpenKeychain/src/main/res/raw-tr/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-tr/help_changelog.html rename to OpenKeychain/src/main/res/raw-tr/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-tr/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-tr/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/help_start.html b/OpenKeychain/src/main/res/raw-tr/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-tr/help_start.html rename to OpenKeychain/src/main/res/raw-tr/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-tr/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-tr/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-tr/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_about.html b/OpenKeychain/src/main/res/raw-uk/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-uk/help_about.html rename to OpenKeychain/src/main/res/raw-uk/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html b/OpenKeychain/src/main/res/raw-uk/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-uk/help_changelog.html rename to OpenKeychain/src/main/res/raw-uk/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-uk/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-uk/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/help_start.html b/OpenKeychain/src/main/res/raw-uk/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-uk/help_start.html rename to OpenKeychain/src/main/res/raw-uk/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-uk/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-uk/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-uk/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-uk/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_about.html rename to OpenKeychain/src/main/res/raw-zh-rTW/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_changelog.html rename to OpenKeychain/src/main/res/raw-zh-rTW/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-zh-rTW/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_start.html b/OpenKeychain/src/main/res/raw-zh-rTW/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh-rTW/help_start.html rename to OpenKeychain/src/main/res/raw-zh-rTW/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh-rTW/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-zh-rTW/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh-rTW/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-zh-rTW/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_about.html b/OpenKeychain/src/main/res/raw-zh/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh/help_about.html rename to OpenKeychain/src/main/res/raw-zh/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html b/OpenKeychain/src/main/res/raw-zh/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh/help_changelog.html rename to OpenKeychain/src/main/res/raw-zh/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html b/OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw-zh/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/help_start.html b/OpenKeychain/src/main/res/raw-zh/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh/help_start.html rename to OpenKeychain/src/main/res/raw-zh/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html b/OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw-zh/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw-zh/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/raw/help_about.html b/OpenKeychain/src/main/res/raw/help_about.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw/help_about.html rename to OpenKeychain/src/main/res/raw/help_about.html diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenKeychain/src/main/res/raw/help_changelog.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw/help_changelog.html rename to OpenKeychain/src/main/res/raw/help_changelog.html diff --git a/OpenPGP-Keychain/src/main/res/raw/help_faq.html b/OpenKeychain/src/main/res/raw/help_faq.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw/help_faq.html rename to OpenKeychain/src/main/res/raw/help_faq.html diff --git a/OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html b/OpenKeychain/src/main/res/raw/help_nfc_beam.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw/help_nfc_beam.html rename to OpenKeychain/src/main/res/raw/help_nfc_beam.html diff --git a/OpenPGP-Keychain/src/main/res/raw/help_start.html b/OpenKeychain/src/main/res/raw/help_start.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw/help_start.html rename to OpenKeychain/src/main/res/raw/help_start.html diff --git a/OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html b/OpenKeychain/src/main/res/raw/nfc_beam_share.html similarity index 100% rename from OpenPGP-Keychain/src/main/res/raw/nfc_beam_share.html rename to OpenKeychain/src/main/res/raw/nfc_beam_share.html diff --git a/OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml b/OpenKeychain/src/main/res/values-cs-rCZ/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-cs-rCZ/strings.xml rename to OpenKeychain/src/main/res/values-cs-rCZ/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-de/strings.xml b/OpenKeychain/src/main/res/values-de/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-de/strings.xml rename to OpenKeychain/src/main/res/values-de/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-el/strings.xml b/OpenKeychain/src/main/res/values-el/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-el/strings.xml rename to OpenKeychain/src/main/res/values-el/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml b/OpenKeychain/src/main/res/values-es-rCO/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-es-rCO/strings.xml rename to OpenKeychain/src/main/res/values-es-rCO/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-es/strings.xml b/OpenKeychain/src/main/res/values-es/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-es/strings.xml rename to OpenKeychain/src/main/res/values-es/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-et/strings.xml b/OpenKeychain/src/main/res/values-et/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-et/strings.xml rename to OpenKeychain/src/main/res/values-et/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml b/OpenKeychain/src/main/res/values-fa-rIR/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-fa-rIR/strings.xml rename to OpenKeychain/src/main/res/values-fa-rIR/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-fr/strings.xml b/OpenKeychain/src/main/res/values-fr/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-fr/strings.xml rename to OpenKeychain/src/main/res/values-fr/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml b/OpenKeychain/src/main/res/values-it-rIT/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-it-rIT/strings.xml rename to OpenKeychain/src/main/res/values-it-rIT/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-ja/strings.xml b/OpenKeychain/src/main/res/values-ja/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-ja/strings.xml rename to OpenKeychain/src/main/res/values-ja/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-large/dimens.xml b/OpenKeychain/src/main/res/values-large/dimens.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-large/dimens.xml rename to OpenKeychain/src/main/res/values-large/dimens.xml diff --git a/OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml b/OpenKeychain/src/main/res/values-nl-rNL/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-nl-rNL/strings.xml rename to OpenKeychain/src/main/res/values-nl-rNL/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-pl/strings.xml b/OpenKeychain/src/main/res/values-pl/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-pl/strings.xml rename to OpenKeychain/src/main/res/values-pl/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml b/OpenKeychain/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-pt-rBR/strings.xml rename to OpenKeychain/src/main/res/values-pt-rBR/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-ru/strings.xml b/OpenKeychain/src/main/res/values-ru/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-ru/strings.xml rename to OpenKeychain/src/main/res/values-ru/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml b/OpenKeychain/src/main/res/values-sl-rSI/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-sl-rSI/strings.xml rename to OpenKeychain/src/main/res/values-sl-rSI/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-tr/strings.xml b/OpenKeychain/src/main/res/values-tr/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-tr/strings.xml rename to OpenKeychain/src/main/res/values-tr/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-uk/strings.xml b/OpenKeychain/src/main/res/values-uk/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-uk/strings.xml rename to OpenKeychain/src/main/res/values-uk/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-v14/styles.xml b/OpenKeychain/src/main/res/values-v14/styles.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-v14/styles.xml rename to OpenKeychain/src/main/res/values-v14/styles.xml diff --git a/OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml b/OpenKeychain/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-zh-rTW/strings.xml rename to OpenKeychain/src/main/res/values-zh-rTW/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values-zh/strings.xml b/OpenKeychain/src/main/res/values-zh/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values-zh/strings.xml rename to OpenKeychain/src/main/res/values-zh/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values/arrays.xml b/OpenKeychain/src/main/res/values/arrays.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values/arrays.xml rename to OpenKeychain/src/main/res/values/arrays.xml diff --git a/OpenPGP-Keychain/src/main/res/values/attr.xml b/OpenKeychain/src/main/res/values/attr.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values/attr.xml rename to OpenKeychain/src/main/res/values/attr.xml diff --git a/OpenPGP-Keychain/src/main/res/values/colors.xml b/OpenKeychain/src/main/res/values/colors.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values/colors.xml rename to OpenKeychain/src/main/res/values/colors.xml diff --git a/OpenPGP-Keychain/src/main/res/values/dimens.xml b/OpenKeychain/src/main/res/values/dimens.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values/dimens.xml rename to OpenKeychain/src/main/res/values/dimens.xml diff --git a/OpenPGP-Keychain/src/main/res/values/ids.xml b/OpenKeychain/src/main/res/values/ids.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values/ids.xml rename to OpenKeychain/src/main/res/values/ids.xml diff --git a/OpenPGP-Keychain/src/main/res/values/static_strings.xml b/OpenKeychain/src/main/res/values/static_strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values/static_strings.xml rename to OpenKeychain/src/main/res/values/static_strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values/strings.xml rename to OpenKeychain/src/main/res/values/strings.xml diff --git a/OpenPGP-Keychain/src/main/res/values/styles.xml b/OpenKeychain/src/main/res/values/styles.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/values/styles.xml rename to OpenKeychain/src/main/res/values/styles.xml diff --git a/OpenPGP-Keychain/src/main/res/xml/adv_preferences.xml b/OpenKeychain/src/main/res/xml/adv_preferences.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/xml/adv_preferences.xml rename to OpenKeychain/src/main/res/xml/adv_preferences.xml diff --git a/OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml b/OpenKeychain/src/main/res/xml/gen_preferences.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/xml/gen_preferences.xml rename to OpenKeychain/src/main/res/xml/gen_preferences.xml diff --git a/OpenPGP-Keychain/src/main/res/xml/preference_headers.xml b/OpenKeychain/src/main/res/xml/preference_headers.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/xml/preference_headers.xml rename to OpenKeychain/src/main/res/xml/preference_headers.xml diff --git a/OpenPGP-Keychain/src/main/res/xml/preference_headers_legacy.xml b/OpenKeychain/src/main/res/xml/preference_headers_legacy.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/xml/preference_headers_legacy.xml rename to OpenKeychain/src/main/res/xml/preference_headers_legacy.xml diff --git a/OpenPGP-Keychain/src/main/res/xml/searchable_public_keys.xml b/OpenKeychain/src/main/res/xml/searchable_public_keys.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/xml/searchable_public_keys.xml rename to OpenKeychain/src/main/res/xml/searchable_public_keys.xml diff --git a/OpenPGP-Keychain/src/main/res/xml/searchable_secret_keys.xml b/OpenKeychain/src/main/res/xml/searchable_secret_keys.xml similarity index 100% rename from OpenPGP-Keychain/src/main/res/xml/searchable_secret_keys.xml rename to OpenKeychain/src/main/res/xml/searchable_secret_keys.xml diff --git a/OpenPGP-Keychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java similarity index 100% rename from OpenPGP-Keychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/PgpKeyOperationTest.java diff --git a/OpenPGP-Keychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java b/OpenKeychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java similarity index 100% rename from OpenPGP-Keychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java rename to OpenKeychain/src/test/java/org/sufficientlysecure/keychain/RobolectricGradleTestRunner.java diff --git a/settings.gradle b/settings.gradle index f6ba5c517..164ddf4b0 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,6 @@ -include ':OpenPGP-Keychain' -include ':OpenPGP-Keychain-API:libraries:openpgp-api-library' -include ':OpenPGP-Keychain-API:libraries:openkeychain-api-library' +include ':OpenKeychain' +include ':OpenKeychain-API:libraries:openpgp-api-library' +include ':OpenKeychain-API:libraries:openkeychain-api-library' include ':libraries:HtmlTextView' include ':libraries:StickyListHeaders:library' include ':libraries:AndroidBootstrap'