diff --git a/APG-API-Demo/.gitignore b/OpenPGP-Keychain-API-Demo/.gitignore similarity index 100% rename from APG-API-Demo/.gitignore rename to OpenPGP-Keychain-API-Demo/.gitignore diff --git a/APG-API-Demo/AndroidManifest.xml b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml similarity index 85% rename from APG-API-Demo/AndroidManifest.xml rename to OpenPGP-Keychain-API-Demo/AndroidManifest.xml index 812b5d45e..9d735860c 100644 --- a/APG-API-Demo/AndroidManifest.xml +++ b/OpenPGP-Keychain-API-Demo/AndroidManifest.xml @@ -1,11 +1,11 @@ - - + + keysStrings; - private IApgKeyService service = null; + private IKeychainKeyService service = null; private ServiceConnection svcConn = new ServiceConnection() { public void onServiceConnected(ComponentName className, IBinder binder) { - service = IApgKeyService.Stub.asInterface(binder); + service = IKeychainKeyService.Stub.asInterface(binder); } public void onServiceDisconnected(ComponentName className) { @@ -69,15 +70,16 @@ public class AidlDemoActivity2 extends Activity { mKeyringsTextView = (TextView) findViewById(R.id.aidl_demo_keyrings); - mApgIntentHelper = new ApgIntentHelper(mActivity); - mApgData = new ApgData(); + mKeychainIntentHelper = new KeychainIntentHelper(mActivity); + mKeychainData = new KeychainData(); - bindService(new Intent(IApgKeyService.class.getName()), svcConn, Context.BIND_AUTO_CREATE); + bindService(new Intent(IKeychainKeyService.class.getName()), svcConn, + Context.BIND_AUTO_CREATE); } public void getKeyringsStringsOnClick(View view) { try { - service.getPublicKeyRings(mApgData.getPublicKeys(), true, getKeyringsHandler); + service.getPublicKeyRings(mKeychainData.getPublicKeys(), true, getKeyringsHandler); } catch (RemoteException e) { exceptionImplementation(-1, e.toString()); } @@ -85,7 +87,7 @@ public class AidlDemoActivity2 extends Activity { public void getKeyringsBytesOnClick(View view) { try { - service.getPublicKeyRings(mApgData.getPublicKeys(), false, getKeyringsHandler); + service.getPublicKeyRings(mKeychainData.getPublicKeys(), false, getKeyringsHandler); } catch (RemoteException e) { exceptionImplementation(-1, e.toString()); } @@ -115,7 +117,7 @@ public class AidlDemoActivity2 extends Activity { builder.setTitle("Exception!").setMessage(error).setPositiveButton("OK", null).show(); } - private final IApgGetKeyringsHandler.Stub getKeyringsHandler = new IApgGetKeyringsHandler.Stub() { + private final IKeychainGetKeyringsHandler.Stub getKeyringsHandler = new IKeychainGetKeyringsHandler.Stub() { @Override public void onException(final int exceptionId, final String message) throws RemoteException { @@ -147,13 +149,14 @@ public class AidlDemoActivity2 extends Activity { }; public void selectEncryptionKeysOnClick(View view) { - mApgIntentHelper.selectPublicKeys("user@example.com"); + mKeychainIntentHelper.selectPublicKeys("user@example.com"); } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - // this updates the mApgData object to the result of the methods - boolean result = mApgIntentHelper.onActivityResult(requestCode, resultCode, data, mApgData); + // this updates the mKeychainData object to the result of the methods + boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data, + mKeychainData); if (result) { updateView(); } diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java similarity index 96% rename from APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java rename to OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java index 5e2108c50..322a446b5 100644 --- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/BaseActivity.java +++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/BaseActivity.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.thialfihar.android.apg.demo; +package org.sufficientlysecure.keychain.demo; -import org.thialfihar.android.apg.demo.R; +import org.sufficientlysecure.keychain.demo.R; import android.app.Activity; import android.content.Intent; diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/ContentProviderDemoActivity.java similarity index 75% rename from APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java rename to OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/ContentProviderDemoActivity.java index 892b41429..c69f839d1 100644 --- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/ContentProviderDemoActivity.java +++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/ContentProviderDemoActivity.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package org.thialfihar.android.apg.demo; +package org.sufficientlysecure.keychain.demo; import java.util.Arrays; -import org.thialfihar.android.apg.demo.R; -import org.thialfihar.android.apg.integration.ApgContentProviderHelper; +import org.sufficientlysecure.keychain.demo.R; +import org.sufficientlysecure.keychain.integration.KeychainContentProviderHelper; import android.app.Activity; import android.os.Bundle; @@ -33,7 +33,7 @@ public class ContentProviderDemoActivity extends Activity { TextView mCiphertextTextView; TextView mDataTextView; - ApgContentProviderHelper mApgContentProviderHelper; + KeychainContentProviderHelper mKeychainContentProviderHelper; /** * Instantiate View for this Activity @@ -48,16 +48,16 @@ public class ContentProviderDemoActivity extends Activity { mOutputTextView = (TextView) findViewById(R.id.content_provider_output); - mApgContentProviderHelper = new ApgContentProviderHelper(mActivity); + mKeychainContentProviderHelper = new KeychainContentProviderHelper(mActivity); } public void test1OnClick(View view) { - long[] test = mApgContentProviderHelper.getPublicKeyringIdsByEmail("user@example.com"); + long[] test = mKeychainContentProviderHelper.getPublicKeyringIdsByEmail("user@example.com"); mOutputTextView.setText(Arrays.toString(test)); } public void test2OnClick(View view) { - boolean test = mApgContentProviderHelper.hasPublicKeyringByEmail("user@example.com"); + boolean test = mKeychainContentProviderHelper.hasPublicKeyringByEmail("user@example.com"); if (test) { mOutputTextView.setText("true"); } else { diff --git a/APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/IntentDemoActivity.java similarity index 56% rename from APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java rename to OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/IntentDemoActivity.java index b789dccb1..0fe3821b6 100644 --- a/APG-API-Demo/src/org/thialfihar/android/apg/demo/IntentDemoActivity.java +++ b/OpenPGP-Keychain-API-Demo/src/org/sufficientlysecure/keychain/demo/IntentDemoActivity.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package org.thialfihar.android.apg.demo; +package org.sufficientlysecure.keychain.demo; -import org.thialfihar.android.apg.demo.R; -import org.thialfihar.android.apg.integration.ApgData; -import org.thialfihar.android.apg.integration.ApgIntentHelper; +import org.sufficientlysecure.keychain.demo.R; +import org.sufficientlysecure.keychain.integration.KeychainData; +import org.sufficientlysecure.keychain.integration.KeychainIntentHelper; import android.app.Activity; import android.content.Intent; @@ -33,8 +33,8 @@ public class IntentDemoActivity extends Activity { TextView mCiphertextTextView; TextView mDataTextView; - ApgIntentHelper mApgIntentHelper; - ApgData mApgData; + KeychainIntentHelper mKeychainIntentHelper; + KeychainData mKeychainData; /** * Instantiate View for this Activity @@ -51,45 +51,46 @@ public class IntentDemoActivity extends Activity { mCiphertextTextView = (TextView) findViewById(R.id.intent_demo_ciphertext); mDataTextView = (TextView) findViewById(R.id.intent_demo_data); - mApgIntentHelper = new ApgIntentHelper(mActivity); - mApgData = new ApgData(); + mKeychainIntentHelper = new KeychainIntentHelper(mActivity); + mKeychainData = new KeychainData(); } public void createNewKeyOnClick(View view) { - // mApgIntentHelper.createNewKey(); - mApgIntentHelper.createNewKey("test ", true, true); + // mKeychainIntentHelper.createNewKey(); + mKeychainIntentHelper.createNewKey("test ", true, true); } public void selectSecretKeyOnClick(View view) { - mApgIntentHelper.selectSecretKey(); + mKeychainIntentHelper.selectSecretKey(); } public void selectEncryptionKeysOnClick(View view) { - mApgIntentHelper.selectPublicKeys("user@example.com"); + mKeychainIntentHelper.selectPublicKeys("user@example.com"); } public void encryptOnClick(View view) { - mApgIntentHelper.encrypt(mMessageTextView.getText().toString(), mApgData.getPublicKeys(), - mApgData.getSecretKeyId(), false); + mKeychainIntentHelper.encrypt(mMessageTextView.getText().toString(), + mKeychainData.getPublicKeys(), mKeychainData.getSecretKeyId(), false); } public void encryptAndReturnOnClick(View view) { - mApgIntentHelper.encrypt(mMessageTextView.getText().toString(), mApgData.getPublicKeys(), - mApgData.getSecretKeyId(), true); + mKeychainIntentHelper.encrypt(mMessageTextView.getText().toString(), + mKeychainData.getPublicKeys(), mKeychainData.getSecretKeyId(), true); } public void decryptOnClick(View view) { - mApgIntentHelper.decrypt(mCiphertextTextView.getText().toString(), false); + mKeychainIntentHelper.decrypt(mCiphertextTextView.getText().toString(), false); } public void decryptAndReturnOnClick(View view) { - mApgIntentHelper.decrypt(mCiphertextTextView.getText().toString(), true); + mKeychainIntentHelper.decrypt(mCiphertextTextView.getText().toString(), true); } @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { - // this updates the mApgData object to the result of the methods - boolean result = mApgIntentHelper.onActivityResult(requestCode, resultCode, data, mApgData); + // this updates the mKeychainData object to the result of the methods + boolean result = mKeychainIntentHelper.onActivityResult(requestCode, resultCode, data, + mKeychainData); if (result) { updateView(); } @@ -99,12 +100,12 @@ public class IntentDemoActivity extends Activity { } private void updateView() { - if (mApgData.getDecryptedData() != null) { - mMessageTextView.setText(mApgData.getDecryptedData()); + if (mKeychainData.getDecryptedData() != null) { + mMessageTextView.setText(mKeychainData.getDecryptedData()); } - if (mApgData.getEncryptedData() != null) { - mCiphertextTextView.setText(mApgData.getEncryptedData()); + if (mKeychainData.getEncryptedData() != null) { + mCiphertextTextView.setText(mKeychainData.getEncryptedData()); } - mDataTextView.setText(mApgData.toString()); + mDataTextView.setText(mKeychainData.toString()); } } diff --git a/APG-API-Lib/.gitignore b/OpenPGP-Keychain-API-Lib/.gitignore similarity index 100% rename from APG-API-Lib/.gitignore rename to OpenPGP-Keychain-API-Lib/.gitignore diff --git a/APG-API-Lib/AndroidManifest.xml b/OpenPGP-Keychain-API-Lib/AndroidManifest.xml similarity index 82% rename from APG-API-Lib/AndroidManifest.xml rename to OpenPGP-Keychain-API-Lib/AndroidManifest.xml index 3d99ae603..afdcaaedf 100644 --- a/APG-API-Lib/AndroidManifest.xml +++ b/OpenPGP-Keychain-API-Lib/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/APG-API-Lib/build.xml b/OpenPGP-Keychain-API-Lib/build.xml similarity index 100% rename from APG-API-Lib/build.xml rename to OpenPGP-Keychain-API-Lib/build.xml diff --git a/APG-API-Lib/libs/android-support-v4.jar b/OpenPGP-Keychain-API-Lib/libs/android-support-v4.jar similarity index 100% rename from APG-API-Lib/libs/android-support-v4.jar rename to OpenPGP-Keychain-API-Lib/libs/android-support-v4.jar diff --git a/APG-API-Lib/proguard-project.txt b/OpenPGP-Keychain-API-Lib/proguard-project.txt similarity index 100% rename from APG-API-Lib/proguard-project.txt rename to OpenPGP-Keychain-API-Lib/proguard-project.txt diff --git a/APG-API-Lib/project.properties b/OpenPGP-Keychain-API-Lib/project.properties similarity index 100% rename from APG-API-Lib/project.properties rename to OpenPGP-Keychain-API-Lib/project.properties diff --git a/APG-API-Lib/res/.readme b/OpenPGP-Keychain-API-Lib/res/.readme similarity index 100% rename from APG-API-Lib/res/.readme rename to OpenPGP-Keychain-API-Lib/res/.readme diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java similarity index 75% rename from APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java index 7745f92d3..51998a33e 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/Constants.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/Constants.java @@ -14,14 +14,12 @@ * limitations under the License. */ -package org.thialfihar.android.apg.integration; +package org.sufficientlysecure.keychain.integration; public class Constants { - public static final String NAME = "apg"; + public static final String TAG = "Keychain Integration Lib"; - public static final String TAG = "APG Integration Lib"; - - public static final String APG_PACKAGE_NAME = "org.thialfihar.android.apg"; + public static final String KEYCHAIN_PACKAGE_NAME = "org.sufficientlysecure.keychain"; public static final int MIN_REQUIRED_VERSION = 50; } diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgContentProviderHelper.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainContentProviderHelper.java similarity index 97% rename from APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgContentProviderHelper.java rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainContentProviderHelper.java index 39d79d494..bc2a4ad7a 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgContentProviderHelper.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainContentProviderHelper.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.thialfihar.android.apg.integration; +package org.sufficientlysecure.keychain.integration; import android.content.ContentUris; import android.content.Context; @@ -23,8 +23,8 @@ import android.database.Cursor; import android.net.Uri; import android.widget.Toast; -public class ApgContentProviderHelper { - public static final String AUTHORITY = Constants.APG_PACKAGE_NAME; +public class KeychainContentProviderHelper { + public static final String AUTHORITY = Constants.KEYCHAIN_PACKAGE_NAME; public static final Uri CONTENT_URI_PUBLIC_KEY_RING_BY_KEY_ID = Uri.parse("content://" + AUTHORITY + "/key_rings/public/key_id/"); @@ -42,7 +42,7 @@ public class ApgContentProviderHelper { private Context mContext; - public ApgContentProviderHelper(Context context) { + public KeychainContentProviderHelper(Context context) { this.mContext = context; } diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainData.java similarity index 96% rename from APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainData.java index 317f2c1c4..619909c65 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgData.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainData.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package org.thialfihar.android.apg.integration; +package org.sufficientlysecure.keychain.integration; import java.io.Serializable; import java.util.Arrays; -public class ApgData implements Serializable { +public class KeychainData implements Serializable { private static final long serialVersionUID = 6314045536270848410L; protected long[] mPublicKeyIds = null; protected String[] mPublicUserIds = null; diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java similarity index 97% rename from APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java index d6cdc60ab..756dd974b 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelper.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelper.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package org.thialfihar.android.apg.integration; +package org.sufficientlysecure.keychain.integration; import android.app.Activity; import android.content.ActivityNotFoundException; import android.content.Intent; import android.widget.Toast; -public class ApgIntentHelper { +public class KeychainIntentHelper { public static final String APG_INTENT_PREFIX = "org.thialfihar.android.apg.intent."; @@ -128,7 +128,7 @@ public class ApgIntentHelper { private Activity activity; - public ApgIntentHelper(Activity activity) { + public KeychainIntentHelper(Activity activity) { this.activity = activity; } @@ -343,7 +343,7 @@ public class ApgIntentHelper { * @param data * @return handled or not */ - public boolean onActivityResult(int requestCode, int resultCode, Intent data, ApgData apgData) { + public boolean onActivityResult(int requestCode, int resultCode, Intent data, KeychainData apgData) { switch (requestCode) { case CREATE_KEY: @@ -421,13 +421,13 @@ public class ApgIntentHelper { * ApgData with encryption keys and signature keys preselected * @return true when activity was found and executed successfully */ - public boolean selectPublicKeys(String emails, ApgData apgData) { + public boolean selectPublicKeys(String emails, KeychainData apgData) { Intent intent = new Intent(ACTION_SELECT_PUBLIC_KEYS); intent.putExtra(EXTRA_INTENT_VERSION, INTENT_VERSION); long[] initialKeyIds = null; if (apgData == null || !apgData.hasPublicKeys()) { - ApgContentProviderHelper cPHelper = new ApgContentProviderHelper(activity); + KeychainContentProviderHelper cPHelper = new KeychainContentProviderHelper(activity); initialKeyIds = cPHelper.getPublicKeyringIdsByEmail(emails); } else { diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperSupportV4.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperSupportV4.java similarity index 85% rename from APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperSupportV4.java rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperSupportV4.java index 8a64a925a..c8891287b 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperSupportV4.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperSupportV4.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.thialfihar.android.apg.integration; +package org.sufficientlysecure.keychain.integration; import android.content.Intent; import android.support.v4.app.Fragment; @@ -22,7 +22,7 @@ import android.support.v4.app.Fragment; /** * ApgIntentHelper for the V4 Android compatibility package. */ -public final class ApgIntentHelperSupportV4 extends ApgIntentHelper { +public final class KeychainIntentHelperSupportV4 extends KeychainIntentHelper { private final Fragment fragment; @@ -30,7 +30,7 @@ public final class ApgIntentHelperSupportV4 extends ApgIntentHelper { * @param fragment * Fragment to handle activity response. */ - public ApgIntentHelperSupportV4(Fragment fragment) { + public KeychainIntentHelperSupportV4(Fragment fragment) { super(fragment.getActivity()); this.fragment = fragment; } diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperV30.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperV30.java similarity index 87% rename from APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperV30.java rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperV30.java index 4c1fbea40..5ecf0e4f7 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgIntentHelperV30.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainIntentHelperV30.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.thialfihar.android.apg.integration; +package org.sufficientlysecure.keychain.integration; import android.annotation.TargetApi; import android.app.Fragment; @@ -25,7 +25,7 @@ import android.os.Build; * ApgIntentHelper for Android version 3.0 and beyond. */ @TargetApi(Build.VERSION_CODES.HONEYCOMB) -public final class ApgIntentHelperV30 extends ApgIntentHelper { +public final class KeychainIntentHelperV30 extends KeychainIntentHelper { private final Fragment fragment; @@ -33,7 +33,7 @@ public final class ApgIntentHelperV30 extends ApgIntentHelper { * @param fragment * Fragment to handle activity response. */ - public ApgIntentHelperV30(Fragment fragment) { + public KeychainIntentHelperV30(Fragment fragment) { super(fragment.getActivity()); this.fragment = fragment; } diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainServiceHelper.java similarity index 87% rename from APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainServiceHelper.java index 3f71f9647..54e1f517a 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgServiceHelper.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainServiceHelper.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.thialfihar.android.apg.integration; +package org.sufficientlysecure.keychain.integration; import java.io.InputStream; import java.io.OutputStream; @@ -25,16 +25,16 @@ import android.content.Context; import android.net.Uri; import android.util.Log; -public class ApgServiceHelper { +public class KeychainServiceHelper { - private final static String BLOB_URI = "content://org.thialfihar.android.apg.provider.apgserviceblobprovider"; + private final static String BLOB_URI = "content://org.sufficientlysecure.keychain.provider.apgserviceblobprovider"; private Context context; - public ApgServiceHelper(Context context) { + public KeychainServiceHelper(Context context) { this.context = context; } - + /** * Set up binary data to en/decrypt * @@ -67,7 +67,7 @@ public class ApgServiceHelper { Log.e(Constants.TAG, "... error on writing buffer", e); } -// mArgs.putString("BLOB", contentUri.toString()); + // mArgs.putString("BLOB", contentUri.toString()); } /** @@ -90,7 +90,7 @@ public class ApgServiceHelper { ContentResolver cr = context.getContentResolver(); InputStream in = null; try { -// in = cr.openInputStream(Uri.parse(mArgs.getString("BLOB"))); + // in = cr.openInputStream(Uri.parse(mArgs.getString("BLOB"))); } catch (Exception e) { Log.e(Constants.TAG, "Could not return blob in result", e); } diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgUtil.java b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainUtil.java similarity index 83% rename from APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgUtil.java rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainUtil.java index a8a01f913..19d3850d7 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/integration/ApgUtil.java +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/integration/KeychainUtil.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.thialfihar.android.apg.integration; +package org.sufficientlysecure.keychain.integration; import android.content.Context; import android.content.pm.PackageInfo; @@ -23,23 +23,24 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.widget.Toast; -public class ApgUtil { +public class KeychainUtil { /** - * Check whether APG is installed and at a high enough version. + * Check whether OpenPGP Keychain is installed and at a high enough version. * * @param context * @return whether a suitable version of APG was found */ public boolean isApgAvailable(Context context) { try { - PackageInfo pi = context.getPackageManager().getPackageInfo(Constants.APG_PACKAGE_NAME, - 0); + PackageInfo pi = context.getPackageManager().getPackageInfo( + Constants.KEYCHAIN_PACKAGE_NAME, 0); if (pi.versionCode >= Constants.MIN_REQUIRED_VERSION) { return true; } else { - Toast.makeText(context, - "This APG version is not supported! Please update to a newer one!", + Toast.makeText( + context, + "This OpenPGP Keychain version is not supported! Please update to a newer one!", Toast.LENGTH_LONG).show(); } } catch (NameNotFoundException e) { diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgApiService.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl similarity index 85% rename from APG-API-Lib/src/org/thialfihar/android/apg/service/IApgApiService.aidl rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl index 277ce6722..ac8327b8e 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/service/IApgApiService.aidl +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainApiService.aidl @@ -14,17 +14,17 @@ * limitations under the License. */ -package org.thialfihar.android.apg.service; +package org.sufficientlysecure.keychain.service; -import org.thialfihar.android.apg.service.handler.IApgEncryptHandler; -import org.thialfihar.android.apg.service.handler.IApgDecryptHandler; -import org.thialfihar.android.apg.service.handler.IApgGetDecryptionKeyIdHandler; +import org.sufficientlysecure.keychain.service.handler.IKeychainEncryptHandler; +import org.sufficientlysecure.keychain.service.handler.IKeychainDecryptHandler; +import org.sufficientlysecure.keychain.service.handler.IKeychainGetDecryptionKeyIdHandler; /** * All methods are oneway, which means they are asynchronous and non-blocking. * Results are returned into given Handler, which has to be implemented on client side. */ -interface IApgApiService { +interface IKeychainApiService { /** * Encrypt @@ -45,12 +45,12 @@ interface IApgApiService { * 7: AES-128, 8: AES-192, 9: AES-256, 4: Blowfish, 10: Twofish, 3: CAST5, * 6: DES, 2: Triple DES, 1: IDEA * @param handler - * Results are returned to this IApgEncryptDecryptHandler Handler + * Results are returned to this IKeychainEncryptDecryptHandler Handler * to onSuccessEncrypt(in byte[] output), after successful encryption */ oneway void encryptAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor, in int compression, in long[] encryptionKeyIds, in int symmetricEncryptionAlgorithm, - in IApgEncryptHandler handler); + in IKeychainEncryptHandler handler); /** * Same as encryptAsymmetric but using a passphrase for symmetric encryption @@ -60,7 +60,7 @@ interface IApgApiService { */ oneway void encryptSymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor, in int compression, in String encryptionPassphrase, in int symmetricEncryptionAlgorithm, - in IApgEncryptHandler handler); + in IKeychainEncryptHandler handler); /** * Encrypt and sign @@ -90,14 +90,14 @@ interface IApgApiService { * @param signaturePassphrase * Passphrase to unlock signature key * @param handler - * Results are returned to this IApgEncryptDecryptHandler Handler + * Results are returned to this IKeychainEncryptDecryptHandler Handler * to onSuccessEncrypt(in byte[] output), after successful encryption and signing */ oneway void encryptAndSignAsymmetric(in byte[] inputBytes, in String inputUri, in boolean useAsciiArmor, in int compression, in long[] encryptionKeyIds, in int symmetricEncryptionAlgorithm, in long signatureKeyId, in int signatureHashAlgorithm, in boolean signatureForceV3, in String signaturePassphrase, - in IApgEncryptHandler handler); + in IKeychainEncryptHandler handler); /** * Same as encryptAndSignAsymmetric but using a passphrase for symmetric encryption @@ -109,7 +109,7 @@ interface IApgApiService { in boolean useAsciiArmor, in int compression, in String encryptionPassphrase, in int symmetricEncryptionAlgorithm, in long signatureKeyId, in int signatureHashAlgorithm, in boolean signatureForceV3, in String signaturePassphrase, - in IApgEncryptHandler handler); + in IKeychainEncryptHandler handler); /** * Decrypts and verifies given input bytes. If no signature is present this method @@ -125,7 +125,7 @@ interface IApgApiService { * Handler where to return results to after successful encryption */ oneway void decryptAndVerifyAsymmetric(in byte[] inputBytes, in String inputUri, - in String keyPassphrase, in IApgDecryptHandler handler); + in String keyPassphrase, in IKeychainDecryptHandler handler); /** * Same as decryptAndVerifyAsymmetric but for symmetric decryption. @@ -134,13 +134,13 @@ interface IApgApiService { * Passphrase to decrypt */ oneway void decryptAndVerifySymmetric(in byte[] inputBytes, in String inputUri, - in String encryptionPassphrase, in IApgDecryptHandler handler); + in String encryptionPassphrase, in IKeychainDecryptHandler handler); /** * */ oneway void getDecryptionKeyId(in byte[] inputBytes, in String inputUri, - in IApgGetDecryptionKeyIdHandler handler); + in IKeychainGetDecryptionKeyIdHandler handler); } \ No newline at end of file diff --git a/APG/src/org/thialfihar/android/apg/service/IApgKeyService.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainKeyService.aidl similarity index 78% rename from APG/src/org/thialfihar/android/apg/service/IApgKeyService.aidl rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainKeyService.aidl index 12ecddc17..ecea2b8ff 100644 --- a/APG/src/org/thialfihar/android/apg/service/IApgKeyService.aidl +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/IKeychainKeyService.aidl @@ -14,19 +14,19 @@ * limitations under the License. */ -package org.thialfihar.android.apg.service; +package org.sufficientlysecure.keychain.service; -import org.thialfihar.android.apg.service.handler.IApgGetKeyringsHandler; +import org.sufficientlysecure.keychain.service.handler.IKeychainGetKeyringsHandler; /** * All methods are oneway, which means they are asynchronous and non-blocking. * Results are returned into given Handler, which has to be implemented on client side. */ -interface IApgKeyService { +interface IKeychainKeyService { oneway void getPublicKeyRings(in long[] masterKeyIds, in boolean asAsciiArmoredStringArray, - in IApgGetKeyringsHandler handler); + in IKeychainGetKeyringsHandler handler); oneway void getSecretKeyRings(in long[] masterKeyIds, in boolean asAsciiArmoredStringArray, - in IApgGetKeyringsHandler handler); + in IKeychainGetKeyringsHandler handler); } \ No newline at end of file diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgDecryptHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainDecryptHandler.aidl similarity index 91% rename from APG/src/org/thialfihar/android/apg/service/handler/IApgDecryptHandler.aidl rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainDecryptHandler.aidl index feb56bce6..31ead701d 100644 --- a/APG/src/org/thialfihar/android/apg/service/handler/IApgDecryptHandler.aidl +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainDecryptHandler.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.thialfihar.android.apg.service.handler; +package org.sufficientlysecure.keychain.service.handler; -interface IApgDecryptHandler { +interface IKeychainDecryptHandler { oneway void onSuccess(in byte[] outputBytes, in String outputUri, in boolean signature, in long signatureKeyId, in String signatureUserId, in boolean signatureSuccess, diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgEncryptHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainEncryptHandler.aidl similarity index 90% rename from APG/src/org/thialfihar/android/apg/service/handler/IApgEncryptHandler.aidl rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainEncryptHandler.aidl index be0317715..5b21a0613 100644 --- a/APG/src/org/thialfihar/android/apg/service/handler/IApgEncryptHandler.aidl +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainEncryptHandler.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.thialfihar.android.apg.service.handler; +package org.sufficientlysecure.keychain.service.handler; -interface IApgEncryptHandler { +interface IKeychainEncryptHandler { /** * Either output or streamUri is given. One of them is null * diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgGetDecryptionKeyIdHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetDecryptionKeyIdHandler.aidl similarity index 88% rename from APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgGetDecryptionKeyIdHandler.aidl rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetDecryptionKeyIdHandler.aidl index 020a80b99..2fff74a92 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgGetDecryptionKeyIdHandler.aidl +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetDecryptionKeyIdHandler.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.thialfihar.android.apg.service.handler; +package org.sufficientlysecure.keychain.service.handler; -interface IApgGetDecryptionKeyIdHandler { +interface IKeychainGetDecryptionKeyIdHandler { oneway void onSuccess(in long secretKeyId, in boolean symmetric); diff --git a/APG/src/org/thialfihar/android/apg/service/handler/IApgGetKeyringsHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetKeyringsHandler.aidl similarity index 90% rename from APG/src/org/thialfihar/android/apg/service/handler/IApgGetKeyringsHandler.aidl rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetKeyringsHandler.aidl index ffa9d0d2d..c3a7d1faf 100644 --- a/APG/src/org/thialfihar/android/apg/service/handler/IApgGetKeyringsHandler.aidl +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainGetKeyringsHandler.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.thialfihar.android.apg.service.handler; +package org.sufficientlysecure.keychain.service.handler; -interface IApgGetKeyringsHandler { +interface IKeychainGetKeyringsHandler { /** * Either outputBytes or outputString is given. One of them is null * diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgSignHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainSignHandler.aidl similarity index 90% rename from APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgSignHandler.aidl rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainSignHandler.aidl index cf91e8bc4..69badab4c 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgSignHandler.aidl +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainSignHandler.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.thialfihar.android.apg.service.handler; +package org.sufficientlysecure.keychain.service.handler; -interface IApgSignHandler { +interface IKeychainSignHandler { /** * Either output or streamUri is given. One of them is null * diff --git a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgVerifyHandler.aidl b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainVerifyHandler.aidl similarity index 90% rename from APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgVerifyHandler.aidl rename to OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainVerifyHandler.aidl index 6baaec758..aaa9a7f6a 100644 --- a/APG-API-Lib/src/org/thialfihar/android/apg/service/handler/IApgVerifyHandler.aidl +++ b/OpenPGP-Keychain-API-Lib/src/org/sufficientlysecure/keychain/service/handler/IKeychainVerifyHandler.aidl @@ -14,9 +14,9 @@ * limitations under the License. */ -package org.thialfihar.android.apg.service.handler; +package org.sufficientlysecure.keychain.service.handler; -interface IApgVerifyHandler { +interface IKeychainVerifyHandler { oneway void onSuccess(in boolean signature, in long signatureKeyId, in String signatureUserId, in boolean signatureSuccess, in boolean signatureUnknown); diff --git a/APG/.gitignore b/OpenPGP-Keychain/.gitignore similarity index 100% rename from APG/.gitignore rename to OpenPGP-Keychain/.gitignore diff --git a/APG/AndroidManifest.xml b/OpenPGP-Keychain/AndroidManifest.xml similarity index 82% rename from APG/AndroidManifest.xml rename to OpenPGP-Keychain/AndroidManifest.xml index 68e310423..68598df23 100644 --- a/APG/AndroidManifest.xml +++ b/OpenPGP-Keychain/AndroidManifest.xml @@ -16,7 +16,7 @@ limitations under the License. --> @@ -68,26 +68,26 @@ - - + + @@ -150,7 +150,7 @@ android:launchMode="singleTop" android:uiOptions="splitActionBarWhenNarrow" > - + @@ -168,7 +168,7 @@ android:label="@string/title_selectSignature" android:launchMode="singleTop" > - + @@ -189,10 +189,10 @@ - - - - + + + + @@ -216,9 +216,9 @@ - - - + + + @@ -299,14 +299,14 @@ android:configChanges="orientation|screenSize|keyboardHidden|keyboard" android:label="@string/title_signKey" /> - + @@ -314,9 +314,9 @@ - - - + + + @@ -365,12 +365,12 @@ - + @@ -381,13 +381,13 @@ - + - + - - + + @@ -397,15 +397,15 @@ android:label="@string/title_help" /> - + - + - + + android:readPermission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> + android:name="org.sufficientlysecure.keychain.provider.KeychainServiceBlobProvider" + android:authorities="org.sufficientlysecure.keychain.provider.apgserviceblobprovider" + android:permission="org.sufficientlysecure.keychain.permission.ACCESS_API" /> \ No newline at end of file diff --git a/APG/android-libs/ActionBarSherlock/.gitignore b/OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore similarity index 100% rename from APG/android-libs/ActionBarSherlock/.gitignore rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/.gitignore diff --git a/APG/android-libs/ActionBarSherlock/AndroidManifest.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/AndroidManifest.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/AndroidManifest.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/AndroidManifest.xml diff --git a/APG/android-libs/ActionBarSherlock/README.md b/OpenPGP-Keychain/android-libs/ActionBarSherlock/README.md similarity index 100% rename from APG/android-libs/ActionBarSherlock/README.md rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/README.md diff --git a/APG/android-libs/ActionBarSherlock/build.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/build.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/build.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/build.xml diff --git a/APG/android-libs/ActionBarSherlock/libs/android-support-v4.jar b/OpenPGP-Keychain/android-libs/ActionBarSherlock/libs/android-support-v4.jar similarity index 100% rename from APG/android-libs/ActionBarSherlock/libs/android-support-v4.jar rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/libs/android-support-v4.jar diff --git a/APG/android-libs/ActionBarSherlock/pom.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/pom.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/pom.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/pom.xml diff --git a/APG/android-libs/ActionBarSherlock/proguard-project.txt b/OpenPGP-Keychain/android-libs/ActionBarSherlock/proguard-project.txt similarity index 100% rename from APG/android-libs/ActionBarSherlock/proguard-project.txt rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/proguard-project.txt diff --git a/APG/android-libs/ActionBarSherlock/project.properties b/OpenPGP-Keychain/android-libs/ActionBarSherlock/project.properties similarity index 100% rename from APG/android-libs/ActionBarSherlock/project.properties rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/project.properties diff --git a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_disable_only_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/color/abs__primary_text_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_share_pack_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_solid_shadow_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ab_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__cab_background_top_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__dialog_full_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_ab_back_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_cab_done_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_disabled.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_normal.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_clear_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_go_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_menu_share_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__ic_voice_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_activated_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_divider_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_focused_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_longpressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_bg_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_primary_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__progress_secondary_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_inner_holo.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_48_outer_holo.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_focused_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_selected_pressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-hdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_share_pack_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_solid_shadow_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ab_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__cab_background_top_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__dialog_full_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_ab_back_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_cab_done_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_disabled.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_normal.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_clear_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_go_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_menu_share_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__ic_voice_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_activated_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_divider_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_focused_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_longpressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_bg_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_primary_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__progress_secondary_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_inner_holo.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_48_outer_holo.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_focused_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_selected_pressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-mdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-v11/abs__progress_medium_holo.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_inverse_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_bottom_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_share_pack_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_solid_shadow_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_solid_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_stacked_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_dark_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ab_transparent_light_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_focused_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__btn_cab_done_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_bottom_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__cab_background_top_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__dialog_full_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_ab_back_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_cab_done_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_disabled.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_disabled_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_clear_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_go_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_moreoverflow_normal_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_dark.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_menu_share_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__ic_voice_search_api_holo_light.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_activated_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_divider_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_focused_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_longpressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__list_selector_disabled_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__menu_dropdown_panel_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_bg_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_primary_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__progress_secondary_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_inner_holo.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_48_outer_holo.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_disabled_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_focused_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__spinner_ab_pressed_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_focused_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_selected_pressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__tab_unselected_pressed_holo.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_default_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_right_selected_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_dark.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable-xhdpi/abs__textfield_search_selected_holo_light.9.png diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__activated_background_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__btn_cab_done_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_clear_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__ic_menu_moreoverflow_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__item_background_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_background_transition_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__list_selector_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_horizontal_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__progress_medium_holo.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__search_dropdown_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__spinner_ab_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__tab_indicator_ab_holo.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_dark.xml diff --git a/APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/drawable/abs__textfield_searchview_right_holo_light.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-large/abs__action_mode_close_item.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_dropdown_item.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-v14/sherlock_spinner_item.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout-xlarge/abs__screen_action_bar_overlay.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_home.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_tab_bar_view.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_bar_title_item.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_item_layout.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_menu_layout.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_bar.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__action_mode_close_item.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__activity_chooser_view_list_item.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__dialog_title_holo.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_checkbox.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_icon.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_layout.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__list_menu_item_radio.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__popup_menu_item_layout.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_action_bar_overlay.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__screen_simple_overlay_action_mode.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_dropdown_item_icons_2line.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__search_view.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/abs__simple_dropdown_hint.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_dropdown_item.xml diff --git a/APG/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/layout/sherlock_spinner_item.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-land/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-hdpi-1024x600/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-hdpi-1024x600/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-land-mdpi-1024x600/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large-mdpi-1024x600/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-large/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__bools.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-sw600dp/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v11/abs__themes.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__styles.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-v14/abs__themes.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w360dp/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__bools.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w480dp/abs__config.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w500dp/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-w600dp/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values-xlarge/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__attrs.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__attrs.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__attrs.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__attrs.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__bools.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__bools.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__bools.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__bools.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__colors.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__colors.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__colors.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__colors.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__config.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__config.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__config.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__config.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__dimens.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__dimens.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__dimens.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__dimens.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__ids.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__ids.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__ids.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__ids.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__strings.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__strings.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__strings.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__strings.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__styles.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__styles.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__styles.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__styles.xml diff --git a/APG/android-libs/ActionBarSherlock/res/values/abs__themes.xml b/OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__themes.xml similarity index 100% rename from APG/android-libs/ActionBarSherlock/res/values/abs__themes.xml rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/res/values/abs__themes.xml diff --git a/APG/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/android/support/v4/app/Watson.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/ActionBarSherlock.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/ActionBar.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockActivity.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockDialogFragment.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockExpandableListActivity.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragment.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockFragmentActivity.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListActivity.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockListFragment.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/app/SherlockPreferenceActivity.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockCompat.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ActionBarSherlockNative.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/ResourcesCompat.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarImpl.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/app/ActionBarWrapper.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Animator.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorListenerAdapter.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/AnimatorSet.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatEvaluator.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/FloatKeyframeSet.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntEvaluator.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/IntKeyframeSet.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/Keyframe.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/KeyframeSet.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ObjectAnimator.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/PropertyValuesHolder.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/TypeEvaluator.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/animation/ValueAnimator.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/NineViewGroup.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/view/animation/AnimatorProxy.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineFrameLayout.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineHorizontalScrollView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/nineoldandroids/widget/NineLinearLayout.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/ActionProviderWrapper.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/StandaloneActionMode.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_HasStateListenerSupport.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/View_OnAttachStateChangeListener.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenu.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItem.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuItemView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuPresenter.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ActionMenuView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/BaseMenuPresenter.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/ListMenuItemView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuBuilder.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemImpl.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuItemWrapper.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPopupHelper.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuPresenter.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/MenuWrapper.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuBuilder.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/view/menu/SubMenuWrapper.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/AbsActionBarView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContainer.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarContextView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ActionBarView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingButton.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CapitalizingTextView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/CollapsibleActionViewWrapper.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/FakeDialogPhoneWindow.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAbsSpinner.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsAdapterView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsColorDrawable.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsLinearLayout.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsListPopupWindow.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsProgressBar.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsSpinner.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/IcsView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/internal/widget/ScrollingTabContainerView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionMode.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/ActionProvider.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/CollapsibleActionView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Menu.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuInflater.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/MenuItem.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/SubMenu.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/view/Window.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserModel.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ActivityChooserView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SearchView.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/ShareActionProvider.java diff --git a/APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/src/com/actionbarsherlock/widget/SuggestionsAdapter.java diff --git a/APG/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java b/OpenPGP-Keychain/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java similarity index 100% rename from APG/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java rename to OpenPGP-Keychain/android-libs/ActionBarSherlock/test/com/actionbarsherlock/internal/ManifestParsingTest.java diff --git a/APG/build.xml b/OpenPGP-Keychain/build.xml similarity index 100% rename from APG/build.xml rename to OpenPGP-Keychain/build.xml diff --git a/APG/libs/barcodescanner-android-integration-supportv4.jar b/OpenPGP-Keychain/libs/barcodescanner-android-integration-supportv4.jar similarity index 100% rename from APG/libs/barcodescanner-android-integration-supportv4.jar rename to OpenPGP-Keychain/libs/barcodescanner-android-integration-supportv4.jar diff --git a/APG/libs/htmlcleaner-2.2.jar b/OpenPGP-Keychain/libs/htmlcleaner-2.2.jar similarity index 100% rename from APG/libs/htmlcleaner-2.2.jar rename to OpenPGP-Keychain/libs/htmlcleaner-2.2.jar diff --git a/APG/libs/htmlspanner-0.2-fork.jar b/OpenPGP-Keychain/libs/htmlspanner-0.2-fork.jar similarity index 100% rename from APG/libs/htmlspanner-0.2-fork.jar rename to OpenPGP-Keychain/libs/htmlspanner-0.2-fork.jar diff --git a/APG/libs/sc-bzip2-1.47.0.2.jar b/OpenPGP-Keychain/libs/sc-bzip2-1.47.0.2.jar similarity index 100% rename from APG/libs/sc-bzip2-1.47.0.2.jar rename to OpenPGP-Keychain/libs/sc-bzip2-1.47.0.2.jar diff --git a/APG/libs/sc-light-jdk15on-1.47.0.2.jar b/OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.2.jar similarity index 100% rename from APG/libs/sc-light-jdk15on-1.47.0.2.jar rename to OpenPGP-Keychain/libs/sc-light-jdk15on-1.47.0.2.jar diff --git a/APG/libs/scpg-jdk15on-1.47.0.2.jar b/OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.2.jar similarity index 100% rename from APG/libs/scpg-jdk15on-1.47.0.2.jar rename to OpenPGP-Keychain/libs/scpg-jdk15on-1.47.0.2.jar diff --git a/APG/libs/scprov-jdk15on-1.47.0.2.jar b/OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.2.jar similarity index 100% rename from APG/libs/scprov-jdk15on-1.47.0.2.jar rename to OpenPGP-Keychain/libs/scprov-jdk15on-1.47.0.2.jar diff --git a/APG/pom.xml b/OpenPGP-Keychain/pom.xml similarity index 100% rename from APG/pom.xml rename to OpenPGP-Keychain/pom.xml diff --git a/APG/proguard-project.txt b/OpenPGP-Keychain/proguard-project.txt similarity index 100% rename from APG/proguard-project.txt rename to OpenPGP-Keychain/proguard-project.txt diff --git a/APG/project.properties b/OpenPGP-Keychain/project.properties similarity index 100% rename from APG/project.properties rename to OpenPGP-Keychain/project.properties diff --git a/APG/res/anim/push_left_in.xml b/OpenPGP-Keychain/res/anim/push_left_in.xml similarity index 100% rename from APG/res/anim/push_left_in.xml rename to OpenPGP-Keychain/res/anim/push_left_in.xml diff --git a/APG/res/anim/push_left_out.xml b/OpenPGP-Keychain/res/anim/push_left_out.xml similarity index 100% rename from APG/res/anim/push_left_out.xml rename to OpenPGP-Keychain/res/anim/push_left_out.xml diff --git a/APG/res/anim/push_right_in.xml b/OpenPGP-Keychain/res/anim/push_right_in.xml similarity index 100% rename from APG/res/anim/push_right_in.xml rename to OpenPGP-Keychain/res/anim/push_right_in.xml diff --git a/APG/res/anim/push_right_out.xml b/OpenPGP-Keychain/res/anim/push_right_out.xml similarity index 100% rename from APG/res/anim/push_right_out.xml rename to OpenPGP-Keychain/res/anim/push_right_out.xml diff --git a/APG/res/drawable-finger/btn_circle.xml b/OpenPGP-Keychain/res/drawable-finger/btn_circle.xml similarity index 100% rename from APG/res/drawable-finger/btn_circle.xml rename to OpenPGP-Keychain/res/drawable-finger/btn_circle.xml diff --git a/APG/res/drawable-hdpi-finger/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png similarity index 100% rename from APG/res/drawable-hdpi-finger/btn_circle_disable.png rename to OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable.png diff --git a/APG/res/drawable-hdpi-finger/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png similarity index 100% rename from APG/res/drawable-hdpi-finger/btn_circle_disable_focused.png rename to OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_disable_focused.png diff --git a/APG/res/drawable-hdpi-finger/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png similarity index 100% rename from APG/res/drawable-hdpi-finger/btn_circle_normal.png rename to OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_normal.png diff --git a/APG/res/drawable-hdpi-finger/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png similarity index 100% rename from APG/res/drawable-hdpi-finger/btn_circle_pressed.png rename to OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_pressed.png diff --git a/APG/res/drawable-hdpi-finger/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png similarity index 100% rename from APG/res/drawable-hdpi-finger/btn_circle_selected.png rename to OpenPGP-Keychain/res/drawable-hdpi-finger/btn_circle_selected.png diff --git a/APG/res/drawable-hdpi-finger/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png similarity index 100% rename from APG/res/drawable-hdpi-finger/ic_btn_round_minus.png rename to OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_minus.png diff --git a/APG/res/drawable-hdpi-finger/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png similarity index 100% rename from APG/res/drawable-hdpi-finger/ic_btn_round_plus.png rename to OpenPGP-Keychain/res/drawable-hdpi-finger/ic_btn_round_plus.png diff --git a/APG/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from APG/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png rename to OpenPGP-Keychain/res/drawable-hdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/APG/res/drawable-hdpi/dashboard_decrypt_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_default.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_decrypt_default.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_default.png diff --git a/APG/res/drawable-hdpi/dashboard_decrypt_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_pressed.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_decrypt_pressed.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_decrypt_pressed.png diff --git a/APG/res/drawable-hdpi/dashboard_encrypt_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_default.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_encrypt_default.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_default.png diff --git a/APG/res/drawable-hdpi/dashboard_encrypt_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_pressed.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_encrypt_pressed.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_encrypt_pressed.png diff --git a/APG/res/drawable-hdpi/dashboard_help_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_default.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_help_default.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_default.png diff --git a/APG/res/drawable-hdpi/dashboard_help_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_pressed.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_help_pressed.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_help_pressed.png diff --git a/APG/res/drawable-hdpi/dashboard_manage_keys_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_default.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_manage_keys_default.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_default.png diff --git a/APG/res/drawable-hdpi/dashboard_manage_keys_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_pressed.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_manage_keys_pressed.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_manage_keys_pressed.png diff --git a/APG/res/drawable-hdpi/dashboard_my_keys_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_default.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_my_keys_default.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_default.png diff --git a/APG/res/drawable-hdpi/dashboard_my_keys_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_pressed.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_my_keys_pressed.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_my_keys_pressed.png diff --git a/APG/res/drawable-hdpi/dashboard_scan_qrcode_default.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_default.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_scan_qrcode_default.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_default.png diff --git a/APG/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png b/OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png similarity index 100% rename from APG/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png rename to OpenPGP-Keychain/res/drawable-hdpi/dashboard_scan_qrcode_pressed.png diff --git a/APG/res/drawable-hdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted.png similarity index 100% rename from APG/res/drawable-hdpi/encrypted.png rename to OpenPGP-Keychain/res/drawable-hdpi/encrypted.png diff --git a/APG/res/drawable-hdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png similarity index 100% rename from APG/res/drawable-hdpi/encrypted_large.png rename to OpenPGP-Keychain/res/drawable-hdpi/encrypted_large.png diff --git a/APG/res/drawable-hdpi/encrypted_small.png b/OpenPGP-Keychain/res/drawable-hdpi/encrypted_small.png similarity index 100% rename from APG/res/drawable-hdpi/encrypted_small.png rename to OpenPGP-Keychain/res/drawable-hdpi/encrypted_small.png diff --git a/APG/res/drawable-hdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png similarity index 100% rename from APG/res/drawable-hdpi/ic_menu_about.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_menu_about.png diff --git a/APG/res/drawable-hdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png similarity index 100% rename from APG/res/drawable-hdpi/ic_menu_decrypt.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_menu_decrypt.png diff --git a/APG/res/drawable-hdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png similarity index 100% rename from APG/res/drawable-hdpi/ic_menu_encrypt.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_menu_encrypt.png diff --git a/APG/res/drawable-hdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png similarity index 100% rename from APG/res/drawable-hdpi/ic_menu_filebrowser.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_menu_filebrowser.png diff --git a/APG/res/drawable-hdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png similarity index 100% rename from APG/res/drawable-hdpi/ic_menu_scan_qrcode.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_menu_scan_qrcode.png diff --git a/APG/res/drawable-hdpi/ic_menu_search.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search.png similarity index 100% rename from APG/res/drawable-hdpi/ic_menu_search.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search.png diff --git a/APG/res/drawable-hdpi/ic_menu_search_list.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search_list.png similarity index 100% rename from APG/res/drawable-hdpi/ic_menu_search_list.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_menu_search_list.png diff --git a/APG/res/drawable-hdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_menu_settings.png similarity index 100% rename from APG/res/drawable-hdpi/ic_menu_settings.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_menu_settings.png diff --git a/APG/res/drawable-hdpi/ic_next.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_next.png similarity index 100% rename from APG/res/drawable-hdpi/ic_next.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_next.png diff --git a/APG/res/drawable-hdpi/ic_previous.png b/OpenPGP-Keychain/res/drawable-hdpi/ic_previous.png similarity index 100% rename from APG/res/drawable-hdpi/ic_previous.png rename to OpenPGP-Keychain/res/drawable-hdpi/ic_previous.png diff --git a/APG/res/drawable-hdpi/icon.png b/OpenPGP-Keychain/res/drawable-hdpi/icon.png similarity index 100% rename from APG/res/drawable-hdpi/icon.png rename to OpenPGP-Keychain/res/drawable-hdpi/icon.png diff --git a/APG/res/drawable-hdpi/key.png b/OpenPGP-Keychain/res/drawable-hdpi/key.png similarity index 100% rename from APG/res/drawable-hdpi/key.png rename to OpenPGP-Keychain/res/drawable-hdpi/key.png diff --git a/APG/res/drawable-hdpi/key_large.png b/OpenPGP-Keychain/res/drawable-hdpi/key_large.png similarity index 100% rename from APG/res/drawable-hdpi/key_large.png rename to OpenPGP-Keychain/res/drawable-hdpi/key_large.png diff --git a/APG/res/drawable-hdpi/key_small.png b/OpenPGP-Keychain/res/drawable-hdpi/key_small.png similarity index 100% rename from APG/res/drawable-hdpi/key_small.png rename to OpenPGP-Keychain/res/drawable-hdpi/key_small.png diff --git a/APG/res/drawable-hdpi/overlay_error.png b/OpenPGP-Keychain/res/drawable-hdpi/overlay_error.png similarity index 100% rename from APG/res/drawable-hdpi/overlay_error.png rename to OpenPGP-Keychain/res/drawable-hdpi/overlay_error.png diff --git a/APG/res/drawable-hdpi/overlay_ok.png b/OpenPGP-Keychain/res/drawable-hdpi/overlay_ok.png similarity index 100% rename from APG/res/drawable-hdpi/overlay_ok.png rename to OpenPGP-Keychain/res/drawable-hdpi/overlay_ok.png diff --git a/APG/res/drawable-hdpi/signed.png b/OpenPGP-Keychain/res/drawable-hdpi/signed.png similarity index 100% rename from APG/res/drawable-hdpi/signed.png rename to OpenPGP-Keychain/res/drawable-hdpi/signed.png diff --git a/APG/res/drawable-hdpi/signed_large.png b/OpenPGP-Keychain/res/drawable-hdpi/signed_large.png similarity index 100% rename from APG/res/drawable-hdpi/signed_large.png rename to OpenPGP-Keychain/res/drawable-hdpi/signed_large.png diff --git a/APG/res/drawable-hdpi/signed_small.png b/OpenPGP-Keychain/res/drawable-hdpi/signed_small.png similarity index 100% rename from APG/res/drawable-hdpi/signed_small.png rename to OpenPGP-Keychain/res/drawable-hdpi/signed_small.png diff --git a/APG/res/drawable-ldpi/encrypted.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted.png similarity index 100% rename from APG/res/drawable-ldpi/encrypted.png rename to OpenPGP-Keychain/res/drawable-ldpi/encrypted.png diff --git a/APG/res/drawable-ldpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png similarity index 100% rename from APG/res/drawable-ldpi/encrypted_large.png rename to OpenPGP-Keychain/res/drawable-ldpi/encrypted_large.png diff --git a/APG/res/drawable-ldpi/encrypted_small.png b/OpenPGP-Keychain/res/drawable-ldpi/encrypted_small.png similarity index 100% rename from APG/res/drawable-ldpi/encrypted_small.png rename to OpenPGP-Keychain/res/drawable-ldpi/encrypted_small.png diff --git a/APG/res/drawable-ldpi/ic_next.png b/OpenPGP-Keychain/res/drawable-ldpi/ic_next.png similarity index 100% rename from APG/res/drawable-ldpi/ic_next.png rename to OpenPGP-Keychain/res/drawable-ldpi/ic_next.png diff --git a/APG/res/drawable-ldpi/ic_previous.png b/OpenPGP-Keychain/res/drawable-ldpi/ic_previous.png similarity index 100% rename from APG/res/drawable-ldpi/ic_previous.png rename to OpenPGP-Keychain/res/drawable-ldpi/ic_previous.png diff --git a/APG/res/drawable-ldpi/icon.png b/OpenPGP-Keychain/res/drawable-ldpi/icon.png similarity index 100% rename from APG/res/drawable-ldpi/icon.png rename to OpenPGP-Keychain/res/drawable-ldpi/icon.png diff --git a/APG/res/drawable-ldpi/key.png b/OpenPGP-Keychain/res/drawable-ldpi/key.png similarity index 100% rename from APG/res/drawable-ldpi/key.png rename to OpenPGP-Keychain/res/drawable-ldpi/key.png diff --git a/APG/res/drawable-ldpi/key_large.png b/OpenPGP-Keychain/res/drawable-ldpi/key_large.png similarity index 100% rename from APG/res/drawable-ldpi/key_large.png rename to OpenPGP-Keychain/res/drawable-ldpi/key_large.png diff --git a/APG/res/drawable-ldpi/key_small.png b/OpenPGP-Keychain/res/drawable-ldpi/key_small.png similarity index 100% rename from APG/res/drawable-ldpi/key_small.png rename to OpenPGP-Keychain/res/drawable-ldpi/key_small.png diff --git a/APG/res/drawable-ldpi/overlay_error.png b/OpenPGP-Keychain/res/drawable-ldpi/overlay_error.png similarity index 100% rename from APG/res/drawable-ldpi/overlay_error.png rename to OpenPGP-Keychain/res/drawable-ldpi/overlay_error.png diff --git a/APG/res/drawable-ldpi/overlay_ok.png b/OpenPGP-Keychain/res/drawable-ldpi/overlay_ok.png similarity index 100% rename from APG/res/drawable-ldpi/overlay_ok.png rename to OpenPGP-Keychain/res/drawable-ldpi/overlay_ok.png diff --git a/APG/res/drawable-ldpi/signed.png b/OpenPGP-Keychain/res/drawable-ldpi/signed.png similarity index 100% rename from APG/res/drawable-ldpi/signed.png rename to OpenPGP-Keychain/res/drawable-ldpi/signed.png diff --git a/APG/res/drawable-ldpi/signed_large.png b/OpenPGP-Keychain/res/drawable-ldpi/signed_large.png similarity index 100% rename from APG/res/drawable-ldpi/signed_large.png rename to OpenPGP-Keychain/res/drawable-ldpi/signed_large.png diff --git a/APG/res/drawable-ldpi/signed_small.png b/OpenPGP-Keychain/res/drawable-ldpi/signed_small.png similarity index 100% rename from APG/res/drawable-ldpi/signed_small.png rename to OpenPGP-Keychain/res/drawable-ldpi/signed_small.png diff --git a/APG/res/drawable-mdpi-finger/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png similarity index 100% rename from APG/res/drawable-mdpi-finger/btn_circle_disable.png rename to OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable.png diff --git a/APG/res/drawable-mdpi-finger/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png similarity index 100% rename from APG/res/drawable-mdpi-finger/btn_circle_disable_focused.png rename to OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_disable_focused.png diff --git a/APG/res/drawable-mdpi-finger/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png similarity index 100% rename from APG/res/drawable-mdpi-finger/btn_circle_normal.png rename to OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_normal.png diff --git a/APG/res/drawable-mdpi-finger/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png similarity index 100% rename from APG/res/drawable-mdpi-finger/btn_circle_pressed.png rename to OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_pressed.png diff --git a/APG/res/drawable-mdpi-finger/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png similarity index 100% rename from APG/res/drawable-mdpi-finger/btn_circle_selected.png rename to OpenPGP-Keychain/res/drawable-mdpi-finger/btn_circle_selected.png diff --git a/APG/res/drawable-mdpi-finger/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png similarity index 100% rename from APG/res/drawable-mdpi-finger/ic_btn_round_minus.png rename to OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_minus.png diff --git a/APG/res/drawable-mdpi-finger/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png similarity index 100% rename from APG/res/drawable-mdpi-finger/ic_btn_round_plus.png rename to OpenPGP-Keychain/res/drawable-mdpi-finger/ic_btn_round_plus.png diff --git a/APG/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from APG/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png rename to OpenPGP-Keychain/res/drawable-mdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/APG/res/drawable-mdpi/encrypted.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted.png similarity index 100% rename from APG/res/drawable-mdpi/encrypted.png rename to OpenPGP-Keychain/res/drawable-mdpi/encrypted.png diff --git a/APG/res/drawable-mdpi/encrypted_large.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png similarity index 100% rename from APG/res/drawable-mdpi/encrypted_large.png rename to OpenPGP-Keychain/res/drawable-mdpi/encrypted_large.png diff --git a/APG/res/drawable-mdpi/encrypted_small.png b/OpenPGP-Keychain/res/drawable-mdpi/encrypted_small.png similarity index 100% rename from APG/res/drawable-mdpi/encrypted_small.png rename to OpenPGP-Keychain/res/drawable-mdpi/encrypted_small.png diff --git a/APG/res/drawable-mdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png similarity index 100% rename from APG/res/drawable-mdpi/ic_menu_about.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_menu_about.png diff --git a/APG/res/drawable-mdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png similarity index 100% rename from APG/res/drawable-mdpi/ic_menu_decrypt.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_menu_decrypt.png diff --git a/APG/res/drawable-mdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png similarity index 100% rename from APG/res/drawable-mdpi/ic_menu_encrypt.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_menu_encrypt.png diff --git a/APG/res/drawable-mdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png similarity index 100% rename from APG/res/drawable-mdpi/ic_menu_filebrowser.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_menu_filebrowser.png diff --git a/APG/res/drawable-mdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png similarity index 100% rename from APG/res/drawable-mdpi/ic_menu_scan_qrcode.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_menu_scan_qrcode.png diff --git a/APG/res/drawable-mdpi/ic_menu_search.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search.png similarity index 100% rename from APG/res/drawable-mdpi/ic_menu_search.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search.png diff --git a/APG/res/drawable-mdpi/ic_menu_search_list.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search_list.png similarity index 100% rename from APG/res/drawable-mdpi/ic_menu_search_list.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_menu_search_list.png diff --git a/APG/res/drawable-mdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_menu_settings.png similarity index 100% rename from APG/res/drawable-mdpi/ic_menu_settings.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_menu_settings.png diff --git a/APG/res/drawable-mdpi/ic_next.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_next.png similarity index 100% rename from APG/res/drawable-mdpi/ic_next.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_next.png diff --git a/APG/res/drawable-mdpi/ic_previous.png b/OpenPGP-Keychain/res/drawable-mdpi/ic_previous.png similarity index 100% rename from APG/res/drawable-mdpi/ic_previous.png rename to OpenPGP-Keychain/res/drawable-mdpi/ic_previous.png diff --git a/APG/res/drawable-mdpi/icon.png b/OpenPGP-Keychain/res/drawable-mdpi/icon.png similarity index 100% rename from APG/res/drawable-mdpi/icon.png rename to OpenPGP-Keychain/res/drawable-mdpi/icon.png diff --git a/APG/res/drawable-mdpi/key.png b/OpenPGP-Keychain/res/drawable-mdpi/key.png similarity index 100% rename from APG/res/drawable-mdpi/key.png rename to OpenPGP-Keychain/res/drawable-mdpi/key.png diff --git a/APG/res/drawable-mdpi/key_large.png b/OpenPGP-Keychain/res/drawable-mdpi/key_large.png similarity index 100% rename from APG/res/drawable-mdpi/key_large.png rename to OpenPGP-Keychain/res/drawable-mdpi/key_large.png diff --git a/APG/res/drawable-mdpi/key_small.png b/OpenPGP-Keychain/res/drawable-mdpi/key_small.png similarity index 100% rename from APG/res/drawable-mdpi/key_small.png rename to OpenPGP-Keychain/res/drawable-mdpi/key_small.png diff --git a/APG/res/drawable-mdpi/overlay_error.png b/OpenPGP-Keychain/res/drawable-mdpi/overlay_error.png similarity index 100% rename from APG/res/drawable-mdpi/overlay_error.png rename to OpenPGP-Keychain/res/drawable-mdpi/overlay_error.png diff --git a/APG/res/drawable-mdpi/overlay_ok.png b/OpenPGP-Keychain/res/drawable-mdpi/overlay_ok.png similarity index 100% rename from APG/res/drawable-mdpi/overlay_ok.png rename to OpenPGP-Keychain/res/drawable-mdpi/overlay_ok.png diff --git a/APG/res/drawable-mdpi/signed.png b/OpenPGP-Keychain/res/drawable-mdpi/signed.png similarity index 100% rename from APG/res/drawable-mdpi/signed.png rename to OpenPGP-Keychain/res/drawable-mdpi/signed.png diff --git a/APG/res/drawable-mdpi/signed_large.png b/OpenPGP-Keychain/res/drawable-mdpi/signed_large.png similarity index 100% rename from APG/res/drawable-mdpi/signed_large.png rename to OpenPGP-Keychain/res/drawable-mdpi/signed_large.png diff --git a/APG/res/drawable-mdpi/signed_small.png b/OpenPGP-Keychain/res/drawable-mdpi/signed_small.png similarity index 100% rename from APG/res/drawable-mdpi/signed_small.png rename to OpenPGP-Keychain/res/drawable-mdpi/signed_small.png diff --git a/APG/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png b/OpenPGP-Keychain/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png similarity index 100% rename from APG/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png rename to OpenPGP-Keychain/res/drawable-xhdpi/abs__ab_bottom_solid_light_holo.9.png diff --git a/APG/res/drawable-xhdpi/ic_menu_about.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png similarity index 100% rename from APG/res/drawable-xhdpi/ic_menu_about.png rename to OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_about.png diff --git a/APG/res/drawable-xhdpi/ic_menu_decrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png similarity index 100% rename from APG/res/drawable-xhdpi/ic_menu_decrypt.png rename to OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_decrypt.png diff --git a/APG/res/drawable-xhdpi/ic_menu_encrypt.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png similarity index 100% rename from APG/res/drawable-xhdpi/ic_menu_encrypt.png rename to OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_encrypt.png diff --git a/APG/res/drawable-xhdpi/ic_menu_filebrowser.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png similarity index 100% rename from APG/res/drawable-xhdpi/ic_menu_filebrowser.png rename to OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_filebrowser.png diff --git a/APG/res/drawable-xhdpi/ic_menu_scan_qrcode.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png similarity index 100% rename from APG/res/drawable-xhdpi/ic_menu_scan_qrcode.png rename to OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_scan_qrcode.png diff --git a/APG/res/drawable-xhdpi/ic_menu_search.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search.png similarity index 100% rename from APG/res/drawable-xhdpi/ic_menu_search.png rename to OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search.png diff --git a/APG/res/drawable-xhdpi/ic_menu_search_list.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search_list.png similarity index 100% rename from APG/res/drawable-xhdpi/ic_menu_search_list.png rename to OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_search_list.png diff --git a/APG/res/drawable-xhdpi/ic_menu_settings.png b/OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_settings.png similarity index 100% rename from APG/res/drawable-xhdpi/ic_menu_settings.png rename to OpenPGP-Keychain/res/drawable-xhdpi/ic_menu_settings.png diff --git a/APG/res/drawable-xhdpi/icon.png b/OpenPGP-Keychain/res/drawable-xhdpi/icon.png similarity index 100% rename from APG/res/drawable-xhdpi/icon.png rename to OpenPGP-Keychain/res/drawable-xhdpi/icon.png diff --git a/APG/res/drawable/btn_circle_disable.png b/OpenPGP-Keychain/res/drawable/btn_circle_disable.png similarity index 100% rename from APG/res/drawable/btn_circle_disable.png rename to OpenPGP-Keychain/res/drawable/btn_circle_disable.png diff --git a/APG/res/drawable/btn_circle_disable_focused.png b/OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png similarity index 100% rename from APG/res/drawable/btn_circle_disable_focused.png rename to OpenPGP-Keychain/res/drawable/btn_circle_disable_focused.png diff --git a/APG/res/drawable/btn_circle_normal.png b/OpenPGP-Keychain/res/drawable/btn_circle_normal.png similarity index 100% rename from APG/res/drawable/btn_circle_normal.png rename to OpenPGP-Keychain/res/drawable/btn_circle_normal.png diff --git a/APG/res/drawable/btn_circle_pressed.png b/OpenPGP-Keychain/res/drawable/btn_circle_pressed.png similarity index 100% rename from APG/res/drawable/btn_circle_pressed.png rename to OpenPGP-Keychain/res/drawable/btn_circle_pressed.png diff --git a/APG/res/drawable/btn_circle_selected.png b/OpenPGP-Keychain/res/drawable/btn_circle_selected.png similarity index 100% rename from APG/res/drawable/btn_circle_selected.png rename to OpenPGP-Keychain/res/drawable/btn_circle_selected.png diff --git a/APG/res/drawable/dashboard_decrypt.xml b/OpenPGP-Keychain/res/drawable/dashboard_decrypt.xml similarity index 100% rename from APG/res/drawable/dashboard_decrypt.xml rename to OpenPGP-Keychain/res/drawable/dashboard_decrypt.xml diff --git a/APG/res/drawable/dashboard_encrypt.xml b/OpenPGP-Keychain/res/drawable/dashboard_encrypt.xml similarity index 100% rename from APG/res/drawable/dashboard_encrypt.xml rename to OpenPGP-Keychain/res/drawable/dashboard_encrypt.xml diff --git a/APG/res/drawable/dashboard_help.xml b/OpenPGP-Keychain/res/drawable/dashboard_help.xml similarity index 100% rename from APG/res/drawable/dashboard_help.xml rename to OpenPGP-Keychain/res/drawable/dashboard_help.xml diff --git a/APG/res/drawable/dashboard_manage_keys.xml b/OpenPGP-Keychain/res/drawable/dashboard_manage_keys.xml similarity index 100% rename from APG/res/drawable/dashboard_manage_keys.xml rename to OpenPGP-Keychain/res/drawable/dashboard_manage_keys.xml diff --git a/APG/res/drawable/dashboard_my_keys.xml b/OpenPGP-Keychain/res/drawable/dashboard_my_keys.xml similarity index 100% rename from APG/res/drawable/dashboard_my_keys.xml rename to OpenPGP-Keychain/res/drawable/dashboard_my_keys.xml diff --git a/APG/res/drawable/dashboard_scan_qrcode.xml b/OpenPGP-Keychain/res/drawable/dashboard_scan_qrcode.xml similarity index 100% rename from APG/res/drawable/dashboard_scan_qrcode.xml rename to OpenPGP-Keychain/res/drawable/dashboard_scan_qrcode.xml diff --git a/APG/res/drawable/encrypted.png b/OpenPGP-Keychain/res/drawable/encrypted.png similarity index 100% rename from APG/res/drawable/encrypted.png rename to OpenPGP-Keychain/res/drawable/encrypted.png diff --git a/APG/res/drawable/encrypted_large.png b/OpenPGP-Keychain/res/drawable/encrypted_large.png similarity index 100% rename from APG/res/drawable/encrypted_large.png rename to OpenPGP-Keychain/res/drawable/encrypted_large.png diff --git a/APG/res/drawable/encrypted_small.png b/OpenPGP-Keychain/res/drawable/encrypted_small.png similarity index 100% rename from APG/res/drawable/encrypted_small.png rename to OpenPGP-Keychain/res/drawable/encrypted_small.png diff --git a/APG/res/drawable/ic_btn_round_minus.png b/OpenPGP-Keychain/res/drawable/ic_btn_round_minus.png similarity index 100% rename from APG/res/drawable/ic_btn_round_minus.png rename to OpenPGP-Keychain/res/drawable/ic_btn_round_minus.png diff --git a/APG/res/drawable/ic_btn_round_plus.png b/OpenPGP-Keychain/res/drawable/ic_btn_round_plus.png similarity index 100% rename from APG/res/drawable/ic_btn_round_plus.png rename to OpenPGP-Keychain/res/drawable/ic_btn_round_plus.png diff --git a/APG/res/drawable/ic_launcher_folder.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder.png similarity index 100% rename from APG/res/drawable/ic_launcher_folder.png rename to OpenPGP-Keychain/res/drawable/ic_launcher_folder.png diff --git a/APG/res/drawable/ic_launcher_folder_small.png b/OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png similarity index 100% rename from APG/res/drawable/ic_launcher_folder_small.png rename to OpenPGP-Keychain/res/drawable/ic_launcher_folder_small.png diff --git a/APG/res/drawable/ic_next.png b/OpenPGP-Keychain/res/drawable/ic_next.png similarity index 100% rename from APG/res/drawable/ic_next.png rename to OpenPGP-Keychain/res/drawable/ic_next.png diff --git a/APG/res/drawable/ic_previous.png b/OpenPGP-Keychain/res/drawable/ic_previous.png similarity index 100% rename from APG/res/drawable/ic_previous.png rename to OpenPGP-Keychain/res/drawable/ic_previous.png diff --git a/APG/res/drawable/key.png b/OpenPGP-Keychain/res/drawable/key.png similarity index 100% rename from APG/res/drawable/key.png rename to OpenPGP-Keychain/res/drawable/key.png diff --git a/APG/res/drawable/key_large.png b/OpenPGP-Keychain/res/drawable/key_large.png similarity index 100% rename from APG/res/drawable/key_large.png rename to OpenPGP-Keychain/res/drawable/key_large.png diff --git a/APG/res/drawable/key_small.png b/OpenPGP-Keychain/res/drawable/key_small.png similarity index 100% rename from APG/res/drawable/key_small.png rename to OpenPGP-Keychain/res/drawable/key_small.png diff --git a/APG/res/drawable/overlay_error.png b/OpenPGP-Keychain/res/drawable/overlay_error.png similarity index 100% rename from APG/res/drawable/overlay_error.png rename to OpenPGP-Keychain/res/drawable/overlay_error.png diff --git a/APG/res/drawable/overlay_ok.png b/OpenPGP-Keychain/res/drawable/overlay_ok.png similarity index 100% rename from APG/res/drawable/overlay_ok.png rename to OpenPGP-Keychain/res/drawable/overlay_ok.png diff --git a/APG/res/drawable/section_header.xml b/OpenPGP-Keychain/res/drawable/section_header.xml similarity index 100% rename from APG/res/drawable/section_header.xml rename to OpenPGP-Keychain/res/drawable/section_header.xml diff --git a/APG/res/drawable/signed.png b/OpenPGP-Keychain/res/drawable/signed.png similarity index 100% rename from APG/res/drawable/signed.png rename to OpenPGP-Keychain/res/drawable/signed.png diff --git a/APG/res/drawable/signed_large.png b/OpenPGP-Keychain/res/drawable/signed_large.png similarity index 100% rename from APG/res/drawable/signed_large.png rename to OpenPGP-Keychain/res/drawable/signed_large.png diff --git a/APG/res/drawable/signed_small.png b/OpenPGP-Keychain/res/drawable/signed_small.png similarity index 100% rename from APG/res/drawable/signed_small.png rename to OpenPGP-Keychain/res/drawable/signed_small.png diff --git a/APG/res/layout/account_item.xml b/OpenPGP-Keychain/res/layout/account_item.xml similarity index 100% rename from APG/res/layout/account_item.xml rename to OpenPGP-Keychain/res/layout/account_item.xml diff --git a/APG/res/layout/create_key.xml b/OpenPGP-Keychain/res/layout/create_key.xml similarity index 98% rename from APG/res/layout/create_key.xml rename to OpenPGP-Keychain/res/layout/create_key.xml index 235d33f88..d5bf6cf9f 100644 --- a/APG/res/layout/create_key.xml +++ b/OpenPGP-Keychain/res/layout/create_key.xml @@ -68,6 +68,5 @@ android:text="1024" /> - \ No newline at end of file diff --git a/APG/res/layout/decrypt.xml b/OpenPGP-Keychain/res/layout/decrypt.xml similarity index 100% rename from APG/res/layout/decrypt.xml rename to OpenPGP-Keychain/res/layout/decrypt.xml diff --git a/APG/res/layout/edit_key.xml b/OpenPGP-Keychain/res/layout/edit_key.xml similarity index 100% rename from APG/res/layout/edit_key.xml rename to OpenPGP-Keychain/res/layout/edit_key.xml diff --git a/APG/res/layout/edit_key_key_item.xml b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml similarity index 96% rename from APG/res/layout/edit_key_key_item.xml rename to OpenPGP-Keychain/res/layout/edit_key_key_item.xml index 5556ec22e..0cb312583 100644 --- a/APG/res/layout/edit_key_key_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_key_item.xml @@ -15,7 +15,7 @@ limitations under the License. --> - @@ -131,4 +131,4 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - \ No newline at end of file + \ No newline at end of file diff --git a/APG/res/layout/edit_key_section.xml b/OpenPGP-Keychain/res/layout/edit_key_section.xml similarity index 91% rename from APG/res/layout/edit_key_section.xml rename to OpenPGP-Keychain/res/layout/edit_key_section.xml index e8f788f6d..870e1b063 100644 --- a/APG/res/layout/edit_key_section.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_section.xml @@ -15,7 +15,7 @@ limitations under the License. --> - @@ -54,4 +54,4 @@ android:orientation="vertical" android:paddingBottom="6dip" /> - \ No newline at end of file + \ No newline at end of file diff --git a/APG/res/layout/edit_key_user_id_item.xml b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml similarity index 95% rename from APG/res/layout/edit_key_user_id_item.xml rename to OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml index 26a7304e0..b2597cf31 100644 --- a/APG/res/layout/edit_key_user_id_item.xml +++ b/OpenPGP-Keychain/res/layout/edit_key_user_id_item.xml @@ -15,7 +15,7 @@ limitations under the License. --> - @@ -104,4 +104,4 @@ android:layout_height="1dip" android:background="?android:attr/listDivider" /> - \ No newline at end of file + \ No newline at end of file diff --git a/APG/res/layout/encrypt.xml b/OpenPGP-Keychain/res/layout/encrypt.xml similarity index 100% rename from APG/res/layout/encrypt.xml rename to OpenPGP-Keychain/res/layout/encrypt.xml diff --git a/APG/res/layout/file_dialog.xml b/OpenPGP-Keychain/res/layout/file_dialog.xml similarity index 100% rename from APG/res/layout/file_dialog.xml rename to OpenPGP-Keychain/res/layout/file_dialog.xml diff --git a/APG/res/layout/filter_info.xml b/OpenPGP-Keychain/res/layout/filter_info.xml similarity index 100% rename from APG/res/layout/filter_info.xml rename to OpenPGP-Keychain/res/layout/filter_info.xml diff --git a/APG/res/layout/general.xml b/OpenPGP-Keychain/res/layout/general.xml similarity index 100% rename from APG/res/layout/general.xml rename to OpenPGP-Keychain/res/layout/general.xml diff --git a/APG/res/layout/help_activity.xml b/OpenPGP-Keychain/res/layout/help_activity.xml similarity index 100% rename from APG/res/layout/help_activity.xml rename to OpenPGP-Keychain/res/layout/help_activity.xml diff --git a/APG/res/layout/help_fragment_about.xml b/OpenPGP-Keychain/res/layout/help_fragment_about.xml similarity index 100% rename from APG/res/layout/help_fragment_about.xml rename to OpenPGP-Keychain/res/layout/help_fragment_about.xml diff --git a/APG/res/layout/import_keys.xml b/OpenPGP-Keychain/res/layout/import_keys.xml similarity index 100% rename from APG/res/layout/import_keys.xml rename to OpenPGP-Keychain/res/layout/import_keys.xml diff --git a/APG/res/layout/key_list_child_item.xml b/OpenPGP-Keychain/res/layout/key_list_child_item.xml similarity index 100% rename from APG/res/layout/key_list_child_item.xml rename to OpenPGP-Keychain/res/layout/key_list_child_item.xml diff --git a/APG/res/layout/key_list_group_item.xml b/OpenPGP-Keychain/res/layout/key_list_group_item.xml similarity index 100% rename from APG/res/layout/key_list_group_item.xml rename to OpenPGP-Keychain/res/layout/key_list_group_item.xml diff --git a/APG/res/layout/key_list_public_activity.xml b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml similarity index 91% rename from APG/res/layout/key_list_public_activity.xml rename to OpenPGP-Keychain/res/layout/key_list_public_activity.xml index 9872c3e1b..43aabc9af 100644 --- a/APG/res/layout/key_list_public_activity.xml +++ b/OpenPGP-Keychain/res/layout/key_list_public_activity.xml @@ -6,7 +6,7 @@ diff --git a/APG/res/layout/key_list_secret_activity.xml b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml similarity index 91% rename from APG/res/layout/key_list_secret_activity.xml rename to OpenPGP-Keychain/res/layout/key_list_secret_activity.xml index c813a5d7d..d41d5ace5 100644 --- a/APG/res/layout/key_list_secret_activity.xml +++ b/OpenPGP-Keychain/res/layout/key_list_secret_activity.xml @@ -6,7 +6,7 @@ diff --git a/APG/res/layout/key_server_editor.xml b/OpenPGP-Keychain/res/layout/key_server_editor.xml similarity index 100% rename from APG/res/layout/key_server_editor.xml rename to OpenPGP-Keychain/res/layout/key_server_editor.xml diff --git a/APG/res/layout/key_server_export_layout.xml b/OpenPGP-Keychain/res/layout/key_server_export_layout.xml similarity index 100% rename from APG/res/layout/key_server_export_layout.xml rename to OpenPGP-Keychain/res/layout/key_server_export_layout.xml diff --git a/APG/res/layout/key_server_preference.xml b/OpenPGP-Keychain/res/layout/key_server_preference.xml similarity index 100% rename from APG/res/layout/key_server_preference.xml rename to OpenPGP-Keychain/res/layout/key_server_preference.xml diff --git a/APG/res/layout/key_server_query_layout.xml b/OpenPGP-Keychain/res/layout/key_server_query_layout.xml similarity index 100% rename from APG/res/layout/key_server_query_layout.xml rename to OpenPGP-Keychain/res/layout/key_server_query_layout.xml diff --git a/APG/res/layout/key_server_query_result_item.xml b/OpenPGP-Keychain/res/layout/key_server_query_result_item.xml similarity index 100% rename from APG/res/layout/key_server_query_result_item.xml rename to OpenPGP-Keychain/res/layout/key_server_query_result_item.xml diff --git a/APG/res/layout/key_server_query_result_user_id.xml b/OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml similarity index 100% rename from APG/res/layout/key_server_query_result_user_id.xml rename to OpenPGP-Keychain/res/layout/key_server_query_result_user_id.xml diff --git a/APG/res/layout/main.xml b/OpenPGP-Keychain/res/layout/main.xml similarity index 59% rename from APG/res/layout/main.xml rename to OpenPGP-Keychain/res/layout/main.xml index 66a334462..e5a76e5b5 100644 --- a/APG/res/layout/main.xml +++ b/OpenPGP-Keychain/res/layout/main.xml @@ -20,7 +20,7 @@ android:layout_height="fill_parent" android:orientation="vertical" > - @@ -51,8 +51,7 @@ android:drawableTop="@drawable/dashboard_decrypt" android:onClick="decryptOnClick" android:text="@string/dashboard_decrypt" /> - - +