diff --git a/.classpath b/.classpath deleted file mode 100755 index 8b588dc..0000000 --- a/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..afbdab3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..41f192b --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +google-authenticator-android \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..217af47 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,23 @@ + + + + + + diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..e206d70 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..df31f90 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..4830863 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + Android API 21 Platform + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..c546330 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000..922003b --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..c80f219 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.project b/.project deleted file mode 100755 index 89c42c2..0000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - Google Authenticator - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..378eac2 --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +build diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 0000000..48f4d34 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,88 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..5534ce5 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,22 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 14 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "com.google.android.apps.authenticator2" + minSdkVersion 7 + targetSdkVersion 14 + + testApplicationId "com.google.android.apps.authenticator2.tests" + testInstrumentationRunner "android.test.InstrumentationTestRunner" + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + } +} diff --git a/tests/README b/app/src/androidTest/README similarity index 100% rename from tests/README rename to app/src/androidTest/README diff --git a/tests/src/com/google/android/apps/authenticator/AccountDbTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/AccountDbTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/AccountDbTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/AccountDbTest.java diff --git a/tests/src/com/google/android/apps/authenticator/AddOtherAccountActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/AddOtherAccountActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/AddOtherAccountActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/AddOtherAccountActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/AuthenticatorActivityPart2Test.java b/app/src/androidTest/java/com/google/android/apps/authenticator/AuthenticatorActivityPart2Test.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/AuthenticatorActivityPart2Test.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/AuthenticatorActivityPart2Test.java diff --git a/tests/src/com/google/android/apps/authenticator/AuthenticatorActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/AuthenticatorActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/AuthenticatorActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/AuthenticatorActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/Base32StringTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/Base32StringTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/Base32StringTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/Base32StringTest.java diff --git a/tests/src/com/google/android/apps/authenticator/CheckCodeActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/CheckCodeActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/CheckCodeActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/CheckCodeActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/EnterKeyActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/EnterKeyActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/EnterKeyActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/EnterKeyActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/FileUtilitiesTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/FileUtilitiesTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/FileUtilitiesTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/FileUtilitiesTest.java diff --git a/tests/src/com/google/android/apps/authenticator/HexEncodingTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/HexEncodingTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/HexEncodingTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/HexEncodingTest.java diff --git a/tests/src/com/google/android/apps/authenticator/MockitoWorkaroundForEclairInstrumentationTestRunner.java b/app/src/androidTest/java/com/google/android/apps/authenticator/MockitoWorkaroundForEclairInstrumentationTestRunner.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/MockitoWorkaroundForEclairInstrumentationTestRunner.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/MockitoWorkaroundForEclairInstrumentationTestRunner.java diff --git a/tests/src/com/google/android/apps/authenticator/OtpProviderTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/OtpProviderTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/OtpProviderTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/OtpProviderTest.java diff --git a/tests/src/com/google/android/apps/authenticator/PasscodeGeneratorTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/PasscodeGeneratorTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/PasscodeGeneratorTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/PasscodeGeneratorTest.java diff --git a/tests/src/com/google/android/apps/authenticator/PreconditionsTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/PreconditionsTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/PreconditionsTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/PreconditionsTest.java diff --git a/tests/src/com/google/android/apps/authenticator/RunImmediatelyOnCallingThreadExecutor.java b/app/src/androidTest/java/com/google/android/apps/authenticator/RunImmediatelyOnCallingThreadExecutor.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/RunImmediatelyOnCallingThreadExecutor.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/RunImmediatelyOnCallingThreadExecutor.java diff --git a/tests/src/com/google/android/apps/authenticator/SettingsAboutActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/SettingsAboutActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/SettingsAboutActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/SettingsAboutActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/TestUtilities.java b/app/src/androidTest/java/com/google/android/apps/authenticator/TestUtilities.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/TestUtilities.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/TestUtilities.java diff --git a/tests/src/com/google/android/apps/authenticator/TotpClockTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/TotpClockTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/TotpClockTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/TotpClockTest.java diff --git a/tests/src/com/google/android/apps/authenticator/TotpCounterTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/TotpCounterTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/TotpCounterTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/TotpCounterTest.java diff --git a/tests/src/com/google/android/apps/authenticator/UtilitiesTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/UtilitiesTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/UtilitiesTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/UtilitiesTest.java diff --git a/tests/src/com/google/android/apps/authenticator/dataimport/ImporterTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/dataimport/ImporterTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/dataimport/ImporterTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/dataimport/ImporterTest.java diff --git a/tests/src/com/google/android/apps/authenticator/howitworks/IntroEnterCodeActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/howitworks/IntroEnterCodeActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/howitworks/IntroEnterCodeActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/howitworks/IntroEnterCodeActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/howitworks/IntroEnterPasswordActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/howitworks/IntroEnterPasswordActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/howitworks/IntroEnterPasswordActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/howitworks/IntroEnterPasswordActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/howitworks/IntroVerifyDeviceActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/howitworks/IntroVerifyDeviceActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/howitworks/IntroVerifyDeviceActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/howitworks/IntroVerifyDeviceActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/testability/HttpClientFactoryTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/testability/HttpClientFactoryTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/testability/HttpClientFactoryTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/testability/HttpClientFactoryTest.java diff --git a/tests/src/com/google/android/apps/authenticator/timesync/NetworkTimeProviderTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/timesync/NetworkTimeProviderTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/timesync/NetworkTimeProviderTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/timesync/NetworkTimeProviderTest.java diff --git a/tests/src/com/google/android/apps/authenticator/timesync/SyncNowControllerTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/timesync/SyncNowControllerTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/timesync/SyncNowControllerTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/timesync/SyncNowControllerTest.java diff --git a/tests/src/com/google/android/apps/authenticator/wizard/WizardPageActivityTest.java b/app/src/androidTest/java/com/google/android/apps/authenticator/wizard/WizardPageActivityTest.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/wizard/WizardPageActivityTest.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/wizard/WizardPageActivityTest.java diff --git a/tests/src/com/google/android/apps/authenticator/wizard/WizardPageActivityTestBase.java b/app/src/androidTest/java/com/google/android/apps/authenticator/wizard/WizardPageActivityTestBase.java similarity index 100% rename from tests/src/com/google/android/apps/authenticator/wizard/WizardPageActivityTestBase.java rename to app/src/androidTest/java/com/google/android/apps/authenticator/wizard/WizardPageActivityTestBase.java diff --git a/AndroidManifest.xml b/app/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to app/src/main/AndroidManifest.xml diff --git a/src/com/google/android/apps/authenticator/dataexport/IExportServiceV2.aidl b/app/src/main/aidl/com/google/android/apps/authenticator/dataexport/IExportServiceV2.aidl similarity index 100% rename from src/com/google/android/apps/authenticator/dataexport/IExportServiceV2.aidl rename to app/src/main/aidl/com/google/android/apps/authenticator/dataexport/IExportServiceV2.aidl diff --git a/src/com/google/android/apps/authenticator/AccountDb.java b/app/src/main/java/com/google/android/apps/authenticator/AccountDb.java similarity index 100% rename from src/com/google/android/apps/authenticator/AccountDb.java rename to app/src/main/java/com/google/android/apps/authenticator/AccountDb.java diff --git a/src/com/google/android/apps/authenticator/AddOtherAccountActivity.java b/app/src/main/java/com/google/android/apps/authenticator/AddOtherAccountActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/AddOtherAccountActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/AddOtherAccountActivity.java diff --git a/src/com/google/android/apps/authenticator/AuthenticatorActivity.java b/app/src/main/java/com/google/android/apps/authenticator/AuthenticatorActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/AuthenticatorActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/AuthenticatorActivity.java diff --git a/src/com/google/android/apps/authenticator/AuthenticatorApplication.java b/app/src/main/java/com/google/android/apps/authenticator/AuthenticatorApplication.java similarity index 100% rename from src/com/google/android/apps/authenticator/AuthenticatorApplication.java rename to app/src/main/java/com/google/android/apps/authenticator/AuthenticatorApplication.java diff --git a/src/com/google/android/apps/authenticator/Base32String.java b/app/src/main/java/com/google/android/apps/authenticator/Base32String.java similarity index 100% rename from src/com/google/android/apps/authenticator/Base32String.java rename to app/src/main/java/com/google/android/apps/authenticator/Base32String.java diff --git a/src/com/google/android/apps/authenticator/CheckCodeActivity.java b/app/src/main/java/com/google/android/apps/authenticator/CheckCodeActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/CheckCodeActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/CheckCodeActivity.java diff --git a/src/com/google/android/apps/authenticator/CountdownIndicator.java b/app/src/main/java/com/google/android/apps/authenticator/CountdownIndicator.java similarity index 100% rename from src/com/google/android/apps/authenticator/CountdownIndicator.java rename to app/src/main/java/com/google/android/apps/authenticator/CountdownIndicator.java diff --git a/src/com/google/android/apps/authenticator/EnterKeyActivity.java b/app/src/main/java/com/google/android/apps/authenticator/EnterKeyActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/EnterKeyActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/EnterKeyActivity.java diff --git a/src/com/google/android/apps/authenticator/FileUtilities.java b/app/src/main/java/com/google/android/apps/authenticator/FileUtilities.java similarity index 100% rename from src/com/google/android/apps/authenticator/FileUtilities.java rename to app/src/main/java/com/google/android/apps/authenticator/FileUtilities.java diff --git a/src/com/google/android/apps/authenticator/HexEncoding.java b/app/src/main/java/com/google/android/apps/authenticator/HexEncoding.java similarity index 100% rename from src/com/google/android/apps/authenticator/HexEncoding.java rename to app/src/main/java/com/google/android/apps/authenticator/HexEncoding.java diff --git a/src/com/google/android/apps/authenticator/MarketBuildOptionalFeatures.java b/app/src/main/java/com/google/android/apps/authenticator/MarketBuildOptionalFeatures.java similarity index 100% rename from src/com/google/android/apps/authenticator/MarketBuildOptionalFeatures.java rename to app/src/main/java/com/google/android/apps/authenticator/MarketBuildOptionalFeatures.java diff --git a/src/com/google/android/apps/authenticator/OptionalFeatures.java b/app/src/main/java/com/google/android/apps/authenticator/OptionalFeatures.java similarity index 100% rename from src/com/google/android/apps/authenticator/OptionalFeatures.java rename to app/src/main/java/com/google/android/apps/authenticator/OptionalFeatures.java diff --git a/src/com/google/android/apps/authenticator/OtpGenerationNotPermittedException.java b/app/src/main/java/com/google/android/apps/authenticator/OtpGenerationNotPermittedException.java similarity index 100% rename from src/com/google/android/apps/authenticator/OtpGenerationNotPermittedException.java rename to app/src/main/java/com/google/android/apps/authenticator/OtpGenerationNotPermittedException.java diff --git a/src/com/google/android/apps/authenticator/OtpProvider.java b/app/src/main/java/com/google/android/apps/authenticator/OtpProvider.java similarity index 100% rename from src/com/google/android/apps/authenticator/OtpProvider.java rename to app/src/main/java/com/google/android/apps/authenticator/OtpProvider.java diff --git a/src/com/google/android/apps/authenticator/OtpSource.java b/app/src/main/java/com/google/android/apps/authenticator/OtpSource.java similarity index 100% rename from src/com/google/android/apps/authenticator/OtpSource.java rename to app/src/main/java/com/google/android/apps/authenticator/OtpSource.java diff --git a/src/com/google/android/apps/authenticator/OtpSourceException.java b/app/src/main/java/com/google/android/apps/authenticator/OtpSourceException.java similarity index 100% rename from src/com/google/android/apps/authenticator/OtpSourceException.java rename to app/src/main/java/com/google/android/apps/authenticator/OtpSourceException.java diff --git a/src/com/google/android/apps/authenticator/PasscodeGenerator.java b/app/src/main/java/com/google/android/apps/authenticator/PasscodeGenerator.java similarity index 100% rename from src/com/google/android/apps/authenticator/PasscodeGenerator.java rename to app/src/main/java/com/google/android/apps/authenticator/PasscodeGenerator.java diff --git a/src/com/google/android/apps/authenticator/Preconditions.java b/app/src/main/java/com/google/android/apps/authenticator/Preconditions.java similarity index 100% rename from src/com/google/android/apps/authenticator/Preconditions.java rename to app/src/main/java/com/google/android/apps/authenticator/Preconditions.java diff --git a/src/com/google/android/apps/authenticator/RunOnThisLooperThreadExecutor.java b/app/src/main/java/com/google/android/apps/authenticator/RunOnThisLooperThreadExecutor.java similarity index 100% rename from src/com/google/android/apps/authenticator/RunOnThisLooperThreadExecutor.java rename to app/src/main/java/com/google/android/apps/authenticator/RunOnThisLooperThreadExecutor.java diff --git a/src/com/google/android/apps/authenticator/SettingsAboutActivity.java b/app/src/main/java/com/google/android/apps/authenticator/SettingsAboutActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/SettingsAboutActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/SettingsAboutActivity.java diff --git a/src/com/google/android/apps/authenticator/SettingsActivity.java b/app/src/main/java/com/google/android/apps/authenticator/SettingsActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/SettingsActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/SettingsActivity.java diff --git a/src/com/google/android/apps/authenticator/TotpClock.java b/app/src/main/java/com/google/android/apps/authenticator/TotpClock.java similarity index 100% rename from src/com/google/android/apps/authenticator/TotpClock.java rename to app/src/main/java/com/google/android/apps/authenticator/TotpClock.java diff --git a/src/com/google/android/apps/authenticator/TotpCountdownTask.java b/app/src/main/java/com/google/android/apps/authenticator/TotpCountdownTask.java similarity index 100% rename from src/com/google/android/apps/authenticator/TotpCountdownTask.java rename to app/src/main/java/com/google/android/apps/authenticator/TotpCountdownTask.java diff --git a/src/com/google/android/apps/authenticator/TotpCounter.java b/app/src/main/java/com/google/android/apps/authenticator/TotpCounter.java similarity index 100% rename from src/com/google/android/apps/authenticator/TotpCounter.java rename to app/src/main/java/com/google/android/apps/authenticator/TotpCounter.java diff --git a/src/com/google/android/apps/authenticator/UserRowView.java b/app/src/main/java/com/google/android/apps/authenticator/UserRowView.java similarity index 100% rename from src/com/google/android/apps/authenticator/UserRowView.java rename to app/src/main/java/com/google/android/apps/authenticator/UserRowView.java diff --git a/src/com/google/android/apps/authenticator/Utilities.java b/app/src/main/java/com/google/android/apps/authenticator/Utilities.java similarity index 100% rename from src/com/google/android/apps/authenticator/Utilities.java rename to app/src/main/java/com/google/android/apps/authenticator/Utilities.java diff --git a/src/com/google/android/apps/authenticator/dataimport/ExportServiceBasedImportController.java b/app/src/main/java/com/google/android/apps/authenticator/dataimport/ExportServiceBasedImportController.java similarity index 100% rename from src/com/google/android/apps/authenticator/dataimport/ExportServiceBasedImportController.java rename to app/src/main/java/com/google/android/apps/authenticator/dataimport/ExportServiceBasedImportController.java diff --git a/src/com/google/android/apps/authenticator/dataimport/ImportController.java b/app/src/main/java/com/google/android/apps/authenticator/dataimport/ImportController.java similarity index 100% rename from src/com/google/android/apps/authenticator/dataimport/ImportController.java rename to app/src/main/java/com/google/android/apps/authenticator/dataimport/ImportController.java diff --git a/src/com/google/android/apps/authenticator/dataimport/Importer.java b/app/src/main/java/com/google/android/apps/authenticator/dataimport/Importer.java similarity index 100% rename from src/com/google/android/apps/authenticator/dataimport/Importer.java rename to app/src/main/java/com/google/android/apps/authenticator/dataimport/Importer.java diff --git a/src/com/google/android/apps/authenticator/howitworks/IntroEnterCodeActivity.java b/app/src/main/java/com/google/android/apps/authenticator/howitworks/IntroEnterCodeActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/howitworks/IntroEnterCodeActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/howitworks/IntroEnterCodeActivity.java diff --git a/src/com/google/android/apps/authenticator/howitworks/IntroEnterPasswordActivity.java b/app/src/main/java/com/google/android/apps/authenticator/howitworks/IntroEnterPasswordActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/howitworks/IntroEnterPasswordActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/howitworks/IntroEnterPasswordActivity.java diff --git a/src/com/google/android/apps/authenticator/howitworks/IntroVerifyDeviceActivity.java b/app/src/main/java/com/google/android/apps/authenticator/howitworks/IntroVerifyDeviceActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/howitworks/IntroVerifyDeviceActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/howitworks/IntroVerifyDeviceActivity.java diff --git a/src/com/google/android/apps/authenticator/testability/DependencyInjector.java b/app/src/main/java/com/google/android/apps/authenticator/testability/DependencyInjector.java similarity index 100% rename from src/com/google/android/apps/authenticator/testability/DependencyInjector.java rename to app/src/main/java/com/google/android/apps/authenticator/testability/DependencyInjector.java diff --git a/src/com/google/android/apps/authenticator/testability/HttpClientFactory.java b/app/src/main/java/com/google/android/apps/authenticator/testability/HttpClientFactory.java similarity index 100% rename from src/com/google/android/apps/authenticator/testability/HttpClientFactory.java rename to app/src/main/java/com/google/android/apps/authenticator/testability/HttpClientFactory.java diff --git a/src/com/google/android/apps/authenticator/testability/SharedPreferencesRenamingDelegatingContext.java b/app/src/main/java/com/google/android/apps/authenticator/testability/SharedPreferencesRenamingDelegatingContext.java similarity index 100% rename from src/com/google/android/apps/authenticator/testability/SharedPreferencesRenamingDelegatingContext.java rename to app/src/main/java/com/google/android/apps/authenticator/testability/SharedPreferencesRenamingDelegatingContext.java diff --git a/src/com/google/android/apps/authenticator/testability/StartActivityListener.java b/app/src/main/java/com/google/android/apps/authenticator/testability/StartActivityListener.java similarity index 100% rename from src/com/google/android/apps/authenticator/testability/StartActivityListener.java rename to app/src/main/java/com/google/android/apps/authenticator/testability/StartActivityListener.java diff --git a/src/com/google/android/apps/authenticator/testability/TestableActivity.java b/app/src/main/java/com/google/android/apps/authenticator/testability/TestableActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/testability/TestableActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/testability/TestableActivity.java diff --git a/src/com/google/android/apps/authenticator/testability/TestablePreferenceActivity.java b/app/src/main/java/com/google/android/apps/authenticator/testability/TestablePreferenceActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/testability/TestablePreferenceActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/testability/TestablePreferenceActivity.java diff --git a/src/com/google/android/apps/authenticator/timesync/AboutActivity.java b/app/src/main/java/com/google/android/apps/authenticator/timesync/AboutActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/timesync/AboutActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/timesync/AboutActivity.java diff --git a/src/com/google/android/apps/authenticator/timesync/NetworkTimeProvider.java b/app/src/main/java/com/google/android/apps/authenticator/timesync/NetworkTimeProvider.java similarity index 100% rename from src/com/google/android/apps/authenticator/timesync/NetworkTimeProvider.java rename to app/src/main/java/com/google/android/apps/authenticator/timesync/NetworkTimeProvider.java diff --git a/src/com/google/android/apps/authenticator/timesync/SettingsTimeCorrectionActivity.java b/app/src/main/java/com/google/android/apps/authenticator/timesync/SettingsTimeCorrectionActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/timesync/SettingsTimeCorrectionActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/timesync/SettingsTimeCorrectionActivity.java diff --git a/src/com/google/android/apps/authenticator/timesync/SyncNowActivity.java b/app/src/main/java/com/google/android/apps/authenticator/timesync/SyncNowActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/timesync/SyncNowActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/timesync/SyncNowActivity.java diff --git a/src/com/google/android/apps/authenticator/timesync/SyncNowController.java b/app/src/main/java/com/google/android/apps/authenticator/timesync/SyncNowController.java similarity index 100% rename from src/com/google/android/apps/authenticator/timesync/SyncNowController.java rename to app/src/main/java/com/google/android/apps/authenticator/timesync/SyncNowController.java diff --git a/src/com/google/android/apps/authenticator/wizard/WizardPageActivity.java b/app/src/main/java/com/google/android/apps/authenticator/wizard/WizardPageActivity.java similarity index 100% rename from src/com/google/android/apps/authenticator/wizard/WizardPageActivity.java rename to app/src/main/java/com/google/android/apps/authenticator/wizard/WizardPageActivity.java diff --git a/res/drawable-hdpi/ic_btn_back.png b/app/src/main/res/drawable-hdpi/ic_btn_back.png similarity index 100% rename from res/drawable-hdpi/ic_btn_back.png rename to app/src/main/res/drawable-hdpi/ic_btn_back.png diff --git a/res/drawable-hdpi/ic_btn_next.png b/app/src/main/res/drawable-hdpi/ic_btn_next.png similarity index 100% rename from res/drawable-hdpi/ic_btn_next.png rename to app/src/main/res/drawable-hdpi/ic_btn_next.png diff --git a/res/drawable-ldpi-v11/ic_stat_notify_bt.png b/app/src/main/res/drawable-ldpi-v11/ic_stat_notify_bt.png similarity index 100% rename from res/drawable-ldpi-v11/ic_stat_notify_bt.png rename to app/src/main/res/drawable-ldpi-v11/ic_stat_notify_bt.png diff --git a/res/drawable-mdpi-v11/refresh.png b/app/src/main/res/drawable-mdpi-v11/refresh.png similarity index 100% rename from res/drawable-mdpi-v11/refresh.png rename to app/src/main/res/drawable-mdpi-v11/refresh.png diff --git a/res/drawable-mdpi-v11/refresh_pressed.png b/app/src/main/res/drawable-mdpi-v11/refresh_pressed.png similarity index 100% rename from res/drawable-mdpi-v11/refresh_pressed.png rename to app/src/main/res/drawable-mdpi-v11/refresh_pressed.png diff --git a/res/drawable-mdpi-v14/refresh.png b/app/src/main/res/drawable-mdpi-v14/refresh.png similarity index 100% rename from res/drawable-mdpi-v14/refresh.png rename to app/src/main/res/drawable-mdpi-v14/refresh.png diff --git a/res/drawable-xhdpi/btn_dir_next_disabled_focused_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_next_disabled_focused_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_next_disabled_focused_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_next_disabled_focused_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_next_disabled_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_next_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_next_disabled_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_next_disabled_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_next_focused_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_next_focused_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_next_focused_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_next_focused_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_next_normal_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_next_normal_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_next_normal_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_next_normal_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_next_pressed_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_next_pressed_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_next_pressed_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_next_pressed_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_prev_disabled_focused_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_prev_disabled_focused_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_prev_disabled_focused_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_prev_disabled_focused_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_prev_disabled_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_prev_disabled_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_prev_disabled_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_prev_disabled_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_prev_focused_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_prev_focused_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_prev_focused_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_prev_focused_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_prev_normal_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_prev_normal_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_prev_normal_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_prev_normal_holo_dark.9.png diff --git a/res/drawable-xhdpi/btn_dir_prev_pressed_holo_dark.9.png b/app/src/main/res/drawable-xhdpi/btn_dir_prev_pressed_holo_dark.9.png similarity index 100% rename from res/drawable-xhdpi/btn_dir_prev_pressed_holo_dark.9.png rename to app/src/main/res/drawable-xhdpi/btn_dir_prev_pressed_holo_dark.9.png diff --git a/res/drawable-xhdpi/howitworks_enter_code.png b/app/src/main/res/drawable-xhdpi/howitworks_enter_code.png similarity index 100% rename from res/drawable-xhdpi/howitworks_enter_code.png rename to app/src/main/res/drawable-xhdpi/howitworks_enter_code.png diff --git a/res/drawable-xhdpi/howitworks_enter_password.png b/app/src/main/res/drawable-xhdpi/howitworks_enter_password.png similarity index 100% rename from res/drawable-xhdpi/howitworks_enter_password.png rename to app/src/main/res/drawable-xhdpi/howitworks_enter_password.png diff --git a/res/drawable-xhdpi/howitworks_verify_device.png b/app/src/main/res/drawable-xhdpi/howitworks_verify_device.png similarity index 100% rename from res/drawable-xhdpi/howitworks_verify_device.png rename to app/src/main/res/drawable-xhdpi/howitworks_verify_device.png diff --git a/res/drawable-xhdpi/ic_launcher_authenticator.png b/app/src/main/res/drawable-xhdpi/ic_launcher_authenticator.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher_authenticator.png rename to app/src/main/res/drawable-xhdpi/ic_launcher_authenticator.png diff --git a/res/drawable/btn_dir_next_holo_dark.xml b/app/src/main/res/drawable/btn_dir_next_holo_dark.xml similarity index 100% rename from res/drawable/btn_dir_next_holo_dark.xml rename to app/src/main/res/drawable/btn_dir_next_holo_dark.xml diff --git a/res/drawable/btn_dir_prev_holo_dark.xml b/app/src/main/res/drawable/btn_dir_prev_holo_dark.xml similarity index 100% rename from res/drawable/btn_dir_prev_holo_dark.xml rename to app/src/main/res/drawable/btn_dir_prev_holo_dark.xml diff --git a/res/drawable/refresh.png b/app/src/main/res/drawable/refresh.png similarity index 100% rename from res/drawable/refresh.png rename to app/src/main/res/drawable/refresh.png diff --git a/res/drawable/refresh_button.xml b/app/src/main/res/drawable/refresh_button.xml similarity index 100% rename from res/drawable/refresh_button.xml rename to app/src/main/res/drawable/refresh_button.xml diff --git a/res/drawable/refresh_disabled.png b/app/src/main/res/drawable/refresh_disabled.png similarity index 100% rename from res/drawable/refresh_disabled.png rename to app/src/main/res/drawable/refresh_disabled.png diff --git a/res/drawable/refresh_pressed.png b/app/src/main/res/drawable/refresh_pressed.png similarity index 100% rename from res/drawable/refresh_pressed.png rename to app/src/main/res/drawable/refresh_pressed.png diff --git a/res/layout/add_other_account.xml b/app/src/main/res/layout/add_other_account.xml similarity index 100% rename from res/layout/add_other_account.xml rename to app/src/main/res/layout/add_other_account.xml diff --git a/res/layout/check_code.xml b/app/src/main/res/layout/check_code.xml similarity index 100% rename from res/layout/check_code.xml rename to app/src/main/res/layout/check_code.xml diff --git a/res/layout/enter_key.xml b/app/src/main/res/layout/enter_key.xml similarity index 100% rename from res/layout/enter_key.xml rename to app/src/main/res/layout/enter_key.xml diff --git a/res/layout/howitworks_enter_code.xml b/app/src/main/res/layout/howitworks_enter_code.xml similarity index 100% rename from res/layout/howitworks_enter_code.xml rename to app/src/main/res/layout/howitworks_enter_code.xml diff --git a/res/layout/howitworks_enter_password.xml b/app/src/main/res/layout/howitworks_enter_password.xml similarity index 100% rename from res/layout/howitworks_enter_password.xml rename to app/src/main/res/layout/howitworks_enter_password.xml diff --git a/res/layout/howitworks_verify_device.xml b/app/src/main/res/layout/howitworks_verify_device.xml similarity index 100% rename from res/layout/howitworks_verify_device.xml rename to app/src/main/res/layout/howitworks_verify_device.xml diff --git a/res/layout/main.xml b/app/src/main/res/layout/main.xml similarity index 100% rename from res/layout/main.xml rename to app/src/main/res/layout/main.xml diff --git a/res/layout/remove_account_prompt.xml b/app/src/main/res/layout/remove_account_prompt.xml similarity index 100% rename from res/layout/remove_account_prompt.xml rename to app/src/main/res/layout/remove_account_prompt.xml diff --git a/res/layout/rename.xml b/app/src/main/res/layout/rename.xml similarity index 100% rename from res/layout/rename.xml rename to app/src/main/res/layout/rename.xml diff --git a/res/layout/timesync_about.xml b/app/src/main/res/layout/timesync_about.xml similarity index 100% rename from res/layout/timesync_about.xml rename to app/src/main/res/layout/timesync_about.xml diff --git a/res/layout/user_row.xml b/app/src/main/res/layout/user_row.xml similarity index 100% rename from res/layout/user_row.xml rename to app/src/main/res/layout/user_row.xml diff --git a/res/layout/wizard_page.xml b/app/src/main/res/layout/wizard_page.xml similarity index 100% rename from res/layout/wizard_page.xml rename to app/src/main/res/layout/wizard_page.xml diff --git a/res/menu/main.xml b/app/src/main/res/menu/main.xml similarity index 100% rename from res/menu/main.xml rename to app/src/main/res/menu/main.xml diff --git a/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml similarity index 99% rename from res/values-af/strings.xml rename to app/src/main/res/values-af/strings.xml index 6056a79..46c164c 100644 --- a/res/values-af/strings.xml +++ b/app/src/main/res/values-af/strings.xml @@ -1,4 +1,4 @@ - + - - - - - - - - - diff --git a/tests/project.properties b/tests/project.properties deleted file mode 100644 index 42b916a..0000000 --- a/tests/project.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "build.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-14