Convert to Android Studio project

capi · Jan 8, 2015 · 03c8d14 · 03c8d14
1 parent 3840551
commit 03c8d14
Show file tree

Hide file tree

Showing 248 changed files with 649 additions and 233 deletions.
diff --git a/.classpath b/.classpath
diff --git a/.gitignore 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
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
diff --git a/.project b/.project
diff --git a/app/.gitignore b/app/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/app/app.iml b/app/app.iml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":app" />
+      </configuration>
+    </facet>
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
+
diff --git a/app/build.gradle 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 → app/src/androidTest/README b/tests/README → app/src/androidTest/README
diff --git a/...oid/apps/authenticator/AccountDbTest.java → ...oid/apps/authenticator/AccountDbTest.java b/...oid/apps/authenticator/AccountDbTest.java → ...oid/apps/authenticator/AccountDbTest.java
diff --git a/...nticator/AddOtherAccountActivityTest.java → ...nticator/AddOtherAccountActivityTest.java b/...nticator/AddOtherAccountActivityTest.java → ...nticator/AddOtherAccountActivityTest.java
diff --git a/...cator/AuthenticatorActivityPart2Test.java → ...cator/AuthenticatorActivityPart2Test.java b/...cator/AuthenticatorActivityPart2Test.java → ...cator/AuthenticatorActivityPart2Test.java
diff --git a/...henticator/AuthenticatorActivityTest.java → ...henticator/AuthenticatorActivityTest.java b/...henticator/AuthenticatorActivityTest.java → ...henticator/AuthenticatorActivityTest.java
diff --git a/.../apps/authenticator/Base32StringTest.java → .../apps/authenticator/Base32StringTest.java b/.../apps/authenticator/Base32StringTest.java → .../apps/authenticator/Base32StringTest.java
diff --git a/.../authenticator/CheckCodeActivityTest.java → .../authenticator/CheckCodeActivityTest.java b/.../authenticator/CheckCodeActivityTest.java → .../authenticator/CheckCodeActivityTest.java
diff --git a/...s/authenticator/EnterKeyActivityTest.java → ...s/authenticator/EnterKeyActivityTest.java b/...s/authenticator/EnterKeyActivityTest.java → ...s/authenticator/EnterKeyActivityTest.java
diff --git a/...apps/authenticator/FileUtilitiesTest.java → ...apps/authenticator/FileUtilitiesTest.java b/...apps/authenticator/FileUtilitiesTest.java → ...apps/authenticator/FileUtilitiesTest.java
diff --git a/...d/apps/authenticator/HexEncodingTest.java → ...d/apps/authenticator/HexEncodingTest.java b/...d/apps/authenticator/HexEncodingTest.java → ...d/apps/authenticator/HexEncodingTest.java
diff --git a/...ndForEclairInstrumentationTestRunner.java → ...ndForEclairInstrumentationTestRunner.java b/...ndForEclairInstrumentationTestRunner.java → ...ndForEclairInstrumentationTestRunner.java
diff --git a/...d/apps/authenticator/OtpProviderTest.java → ...d/apps/authenticator/OtpProviderTest.java b/...d/apps/authenticator/OtpProviderTest.java → ...d/apps/authenticator/OtpProviderTest.java
diff --git a/.../authenticator/PasscodeGeneratorTest.java → .../authenticator/PasscodeGeneratorTest.java b/.../authenticator/PasscodeGeneratorTest.java → .../authenticator/PasscodeGeneratorTest.java
diff --git a/...apps/authenticator/PreconditionsTest.java → ...apps/authenticator/PreconditionsTest.java b/...apps/authenticator/PreconditionsTest.java → ...apps/authenticator/PreconditionsTest.java
diff --git a/...unImmediatelyOnCallingThreadExecutor.java → ...unImmediatelyOnCallingThreadExecutor.java b/...unImmediatelyOnCallingThreadExecutor.java → ...unImmediatelyOnCallingThreadExecutor.java
diff --git a/...henticator/SettingsAboutActivityTest.java → ...henticator/SettingsAboutActivityTest.java b/...henticator/SettingsAboutActivityTest.java → ...henticator/SettingsAboutActivityTest.java
diff --git a/...oid/apps/authenticator/TestUtilities.java → ...oid/apps/authenticator/TestUtilities.java b/...oid/apps/authenticator/TestUtilities.java → ...oid/apps/authenticator/TestUtilities.java
diff --git a/...oid/apps/authenticator/TotpClockTest.java → ...oid/apps/authenticator/TotpClockTest.java b/...oid/apps/authenticator/TotpClockTest.java → ...oid/apps/authenticator/TotpClockTest.java
diff --git a/...d/apps/authenticator/TotpCounterTest.java → ...d/apps/authenticator/TotpCounterTest.java b/...d/apps/authenticator/TotpCounterTest.java → ...d/apps/authenticator/TotpCounterTest.java
diff --git a/...oid/apps/authenticator/UtilitiesTest.java → ...oid/apps/authenticator/UtilitiesTest.java b/...oid/apps/authenticator/UtilitiesTest.java → ...oid/apps/authenticator/UtilitiesTest.java
diff --git a/...uthenticator/dataimport/ImporterTest.java → ...uthenticator/dataimport/ImporterTest.java b/...uthenticator/dataimport/ImporterTest.java → ...uthenticator/dataimport/ImporterTest.java
diff --git a/...owitworks/IntroEnterCodeActivityTest.java → ...owitworks/IntroEnterCodeActivityTest.java b/...owitworks/IntroEnterCodeActivityTest.java → ...owitworks/IntroEnterCodeActivityTest.java
diff --git a/...works/IntroEnterPasswordActivityTest.java → ...works/IntroEnterPasswordActivityTest.java b/...works/IntroEnterPasswordActivityTest.java → ...works/IntroEnterPasswordActivityTest.java
diff --git a/...tworks/IntroVerifyDeviceActivityTest.java → ...tworks/IntroVerifyDeviceActivityTest.java b/...tworks/IntroVerifyDeviceActivityTest.java → ...tworks/IntroVerifyDeviceActivityTest.java
diff --git a/...or/testability/HttpClientFactoryTest.java → ...or/testability/HttpClientFactoryTest.java b/...or/testability/HttpClientFactoryTest.java → ...or/testability/HttpClientFactoryTest.java
diff --git a/...tor/timesync/NetworkTimeProviderTest.java → ...tor/timesync/NetworkTimeProviderTest.java b/...tor/timesync/NetworkTimeProviderTest.java → ...tor/timesync/NetworkTimeProviderTest.java
diff --git a/...cator/timesync/SyncNowControllerTest.java → ...cator/timesync/SyncNowControllerTest.java b/...cator/timesync/SyncNowControllerTest.java → ...cator/timesync/SyncNowControllerTest.java
diff --git a/...icator/wizard/WizardPageActivityTest.java → ...icator/wizard/WizardPageActivityTest.java b/...icator/wizard/WizardPageActivityTest.java → ...icator/wizard/WizardPageActivityTest.java
diff --git a/...or/wizard/WizardPageActivityTestBase.java → ...or/wizard/WizardPageActivityTestBase.java b/...or/wizard/WizardPageActivityTestBase.java → ...or/wizard/WizardPageActivityTestBase.java
diff --git a/AndroidManifest.xml → app/src/main/AndroidManifest.xml b/AndroidManifest.xml → app/src/main/AndroidManifest.xml
diff --git a/...nticator/dataexport/IExportServiceV2.aidl → ...nticator/dataexport/IExportServiceV2.aidl b/...nticator/dataexport/IExportServiceV2.aidl → ...nticator/dataexport/IExportServiceV2.aidl
diff --git a/...android/apps/authenticator/AccountDb.java → ...android/apps/authenticator/AccountDb.java b/...android/apps/authenticator/AccountDb.java → ...android/apps/authenticator/AccountDb.java
diff --git a/...uthenticator/AddOtherAccountActivity.java → ...uthenticator/AddOtherAccountActivity.java b/...uthenticator/AddOtherAccountActivity.java → ...uthenticator/AddOtherAccountActivity.java
diff --git a/.../authenticator/AuthenticatorActivity.java → .../authenticator/AuthenticatorActivity.java b/.../authenticator/AuthenticatorActivity.java → .../authenticator/AuthenticatorActivity.java
diff --git a/...thenticator/AuthenticatorApplication.java → ...thenticator/AuthenticatorApplication.java b/...thenticator/AuthenticatorApplication.java → ...thenticator/AuthenticatorApplication.java
diff --git a/...roid/apps/authenticator/Base32String.java → ...roid/apps/authenticator/Base32String.java b/...roid/apps/authenticator/Base32String.java → ...roid/apps/authenticator/Base32String.java
diff --git a/...apps/authenticator/CheckCodeActivity.java → ...apps/authenticator/CheckCodeActivity.java b/...apps/authenticator/CheckCodeActivity.java → ...apps/authenticator/CheckCodeActivity.java
diff --git a/...pps/authenticator/CountdownIndicator.java → ...pps/authenticator/CountdownIndicator.java b/...pps/authenticator/CountdownIndicator.java → ...pps/authenticator/CountdownIndicator.java
diff --git a/.../apps/authenticator/EnterKeyActivity.java → .../apps/authenticator/EnterKeyActivity.java b/.../apps/authenticator/EnterKeyActivity.java → .../apps/authenticator/EnterKeyActivity.java
diff --git a/...oid/apps/authenticator/FileUtilities.java → ...oid/apps/authenticator/FileUtilities.java b/...oid/apps/authenticator/FileUtilities.java → ...oid/apps/authenticator/FileUtilities.java
diff --git a/...droid/apps/authenticator/HexEncoding.java → ...droid/apps/authenticator/HexEncoding.java b/...droid/apps/authenticator/HexEncoding.java → ...droid/apps/authenticator/HexEncoding.java
diff --git a/...nticator/MarketBuildOptionalFeatures.java → ...nticator/MarketBuildOptionalFeatures.java b/...nticator/MarketBuildOptionalFeatures.java → ...nticator/MarketBuildOptionalFeatures.java
diff --git a/.../apps/authenticator/OptionalFeatures.java → .../apps/authenticator/OptionalFeatures.java b/.../apps/authenticator/OptionalFeatures.java → .../apps/authenticator/OptionalFeatures.java
diff --git a/...r/OtpGenerationNotPermittedException.java → ...r/OtpGenerationNotPermittedException.java b/...r/OtpGenerationNotPermittedException.java → ...r/OtpGenerationNotPermittedException.java
diff --git a/...droid/apps/authenticator/OtpProvider.java → ...droid/apps/authenticator/OtpProvider.java b/...droid/apps/authenticator/OtpProvider.java → ...droid/apps/authenticator/OtpProvider.java
diff --git a/...android/apps/authenticator/OtpSource.java → ...android/apps/authenticator/OtpSource.java b/...android/apps/authenticator/OtpSource.java → ...android/apps/authenticator/OtpSource.java
diff --git a/...pps/authenticator/OtpSourceException.java → ...pps/authenticator/OtpSourceException.java b/...pps/authenticator/OtpSourceException.java → ...pps/authenticator/OtpSourceException.java
diff --git a/...apps/authenticator/PasscodeGenerator.java → ...apps/authenticator/PasscodeGenerator.java b/...apps/authenticator/PasscodeGenerator.java → ...apps/authenticator/PasscodeGenerator.java
diff --git a/...oid/apps/authenticator/Preconditions.java → ...oid/apps/authenticator/Preconditions.java b/...oid/apps/authenticator/Preconditions.java → ...oid/apps/authenticator/Preconditions.java
diff --git a/...icator/RunOnThisLooperThreadExecutor.java → ...icator/RunOnThisLooperThreadExecutor.java b/...icator/RunOnThisLooperThreadExecutor.java → ...icator/RunOnThisLooperThreadExecutor.java
diff --git a/.../authenticator/SettingsAboutActivity.java → .../authenticator/SettingsAboutActivity.java b/.../authenticator/SettingsAboutActivity.java → .../authenticator/SettingsAboutActivity.java
diff --git a/.../apps/authenticator/SettingsActivity.java → .../apps/authenticator/SettingsActivity.java b/.../apps/authenticator/SettingsActivity.java → .../apps/authenticator/SettingsActivity.java
diff --git a/...android/apps/authenticator/TotpClock.java → ...android/apps/authenticator/TotpClock.java b/...android/apps/authenticator/TotpClock.java → ...android/apps/authenticator/TotpClock.java
diff --git a/...apps/authenticator/TotpCountdownTask.java → ...apps/authenticator/TotpCountdownTask.java b/...apps/authenticator/TotpCountdownTask.java → ...apps/authenticator/TotpCountdownTask.java
diff --git a/...droid/apps/authenticator/TotpCounter.java → ...droid/apps/authenticator/TotpCounter.java b/...droid/apps/authenticator/TotpCounter.java → ...droid/apps/authenticator/TotpCounter.java
diff --git a/...droid/apps/authenticator/UserRowView.java → ...droid/apps/authenticator/UserRowView.java b/...droid/apps/authenticator/UserRowView.java → ...droid/apps/authenticator/UserRowView.java
diff --git a/...android/apps/authenticator/Utilities.java → ...android/apps/authenticator/Utilities.java b/...android/apps/authenticator/Utilities.java → ...android/apps/authenticator/Utilities.java
diff --git a/...t/ExportServiceBasedImportController.java → ...t/ExportServiceBasedImportController.java b/...t/ExportServiceBasedImportController.java → ...t/ExportServiceBasedImportController.java
diff --git a/...nticator/dataimport/ImportController.java → ...nticator/dataimport/ImportController.java b/...nticator/dataimport/ImportController.java → ...nticator/dataimport/ImportController.java
diff --git a/...ps/authenticator/dataimport/Importer.java → ...ps/authenticator/dataimport/Importer.java b/...ps/authenticator/dataimport/Importer.java → ...ps/authenticator/dataimport/Importer.java
diff --git a/...or/howitworks/IntroEnterCodeActivity.java → ...or/howitworks/IntroEnterCodeActivity.java b/...or/howitworks/IntroEnterCodeActivity.java → ...or/howitworks/IntroEnterCodeActivity.java
diff --git a/...owitworks/IntroEnterPasswordActivity.java → ...owitworks/IntroEnterPasswordActivity.java b/...owitworks/IntroEnterPasswordActivity.java → ...owitworks/IntroEnterPasswordActivity.java
diff --git a/...howitworks/IntroVerifyDeviceActivity.java → ...howitworks/IntroVerifyDeviceActivity.java b/...howitworks/IntroVerifyDeviceActivity.java → ...howitworks/IntroVerifyDeviceActivity.java
diff --git a/...cator/testability/DependencyInjector.java → ...cator/testability/DependencyInjector.java b/...cator/testability/DependencyInjector.java → ...cator/testability/DependencyInjector.java
diff --git a/...icator/testability/HttpClientFactory.java → ...icator/testability/HttpClientFactory.java b/...icator/testability/HttpClientFactory.java → ...icator/testability/HttpClientFactory.java
diff --git a/...PreferencesRenamingDelegatingContext.java → ...PreferencesRenamingDelegatingContext.java b/...PreferencesRenamingDelegatingContext.java → ...PreferencesRenamingDelegatingContext.java
diff --git a/...or/testability/StartActivityListener.java → ...or/testability/StartActivityListener.java b/...or/testability/StartActivityListener.java → ...or/testability/StartActivityListener.java
diff --git a/...ticator/testability/TestableActivity.java → ...ticator/testability/TestableActivity.java b/...ticator/testability/TestableActivity.java → ...ticator/testability/TestableActivity.java
diff --git a/...stability/TestablePreferenceActivity.java → ...stability/TestablePreferenceActivity.java b/...stability/TestablePreferenceActivity.java → ...stability/TestablePreferenceActivity.java
diff --git a/...authenticator/timesync/AboutActivity.java → ...authenticator/timesync/AboutActivity.java b/...authenticator/timesync/AboutActivity.java → ...authenticator/timesync/AboutActivity.java
diff --git a/...ticator/timesync/NetworkTimeProvider.java → ...ticator/timesync/NetworkTimeProvider.java b/...ticator/timesync/NetworkTimeProvider.java → ...ticator/timesync/NetworkTimeProvider.java
diff --git a/...esync/SettingsTimeCorrectionActivity.java → ...esync/SettingsTimeCorrectionActivity.java b/...esync/SettingsTimeCorrectionActivity.java → ...esync/SettingsTimeCorrectionActivity.java
diff --git a/...thenticator/timesync/SyncNowActivity.java → ...thenticator/timesync/SyncNowActivity.java b/...thenticator/timesync/SyncNowActivity.java → ...thenticator/timesync/SyncNowActivity.java
diff --git a/...enticator/timesync/SyncNowController.java → ...enticator/timesync/SyncNowController.java b/...enticator/timesync/SyncNowController.java → ...enticator/timesync/SyncNowController.java
diff --git a/...henticator/wizard/WizardPageActivity.java → ...henticator/wizard/WizardPageActivity.java b/...henticator/wizard/WizardPageActivity.java → ...henticator/wizard/WizardPageActivity.java
diff --git a/res/drawable-hdpi/ic_btn_back.png → ...rc/main/res/drawable-hdpi/ic_btn_back.png b/res/drawable-hdpi/ic_btn_back.png → ...rc/main/res/drawable-hdpi/ic_btn_back.png
diff --git a/res/drawable-hdpi/ic_btn_next.png → ...rc/main/res/drawable-hdpi/ic_btn_next.png b/res/drawable-hdpi/ic_btn_next.png → ...rc/main/res/drawable-hdpi/ic_btn_next.png
diff --git a/res/drawable-ldpi-v11/ic_stat_notify_bt.png → ...s/drawable-ldpi-v11/ic_stat_notify_bt.png b/res/drawable-ldpi-v11/ic_stat_notify_bt.png → ...s/drawable-ldpi-v11/ic_stat_notify_bt.png
diff --git a/res/drawable-mdpi-v11/refresh.png → ...rc/main/res/drawable-mdpi-v11/refresh.png b/res/drawable-mdpi-v11/refresh.png → ...rc/main/res/drawable-mdpi-v11/refresh.png
diff --git a/res/drawable-mdpi-v11/refresh_pressed.png → ...res/drawable-mdpi-v11/refresh_pressed.png b/res/drawable-mdpi-v11/refresh_pressed.png → ...res/drawable-mdpi-v11/refresh_pressed.png
diff --git a/res/drawable-mdpi-v14/refresh.png → ...rc/main/res/drawable-mdpi-v14/refresh.png b/res/drawable-mdpi-v14/refresh.png → ...rc/main/res/drawable-mdpi-v14/refresh.png
diff --git a/...dir_next_disabled_focused_holo_dark.9.png → ...dir_next_disabled_focused_holo_dark.9.png b/...dir_next_disabled_focused_holo_dark.9.png → ...dir_next_disabled_focused_holo_dark.9.png
diff --git a/...dpi/btn_dir_next_disabled_holo_dark.9.png → ...dpi/btn_dir_next_disabled_holo_dark.9.png b/...dpi/btn_dir_next_disabled_holo_dark.9.png → ...dpi/btn_dir_next_disabled_holo_dark.9.png
diff --git a/...hdpi/btn_dir_next_focused_holo_dark.9.png → ...hdpi/btn_dir_next_focused_holo_dark.9.png b/...hdpi/btn_dir_next_focused_holo_dark.9.png → ...hdpi/btn_dir_next_focused_holo_dark.9.png
diff --git a/...xhdpi/btn_dir_next_normal_holo_dark.9.png → ...xhdpi/btn_dir_next_normal_holo_dark.9.png b/...xhdpi/btn_dir_next_normal_holo_dark.9.png → ...xhdpi/btn_dir_next_normal_holo_dark.9.png
diff --git a/...hdpi/btn_dir_next_pressed_holo_dark.9.png → ...hdpi/btn_dir_next_pressed_holo_dark.9.png b/...hdpi/btn_dir_next_pressed_holo_dark.9.png → ...hdpi/btn_dir_next_pressed_holo_dark.9.png
diff --git a/...dir_prev_disabled_focused_holo_dark.9.png → ...dir_prev_disabled_focused_holo_dark.9.png b/...dir_prev_disabled_focused_holo_dark.9.png → ...dir_prev_disabled_focused_holo_dark.9.png
diff --git a/...dpi/btn_dir_prev_disabled_holo_dark.9.png → ...dpi/btn_dir_prev_disabled_holo_dark.9.png b/...dpi/btn_dir_prev_disabled_holo_dark.9.png → ...dpi/btn_dir_prev_disabled_holo_dark.9.png
diff --git a/...hdpi/btn_dir_prev_focused_holo_dark.9.png → ...hdpi/btn_dir_prev_focused_holo_dark.9.png b/...hdpi/btn_dir_prev_focused_holo_dark.9.png → ...hdpi/btn_dir_prev_focused_holo_dark.9.png
diff --git a/...xhdpi/btn_dir_prev_normal_holo_dark.9.png → ...xhdpi/btn_dir_prev_normal_holo_dark.9.png b/...xhdpi/btn_dir_prev_normal_holo_dark.9.png → ...xhdpi/btn_dir_prev_normal_holo_dark.9.png
diff --git a/...hdpi/btn_dir_prev_pressed_holo_dark.9.png → ...hdpi/btn_dir_prev_pressed_holo_dark.9.png b/...hdpi/btn_dir_prev_pressed_holo_dark.9.png → ...hdpi/btn_dir_prev_pressed_holo_dark.9.png
diff --git a/res/drawable-xhdpi/howitworks_enter_code.png → .../drawable-xhdpi/howitworks_enter_code.png b/res/drawable-xhdpi/howitworks_enter_code.png → .../drawable-xhdpi/howitworks_enter_code.png
diff --git a/...wable-xhdpi/howitworks_enter_password.png → ...wable-xhdpi/howitworks_enter_password.png b/...wable-xhdpi/howitworks_enter_password.png → ...wable-xhdpi/howitworks_enter_password.png
diff --git a/...awable-xhdpi/howitworks_verify_device.png → ...awable-xhdpi/howitworks_verify_device.png b/...awable-xhdpi/howitworks_verify_device.png → ...awable-xhdpi/howitworks_verify_device.png
diff --git a/...wable-xhdpi/ic_launcher_authenticator.png → ...wable-xhdpi/ic_launcher_authenticator.png b/...wable-xhdpi/ic_launcher_authenticator.png → ...wable-xhdpi/ic_launcher_authenticator.png
diff --git a/res/drawable/btn_dir_next_holo_dark.xml → ...n/res/drawable/btn_dir_next_holo_dark.xml b/res/drawable/btn_dir_next_holo_dark.xml → ...n/res/drawable/btn_dir_next_holo_dark.xml
diff --git a/res/drawable/btn_dir_prev_holo_dark.xml → ...n/res/drawable/btn_dir_prev_holo_dark.xml b/res/drawable/btn_dir_prev_holo_dark.xml → ...n/res/drawable/btn_dir_prev_holo_dark.xml
diff --git a/res/drawable/refresh.png → app/src/main/res/drawable/refresh.png b/res/drawable/refresh.png → app/src/main/res/drawable/refresh.png
diff --git a/res/drawable/refresh_button.xml → app/src/main/res/drawable/refresh_button.xml b/res/drawable/refresh_button.xml → app/src/main/res/drawable/refresh_button.xml
diff --git a/res/drawable/refresh_disabled.png → ...rc/main/res/drawable/refresh_disabled.png b/res/drawable/refresh_disabled.png → ...rc/main/res/drawable/refresh_disabled.png
diff --git a/res/drawable/refresh_pressed.png → ...src/main/res/drawable/refresh_pressed.png b/res/drawable/refresh_pressed.png → ...src/main/res/drawable/refresh_pressed.png
diff --git a/res/layout/add_other_account.xml → ...src/main/res/layout/add_other_account.xml b/res/layout/add_other_account.xml → ...src/main/res/layout/add_other_account.xml
diff --git a/res/layout/check_code.xml → app/src/main/res/layout/check_code.xml b/res/layout/check_code.xml → app/src/main/res/layout/check_code.xml
diff --git a/res/layout/enter_key.xml → app/src/main/res/layout/enter_key.xml b/res/layout/enter_key.xml → app/src/main/res/layout/enter_key.xml
diff --git a/res/layout/howitworks_enter_code.xml → ...main/res/layout/howitworks_enter_code.xml b/res/layout/howitworks_enter_code.xml → ...main/res/layout/howitworks_enter_code.xml
diff --git a/res/layout/howitworks_enter_password.xml → .../res/layout/howitworks_enter_password.xml b/res/layout/howitworks_enter_password.xml → .../res/layout/howitworks_enter_password.xml
diff --git a/res/layout/howitworks_verify_device.xml → ...n/res/layout/howitworks_verify_device.xml b/res/layout/howitworks_verify_device.xml → ...n/res/layout/howitworks_verify_device.xml
diff --git a/res/layout/main.xml → app/src/main/res/layout/main.xml b/res/layout/main.xml → app/src/main/res/layout/main.xml
diff --git a/res/layout/remove_account_prompt.xml → ...main/res/layout/remove_account_prompt.xml b/res/layout/remove_account_prompt.xml → ...main/res/layout/remove_account_prompt.xml
diff --git a/res/layout/rename.xml → app/src/main/res/layout/rename.xml b/res/layout/rename.xml → app/src/main/res/layout/rename.xml
diff --git a/res/layout/timesync_about.xml → app/src/main/res/layout/timesync_about.xml b/res/layout/timesync_about.xml → app/src/main/res/layout/timesync_about.xml
diff --git a/res/layout/user_row.xml → app/src/main/res/layout/user_row.xml b/res/layout/user_row.xml → app/src/main/res/layout/user_row.xml
diff --git a/res/layout/wizard_page.xml → app/src/main/res/layout/wizard_page.xml b/res/layout/wizard_page.xml → app/src/main/res/layout/wizard_page.xml
diff --git a/res/menu/main.xml → app/src/main/res/menu/main.xml b/res/menu/main.xml → app/src/main/res/menu/main.xml
diff --git a/res/values-af/strings.xml → app/src/main/res/values-af/strings.xml b/res/values-af/strings.xml → app/src/main/res/values-af/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-af/timesync_strings.xml → ...c/main/res/values-af/timesync_strings.xml b/res/values-af/timesync_strings.xml → ...c/main/res/values-af/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-am/strings.xml → app/src/main/res/values-am/strings.xml b/res/values-am/strings.xml → app/src/main/res/values-am/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-am/timesync_strings.xml → ...c/main/res/values-am/timesync_strings.xml b/res/values-am/timesync_strings.xml → ...c/main/res/values-am/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-ar/strings.xml → app/src/main/res/values-ar/strings.xml b/res/values-ar/strings.xml → app/src/main/res/values-ar/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-ar/timesync_strings.xml → ...c/main/res/values-ar/timesync_strings.xml b/res/values-ar/timesync_strings.xml → ...c/main/res/values-ar/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-bg/strings.xml → app/src/main/res/values-bg/strings.xml b/res/values-bg/strings.xml → app/src/main/res/values-bg/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-bg/timesync_strings.xml → ...c/main/res/values-bg/timesync_strings.xml b/res/values-bg/timesync_strings.xml → ...c/main/res/values-bg/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-ca/strings.xml → app/src/main/res/values-ca/strings.xml b/res/values-ca/strings.xml → app/src/main/res/values-ca/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-ca/timesync_strings.xml → ...c/main/res/values-ca/timesync_strings.xml b/res/values-ca/timesync_strings.xml → ...c/main/res/values-ca/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-cs/strings.xml → app/src/main/res/values-cs/strings.xml b/res/values-cs/strings.xml → app/src/main/res/values-cs/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-cs/timesync_strings.xml → ...c/main/res/values-cs/timesync_strings.xml b/res/values-cs/timesync_strings.xml → ...c/main/res/values-cs/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-da/strings.xml → app/src/main/res/values-da/strings.xml b/res/values-da/strings.xml → app/src/main/res/values-da/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-da/timesync_strings.xml → ...c/main/res/values-da/timesync_strings.xml b/res/values-da/timesync_strings.xml → ...c/main/res/values-da/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-de/strings.xml → app/src/main/res/values-de/strings.xml b/res/values-de/strings.xml → app/src/main/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-de/timesync_strings.xml → ...c/main/res/values-de/timesync_strings.xml b/res/values-de/timesync_strings.xml → ...c/main/res/values-de/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-el/strings.xml → app/src/main/res/values-el/strings.xml b/res/values-el/strings.xml → app/src/main/res/values-el/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-el/timesync_strings.xml → ...c/main/res/values-el/timesync_strings.xml b/res/values-el/timesync_strings.xml → ...c/main/res/values-el/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-en-rGB/strings.xml → app/src/main/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml → app/src/main/res/values-en-rGB/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2011 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");

diff --git a/res/values-en-rGB/timesync_strings.xml → ...in/res/values-en-rGB/timesync_strings.xml b/res/values-en-rGB/timesync_strings.xml → ...in/res/values-en-rGB/timesync_strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright 2012 Google Inc. All Rights Reserved.
 
      Licensed under the Apache License, Version 2.0 (the "License");