diff --git a/.checkstyle b/.checkstyle deleted file mode 100644 index 75246d341f..0000000000 --- a/.checkstyle +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/.classpath b/.classpath deleted file mode 100644 index b9483504b2..0000000000 --- a/.classpath +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/.gitignore b/.gitignore index 91dab5eb25..df405f8336 100644 --- a/.gitignore +++ b/.gitignore @@ -1,29 +1,43 @@ -.settings +# built application files *.apk +*.ap_ +# files for the dex VM +*.dex + +# Java class files +*.class + +# built native files +*.o +*.so + +# generated files bin/ gen/ -/testbin/com/ichi2/anki/AllTests.class -/testbin/com/ichi2/anki/AnkiDroidTest.class -/test/com/ichi2/anki/AllTests.java -/test/com/ichi2/anki/AnkiDroidTest.java -tools/crowdin_key.txt -build.xml -.build.xml +# Ignore gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) local.properties -proguard.cfg -deps/showcaseview/proguard-project.txt -coverage.em -.idea/ -out/ -*.iml -*.eml +# Proguard folder generated by Eclipse +proguard/ -# Temporary file by update-localizations.py -ankidroid.zip +# Eclipse Metadata +.metadata/ -# Chrome -*.crx -*.crx.json +# Mac OS X clutter +*.DS_Store + +# Windows clutter +Thumbs.db + +# Intellij IDEA (see https://intellij-support.jetbrains.com/entries/23393067) +.idea/workspace.xml +.idea/tasks.xml +.idea/datasources.xml +.idea/dataSources.ids +.idea/libraries diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000000..fdc62eb247 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +AnkiDroidProject \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000000..217af471a9 --- /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 0000000000..e7bedf3377 --- /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 0000000000..e206d70d85 --- /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 0000000000..9432d29e08 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000000..ca9dd3d3b3 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000..1c21c119d3 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 0000000000..922003b843 --- /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 0000000000..def6a6a184 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/.project b/.project deleted file mode 100644 index 0652fde344..0000000000 --- a/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - AnkiDroid - - - - - - 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/.travis.yml b/.travis.yml deleted file mode 100644 index 6341e724be..0000000000 --- a/.travis.yml +++ /dev/null @@ -1,18 +0,0 @@ -language: java -branches: - only: - - /^release-[0-9.]*$/ - - /^develop$/ - -before_install: - # Needed to run Android SDK tools, which are 32-bit binaries. - - sudo apt-get update -qq - - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch > /dev/null; fi -before_script: - # Configure Android SDK tools and platforms required to build. - - ./tools/travis/continuous-setup.sh .. -script: "./tools/travis/continuous-build-and-test.sh" - -notifications: - email: - - flerda+ankidroid-continuous@gmail.com diff --git a/AnkiDroid/.gitignore b/AnkiDroid/.gitignore new file mode 100644 index 0000000000..796b96d1c4 --- /dev/null +++ b/AnkiDroid/.gitignore @@ -0,0 +1 @@ +/build diff --git a/AnkiDroid/AnkiDroid.iml b/AnkiDroid/AnkiDroid.iml new file mode 100644 index 0000000000..5dc10fa9e9 --- /dev/null +++ b/AnkiDroid/AnkiDroid.iml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/AnkiDroid/build.gradle b/AnkiDroid/build.gradle new file mode 100644 index 0000000000..844d1d27ba --- /dev/null +++ b/AnkiDroid/build.gradle @@ -0,0 +1,37 @@ +apply plugin: 'com.android.application' +def homePath = System.properties['user.home'] +android { + compileSdkVersion 19 + buildToolsVersion "19.1" + + defaultConfig { + applicationId "com.ichi2.anki" + minSdkVersion 7 + targetSdkVersion 19 + } + signingConfigs { + release { + storeFile file("${homePath}/src/android-keystore") + keyAlias "nrkeystorealias" + storePassword System.getenv("KSTOREPWD") + keyPassword System.getenv("KEYPWD") + } + } + buildTypes { + release { + runProguard true + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release + } + } + lintOptions { + abortOnError false + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + compile 'com.android.support:appcompat-v7:19.1.0' + compile 'com.google.code.gson:gson:2.3' + compile project(":ShowcaseView:library") +} diff --git a/AnkiDroid/proguard-rules.pro b/AnkiDroid/proguard-rules.pro new file mode 100644 index 0000000000..d169105564 --- /dev/null +++ b/AnkiDroid/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\Program Files (x86)\Android\android-sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/AndroidManifest.xml b/AnkiDroid/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to AnkiDroid/src/main/AndroidManifest.xml diff --git a/assets/card_template.html b/AnkiDroid/src/main/assets/card_template.html similarity index 100% rename from assets/card_template.html rename to AnkiDroid/src/main/assets/card_template.html diff --git a/assets/chess.css b/AnkiDroid/src/main/assets/chess.css similarity index 100% rename from assets/chess.css rename to AnkiDroid/src/main/assets/chess.css diff --git a/assets/flashcard.css b/AnkiDroid/src/main/assets/flashcard.css similarity index 100% rename from assets/flashcard.css rename to AnkiDroid/src/main/assets/flashcard.css diff --git a/assets/fonts/OpenSans-Bold.ttf b/AnkiDroid/src/main/assets/fonts/OpenSans-Bold.ttf similarity index 100% rename from assets/fonts/OpenSans-Bold.ttf rename to AnkiDroid/src/main/assets/fonts/OpenSans-Bold.ttf diff --git a/assets/fonts/OpenSans-BoldItalic.ttf b/AnkiDroid/src/main/assets/fonts/OpenSans-BoldItalic.ttf similarity index 100% rename from assets/fonts/OpenSans-BoldItalic.ttf rename to AnkiDroid/src/main/assets/fonts/OpenSans-BoldItalic.ttf diff --git a/assets/fonts/OpenSans-CondensedBold.ttf b/AnkiDroid/src/main/assets/fonts/OpenSans-CondensedBold.ttf similarity index 100% rename from assets/fonts/OpenSans-CondensedBold.ttf rename to AnkiDroid/src/main/assets/fonts/OpenSans-CondensedBold.ttf diff --git a/assets/fonts/OpenSans-Italic.ttf b/AnkiDroid/src/main/assets/fonts/OpenSans-Italic.ttf similarity index 100% rename from assets/fonts/OpenSans-Italic.ttf rename to AnkiDroid/src/main/assets/fonts/OpenSans-Italic.ttf diff --git a/assets/fonts/OpenSans-Light.ttf b/AnkiDroid/src/main/assets/fonts/OpenSans-Light.ttf similarity index 100% rename from assets/fonts/OpenSans-Light.ttf rename to AnkiDroid/src/main/assets/fonts/OpenSans-Light.ttf diff --git a/assets/fonts/OpenSans-LightItalic.ttf b/AnkiDroid/src/main/assets/fonts/OpenSans-LightItalic.ttf similarity index 100% rename from assets/fonts/OpenSans-LightItalic.ttf rename to AnkiDroid/src/main/assets/fonts/OpenSans-LightItalic.ttf diff --git a/assets/fonts/OpenSans-Regular.ttf b/AnkiDroid/src/main/assets/fonts/OpenSans-Regular.ttf similarity index 100% rename from assets/fonts/OpenSans-Regular.ttf rename to AnkiDroid/src/main/assets/fonts/OpenSans-Regular.ttf diff --git a/assets/media_playback_start2.png b/AnkiDroid/src/main/assets/media_playback_start2.png similarity index 100% rename from assets/media_playback_start2.png rename to AnkiDroid/src/main/assets/media_playback_start2.png diff --git a/assets/ruby.css b/AnkiDroid/src/main/assets/ruby.css similarity index 100% rename from assets/ruby.css rename to AnkiDroid/src/main/assets/ruby.css diff --git a/assets/shared_decks_template.html b/AnkiDroid/src/main/assets/shared_decks_template.html similarity index 100% rename from assets/shared_decks_template.html rename to AnkiDroid/src/main/assets/shared_decks_template.html diff --git a/src/com/example/android/common/view/SlidingTabLayout.java b/AnkiDroid/src/main/java/com/example/android/common/view/SlidingTabLayout.java similarity index 100% rename from src/com/example/android/common/view/SlidingTabLayout.java rename to AnkiDroid/src/main/java/com/example/android/common/view/SlidingTabLayout.java diff --git a/src/com/example/android/common/view/SlidingTabStrip.java b/AnkiDroid/src/main/java/com/example/android/common/view/SlidingTabStrip.java similarity index 100% rename from src/com/example/android/common/view/SlidingTabStrip.java rename to AnkiDroid/src/main/java/com/example/android/common/view/SlidingTabStrip.java diff --git a/src/com/hlidskialf/android/preference/SeekBarPreference.java b/AnkiDroid/src/main/java/com/hlidskialf/android/preference/SeekBarPreference.java similarity index 100% rename from src/com/hlidskialf/android/preference/SeekBarPreference.java rename to AnkiDroid/src/main/java/com/hlidskialf/android/preference/SeekBarPreference.java diff --git a/src/com/ichi2/anim/ActivityTransitionAnimation.java b/AnkiDroid/src/main/java/com/ichi2/anim/ActivityTransitionAnimation.java similarity index 100% rename from src/com/ichi2/anim/ActivityTransitionAnimation.java rename to AnkiDroid/src/main/java/com/ichi2/anim/ActivityTransitionAnimation.java diff --git a/src/com/ichi2/anim/ViewAnimation.java b/AnkiDroid/src/main/java/com/ichi2/anim/ViewAnimation.java similarity index 100% rename from src/com/ichi2/anim/ViewAnimation.java rename to AnkiDroid/src/main/java/com/ichi2/anim/ViewAnimation.java diff --git a/src/com/ichi2/anki/AbstractFlashcardViewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java similarity index 100% rename from src/com/ichi2/anki/AbstractFlashcardViewer.java rename to AnkiDroid/src/main/java/com/ichi2/anki/AbstractFlashcardViewer.java diff --git a/src/com/ichi2/anki/AnkiActivity.java b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.java similarity index 100% rename from src/com/ichi2/anki/AnkiActivity.java rename to AnkiDroid/src/main/java/com/ichi2/anki/AnkiActivity.java diff --git a/src/com/ichi2/anki/AnkiDatabaseManager.java b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDatabaseManager.java similarity index 100% rename from src/com/ichi2/anki/AnkiDatabaseManager.java rename to AnkiDroid/src/main/java/com/ichi2/anki/AnkiDatabaseManager.java diff --git a/src/com/ichi2/anki/AnkiDb.java b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDb.java similarity index 100% rename from src/com/ichi2/anki/AnkiDb.java rename to AnkiDroid/src/main/java/com/ichi2/anki/AnkiDb.java diff --git a/src/com/ichi2/anki/AnkiDroidApp.java b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.java similarity index 100% rename from src/com/ichi2/anki/AnkiDroidApp.java rename to AnkiDroid/src/main/java/com/ichi2/anki/AnkiDroidApp.java diff --git a/src/com/ichi2/anki/AnkiFont.java b/AnkiDroid/src/main/java/com/ichi2/anki/AnkiFont.java similarity index 100% rename from src/com/ichi2/anki/AnkiFont.java rename to AnkiDroid/src/main/java/com/ichi2/anki/AnkiFont.java diff --git a/src/com/ichi2/anki/BackupManager.java b/AnkiDroid/src/main/java/com/ichi2/anki/BackupManager.java similarity index 100% rename from src/com/ichi2/anki/BackupManager.java rename to AnkiDroid/src/main/java/com/ichi2/anki/BackupManager.java diff --git a/src/com/ichi2/anki/CardBrowser.java b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.java similarity index 100% rename from src/com/ichi2/anki/CardBrowser.java rename to AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.java diff --git a/src/com/ichi2/anki/CramDeckOptions.java b/AnkiDroid/src/main/java/com/ichi2/anki/CramDeckOptions.java similarity index 100% rename from src/com/ichi2/anki/CramDeckOptions.java rename to AnkiDroid/src/main/java/com/ichi2/anki/CramDeckOptions.java diff --git a/src/com/ichi2/anki/CustomExceptionHandler.java b/AnkiDroid/src/main/java/com/ichi2/anki/CustomExceptionHandler.java similarity index 100% rename from src/com/ichi2/anki/CustomExceptionHandler.java rename to AnkiDroid/src/main/java/com/ichi2/anki/CustomExceptionHandler.java diff --git a/src/com/ichi2/anki/DeckOptions.java b/AnkiDroid/src/main/java/com/ichi2/anki/DeckOptions.java similarity index 100% rename from src/com/ichi2/anki/DeckOptions.java rename to AnkiDroid/src/main/java/com/ichi2/anki/DeckOptions.java diff --git a/src/com/ichi2/anki/DeckPicker.java b/AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java similarity index 100% rename from src/com/ichi2/anki/DeckPicker.java rename to AnkiDroid/src/main/java/com/ichi2/anki/DeckPicker.java diff --git a/src/com/ichi2/anki/Download.java b/AnkiDroid/src/main/java/com/ichi2/anki/Download.java similarity index 100% rename from src/com/ichi2/anki/Download.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Download.java diff --git a/src/com/ichi2/anki/Feedback.java b/AnkiDroid/src/main/java/com/ichi2/anki/Feedback.java similarity index 100% rename from src/com/ichi2/anki/Feedback.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Feedback.java diff --git a/src/com/ichi2/anki/FieldEditText.java b/AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.java similarity index 100% rename from src/com/ichi2/anki/FieldEditText.java rename to AnkiDroid/src/main/java/com/ichi2/anki/FieldEditText.java diff --git a/src/com/ichi2/anki/Info.java b/AnkiDroid/src/main/java/com/ichi2/anki/Info.java similarity index 100% rename from src/com/ichi2/anki/Info.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Info.java diff --git a/src/com/ichi2/anki/IntentHandler.java b/AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.java similarity index 100% rename from src/com/ichi2/anki/IntentHandler.java rename to AnkiDroid/src/main/java/com/ichi2/anki/IntentHandler.java diff --git a/src/com/ichi2/anki/Lookup.java b/AnkiDroid/src/main/java/com/ichi2/anki/Lookup.java similarity index 100% rename from src/com/ichi2/anki/Lookup.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Lookup.java diff --git a/src/com/ichi2/anki/MetaDB.java b/AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.java similarity index 100% rename from src/com/ichi2/anki/MetaDB.java rename to AnkiDroid/src/main/java/com/ichi2/anki/MetaDB.java diff --git a/src/com/ichi2/anki/MyAccount.java b/AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.java similarity index 100% rename from src/com/ichi2/anki/MyAccount.java rename to AnkiDroid/src/main/java/com/ichi2/anki/MyAccount.java diff --git a/src/com/ichi2/anki/NavigationDrawerActivity.java b/AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.java similarity index 100% rename from src/com/ichi2/anki/NavigationDrawerActivity.java rename to AnkiDroid/src/main/java/com/ichi2/anki/NavigationDrawerActivity.java diff --git a/src/com/ichi2/anki/NoteEditor.java b/AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.java similarity index 100% rename from src/com/ichi2/anki/NoteEditor.java rename to AnkiDroid/src/main/java/com/ichi2/anki/NoteEditor.java diff --git a/src/com/ichi2/anki/Preferences.java b/AnkiDroid/src/main/java/com/ichi2/anki/Preferences.java similarity index 100% rename from src/com/ichi2/anki/Preferences.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Preferences.java diff --git a/src/com/ichi2/anki/Previewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/Previewer.java similarity index 100% rename from src/com/ichi2/anki/Previewer.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Previewer.java diff --git a/src/com/ichi2/anki/ReadText.java b/AnkiDroid/src/main/java/com/ichi2/anki/ReadText.java similarity index 100% rename from src/com/ichi2/anki/ReadText.java rename to AnkiDroid/src/main/java/com/ichi2/anki/ReadText.java diff --git a/src/com/ichi2/anki/Reviewer.java b/AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java similarity index 100% rename from src/com/ichi2/anki/Reviewer.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Reviewer.java diff --git a/src/com/ichi2/anki/SharedDeckDownload.java b/AnkiDroid/src/main/java/com/ichi2/anki/SharedDeckDownload.java similarity index 100% rename from src/com/ichi2/anki/SharedDeckDownload.java rename to AnkiDroid/src/main/java/com/ichi2/anki/SharedDeckDownload.java diff --git a/src/com/ichi2/anki/Statistics.java b/AnkiDroid/src/main/java/com/ichi2/anki/Statistics.java similarity index 100% rename from src/com/ichi2/anki/Statistics.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Statistics.java diff --git a/src/com/ichi2/anki/StudyOptionsActivity.java b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsActivity.java similarity index 100% rename from src/com/ichi2/anki/StudyOptionsActivity.java rename to AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsActivity.java diff --git a/src/com/ichi2/anki/StudyOptionsFragment.java b/AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.java similarity index 100% rename from src/com/ichi2/anki/StudyOptionsFragment.java rename to AnkiDroid/src/main/java/com/ichi2/anki/StudyOptionsFragment.java diff --git a/src/com/ichi2/anki/UIUtils.java b/AnkiDroid/src/main/java/com/ichi2/anki/UIUtils.java similarity index 100% rename from src/com/ichi2/anki/UIUtils.java rename to AnkiDroid/src/main/java/com/ichi2/anki/UIUtils.java diff --git a/src/com/ichi2/anki/VideoPlayer.java b/AnkiDroid/src/main/java/com/ichi2/anki/VideoPlayer.java similarity index 100% rename from src/com/ichi2/anki/VideoPlayer.java rename to AnkiDroid/src/main/java/com/ichi2/anki/VideoPlayer.java diff --git a/src/com/ichi2/anki/Whiteboard.java b/AnkiDroid/src/main/java/com/ichi2/anki/Whiteboard.java similarity index 100% rename from src/com/ichi2/anki/Whiteboard.java rename to AnkiDroid/src/main/java/com/ichi2/anki/Whiteboard.java diff --git a/src/com/ichi2/anki/dialogs/AsyncDialogFragment.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/AsyncDialogFragment.java similarity index 100% rename from src/com/ichi2/anki/dialogs/AsyncDialogFragment.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/AsyncDialogFragment.java diff --git a/src/com/ichi2/anki/dialogs/ConfirmationDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ConfirmationDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/ConfirmationDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ConfirmationDialog.java diff --git a/src/com/ichi2/anki/dialogs/CustomStudyDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CustomStudyDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/CustomStudyDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/CustomStudyDialog.java diff --git a/src/com/ichi2/anki/dialogs/DatabaseErrorDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/DatabaseErrorDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DatabaseErrorDialog.java diff --git a/src/com/ichi2/anki/dialogs/DeckPickerBackupNoSpaceLeftDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerBackupNoSpaceLeftDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/DeckPickerBackupNoSpaceLeftDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerBackupNoSpaceLeftDialog.java diff --git a/src/com/ichi2/anki/dialogs/DeckPickerConfirmDeleteDeckDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerConfirmDeleteDeckDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/DeckPickerConfirmDeleteDeckDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerConfirmDeleteDeckDialog.java diff --git a/src/com/ichi2/anki/dialogs/DeckPickerContextMenu.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.java similarity index 100% rename from src/com/ichi2/anki/dialogs/DeckPickerContextMenu.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerContextMenu.java diff --git a/src/com/ichi2/anki/dialogs/DeckPickerExportCompleteDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerExportCompleteDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/DeckPickerExportCompleteDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerExportCompleteDialog.java diff --git a/src/com/ichi2/anki/dialogs/DeckPickerNoSpaceLeftDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerNoSpaceLeftDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/DeckPickerNoSpaceLeftDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DeckPickerNoSpaceLeftDialog.java diff --git a/src/com/ichi2/anki/dialogs/DialogHandler.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DialogHandler.java similarity index 100% rename from src/com/ichi2/anki/dialogs/DialogHandler.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/DialogHandler.java diff --git a/src/com/ichi2/anki/dialogs/ExportDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/ExportDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ExportDialog.java diff --git a/src/com/ichi2/anki/dialogs/ImportDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/ImportDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/ImportDialog.java diff --git a/src/com/ichi2/anki/dialogs/MediaCheckDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/MediaCheckDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/MediaCheckDialog.java diff --git a/src/com/ichi2/anki/dialogs/SimpleMessageDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SimpleMessageDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/SimpleMessageDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SimpleMessageDialog.java diff --git a/src/com/ichi2/anki/dialogs/SyncErrorDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/SyncErrorDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/SyncErrorDialog.java diff --git a/src/com/ichi2/anki/dialogs/TagsDialog.java b/AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TagsDialog.java similarity index 100% rename from src/com/ichi2/anki/dialogs/TagsDialog.java rename to AnkiDroid/src/main/java/com/ichi2/anki/dialogs/TagsDialog.java diff --git a/src/com/ichi2/anki/exception/APIVersionException.java b/AnkiDroid/src/main/java/com/ichi2/anki/exception/APIVersionException.java similarity index 100% rename from src/com/ichi2/anki/exception/APIVersionException.java rename to AnkiDroid/src/main/java/com/ichi2/anki/exception/APIVersionException.java diff --git a/src/com/ichi2/anki/exception/AnkiDroidErrorReportException.java b/AnkiDroid/src/main/java/com/ichi2/anki/exception/AnkiDroidErrorReportException.java similarity index 100% rename from src/com/ichi2/anki/exception/AnkiDroidErrorReportException.java rename to AnkiDroid/src/main/java/com/ichi2/anki/exception/AnkiDroidErrorReportException.java diff --git a/src/com/ichi2/anki/exception/ConfirmModSchemaException.java b/AnkiDroid/src/main/java/com/ichi2/anki/exception/ConfirmModSchemaException.java similarity index 100% rename from src/com/ichi2/anki/exception/ConfirmModSchemaException.java rename to AnkiDroid/src/main/java/com/ichi2/anki/exception/ConfirmModSchemaException.java diff --git a/src/com/ichi2/anki/exception/UnknownHttpResponseException.java b/AnkiDroid/src/main/java/com/ichi2/anki/exception/UnknownHttpResponseException.java similarity index 100% rename from src/com/ichi2/anki/exception/UnknownHttpResponseException.java rename to AnkiDroid/src/main/java/com/ichi2/anki/exception/UnknownHttpResponseException.java diff --git a/src/com/ichi2/anki/exception/UnsupportedSyncException.java b/AnkiDroid/src/main/java/com/ichi2/anki/exception/UnsupportedSyncException.java similarity index 100% rename from src/com/ichi2/anki/exception/UnsupportedSyncException.java rename to AnkiDroid/src/main/java/com/ichi2/anki/exception/UnsupportedSyncException.java diff --git a/src/com/ichi2/anki/multimediacard/AudioView.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/AudioView.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/AudioView.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/AudioView.java diff --git a/src/com/ichi2/anki/multimediacard/IMultimediaEditableNote.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/IMultimediaEditableNote.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/IMultimediaEditableNote.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/IMultimediaEditableNote.java diff --git a/src/com/ichi2/anki/multimediacard/activity/EditFieldActivity.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/EditFieldActivity.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/activity/EditFieldActivity.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/EditFieldActivity.java diff --git a/src/com/ichi2/anki/multimediacard/activity/LoadPronounciationActivity.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/LoadPronounciationActivity.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/activity/LoadPronounciationActivity.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/LoadPronounciationActivity.java diff --git a/src/com/ichi2/anki/multimediacard/activity/PickStringDialogFragment.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/PickStringDialogFragment.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/activity/PickStringDialogFragment.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/PickStringDialogFragment.java diff --git a/src/com/ichi2/anki/multimediacard/activity/SearchImageActivity.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/SearchImageActivity.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/activity/SearchImageActivity.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/SearchImageActivity.java diff --git a/src/com/ichi2/anki/multimediacard/activity/TranslationActivity.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/TranslationActivity.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/activity/TranslationActivity.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/activity/TranslationActivity.java diff --git a/src/com/ichi2/anki/multimediacard/beolingus/parsing/BeolingusParser.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/beolingus/parsing/BeolingusParser.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/beolingus/parsing/BeolingusParser.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/beolingus/parsing/BeolingusParser.java diff --git a/src/com/ichi2/anki/multimediacard/fields/AudioField.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/AudioField.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/AudioField.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/AudioField.java diff --git a/src/com/ichi2/anki/multimediacard/fields/BasicAudioFieldController.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/BasicAudioFieldController.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/BasicAudioFieldController.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/BasicAudioFieldController.java diff --git a/src/com/ichi2/anki/multimediacard/fields/BasicControllerFactory.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/BasicControllerFactory.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/BasicControllerFactory.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/BasicControllerFactory.java diff --git a/src/com/ichi2/anki/multimediacard/fields/BasicImageFieldController.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/BasicImageFieldController.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/BasicImageFieldController.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/BasicImageFieldController.java diff --git a/src/com/ichi2/anki/multimediacard/fields/BasicTextFieldController.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/BasicTextFieldController.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/BasicTextFieldController.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/BasicTextFieldController.java diff --git a/src/com/ichi2/anki/multimediacard/fields/EFieldType.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/EFieldType.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/EFieldType.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/EFieldType.java diff --git a/src/com/ichi2/anki/multimediacard/fields/FieldBase.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/FieldBase.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/FieldBase.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/FieldBase.java diff --git a/src/com/ichi2/anki/multimediacard/fields/FieldControllerBase.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/FieldControllerBase.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/FieldControllerBase.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/FieldControllerBase.java diff --git a/src/com/ichi2/anki/multimediacard/fields/IControllerFactory.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/IControllerFactory.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/IControllerFactory.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/IControllerFactory.java diff --git a/src/com/ichi2/anki/multimediacard/fields/IField.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/IField.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/IField.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/IField.java diff --git a/src/com/ichi2/anki/multimediacard/fields/IFieldController.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/IFieldController.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/IFieldController.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/IFieldController.java diff --git a/src/com/ichi2/anki/multimediacard/fields/ImageField.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/ImageField.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/ImageField.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/ImageField.java diff --git a/src/com/ichi2/anki/multimediacard/fields/TextField.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/TextField.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/fields/TextField.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/fields/TextField.java diff --git a/src/com/ichi2/anki/multimediacard/glosbe/json/Meaning.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/glosbe/json/Meaning.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/glosbe/json/Meaning.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/glosbe/json/Meaning.java diff --git a/src/com/ichi2/anki/multimediacard/glosbe/json/Phrase.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/glosbe/json/Phrase.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/glosbe/json/Phrase.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/glosbe/json/Phrase.java diff --git a/src/com/ichi2/anki/multimediacard/glosbe/json/Response.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/glosbe/json/Response.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/glosbe/json/Response.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/glosbe/json/Response.java diff --git a/src/com/ichi2/anki/multimediacard/glosbe/json/Tuc.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/glosbe/json/Tuc.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/glosbe/json/Tuc.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/glosbe/json/Tuc.java diff --git a/src/com/ichi2/anki/multimediacard/googleimagesearch/json/Cursor.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/Cursor.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/googleimagesearch/json/Cursor.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/Cursor.java diff --git a/src/com/ichi2/anki/multimediacard/googleimagesearch/json/ImageSearchResponse.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/ImageSearchResponse.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/googleimagesearch/json/ImageSearchResponse.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/ImageSearchResponse.java diff --git a/src/com/ichi2/anki/multimediacard/googleimagesearch/json/Page.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/Page.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/googleimagesearch/json/Page.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/Page.java diff --git a/src/com/ichi2/anki/multimediacard/googleimagesearch/json/ResponseData.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/ResponseData.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/googleimagesearch/json/ResponseData.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/ResponseData.java diff --git a/src/com/ichi2/anki/multimediacard/googleimagesearch/json/Result.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/Result.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/googleimagesearch/json/Result.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/googleimagesearch/json/Result.java diff --git a/src/com/ichi2/anki/multimediacard/impl/MultimediaEditableNote.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/impl/MultimediaEditableNote.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/impl/MultimediaEditableNote.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/impl/MultimediaEditableNote.java diff --git a/src/com/ichi2/anki/multimediacard/impl/NoteFactory.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/impl/NoteFactory.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/impl/NoteFactory.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/impl/NoteFactory.java diff --git a/src/com/ichi2/anki/multimediacard/language/LanguageListerBase.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/language/LanguageListerBase.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/language/LanguageListerBase.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/language/LanguageListerBase.java diff --git a/src/com/ichi2/anki/multimediacard/language/LanguageListerBeolingus.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/language/LanguageListerBeolingus.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/language/LanguageListerBeolingus.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/language/LanguageListerBeolingus.java diff --git a/src/com/ichi2/anki/multimediacard/language/LanguagesLister.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/language/LanguagesLister.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/language/LanguagesLister.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/language/LanguagesLister.java diff --git a/src/com/ichi2/anki/multimediacard/language/LanguagesListerGlosbe.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/language/LanguagesListerGlosbe.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/language/LanguagesListerGlosbe.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/language/LanguagesListerGlosbe.java diff --git a/src/com/ichi2/anki/multimediacard/test/MockNoteFactory.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/test/MockNoteFactory.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/test/MockNoteFactory.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/test/MockNoteFactory.java diff --git a/src/com/ichi2/anki/multimediacard/test/MockPronounciationPageFetcher.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/test/MockPronounciationPageFetcher.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/test/MockPronounciationPageFetcher.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/test/MockPronounciationPageFetcher.java diff --git a/src/com/ichi2/anki/multimediacard/test/MockTranslationFetcher.java b/AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/test/MockTranslationFetcher.java similarity index 100% rename from src/com/ichi2/anki/multimediacard/test/MockTranslationFetcher.java rename to AnkiDroid/src/main/java/com/ichi2/anki/multimediacard/test/MockTranslationFetcher.java diff --git a/src/com/ichi2/anki/receiver/SdCardReceiver.java b/AnkiDroid/src/main/java/com/ichi2/anki/receiver/SdCardReceiver.java similarity index 100% rename from src/com/ichi2/anki/receiver/SdCardReceiver.java rename to AnkiDroid/src/main/java/com/ichi2/anki/receiver/SdCardReceiver.java diff --git a/src/com/ichi2/anki/reviewer/CustomFontsReviewerExt.java b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/CustomFontsReviewerExt.java similarity index 100% rename from src/com/ichi2/anki/reviewer/CustomFontsReviewerExt.java rename to AnkiDroid/src/main/java/com/ichi2/anki/reviewer/CustomFontsReviewerExt.java diff --git a/src/com/ichi2/anki/reviewer/ReviewerExt.java b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerExt.java similarity index 100% rename from src/com/ichi2/anki/reviewer/ReviewerExt.java rename to AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerExt.java diff --git a/src/com/ichi2/anki/reviewer/ReviewerExtRegistry.java b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerExtRegistry.java similarity index 100% rename from src/com/ichi2/anki/reviewer/ReviewerExtRegistry.java rename to AnkiDroid/src/main/java/com/ichi2/anki/reviewer/ReviewerExtRegistry.java diff --git a/src/com/ichi2/anki/reviewer/WhiteboardListener.java b/AnkiDroid/src/main/java/com/ichi2/anki/reviewer/WhiteboardListener.java similarity index 100% rename from src/com/ichi2/anki/reviewer/WhiteboardListener.java rename to AnkiDroid/src/main/java/com/ichi2/anki/reviewer/WhiteboardListener.java diff --git a/src/com/ichi2/anki/runtimetools/TaskOperations.java b/AnkiDroid/src/main/java/com/ichi2/anki/runtimetools/TaskOperations.java similarity index 100% rename from src/com/ichi2/anki/runtimetools/TaskOperations.java rename to AnkiDroid/src/main/java/com/ichi2/anki/runtimetools/TaskOperations.java diff --git a/src/com/ichi2/anki/servicelayer/NoteService.java b/AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/NoteService.java similarity index 100% rename from src/com/ichi2/anki/servicelayer/NoteService.java rename to AnkiDroid/src/main/java/com/ichi2/anki/servicelayer/NoteService.java diff --git a/src/com/ichi2/anki/services/NotificationService.java b/AnkiDroid/src/main/java/com/ichi2/anki/services/NotificationService.java similarity index 100% rename from src/com/ichi2/anki/services/NotificationService.java rename to AnkiDroid/src/main/java/com/ichi2/anki/services/NotificationService.java diff --git a/src/com/ichi2/anki/stats/AnkiStatsTaskHandler.java b/AnkiDroid/src/main/java/com/ichi2/anki/stats/AnkiStatsTaskHandler.java similarity index 100% rename from src/com/ichi2/anki/stats/AnkiStatsTaskHandler.java rename to AnkiDroid/src/main/java/com/ichi2/anki/stats/AnkiStatsTaskHandler.java diff --git a/src/com/ichi2/anki/stats/ChartBuilder.java b/AnkiDroid/src/main/java/com/ichi2/anki/stats/ChartBuilder.java similarity index 100% rename from src/com/ichi2/anki/stats/ChartBuilder.java rename to AnkiDroid/src/main/java/com/ichi2/anki/stats/ChartBuilder.java diff --git a/src/com/ichi2/anki/stats/ChartView.java b/AnkiDroid/src/main/java/com/ichi2/anki/stats/ChartView.java similarity index 100% rename from src/com/ichi2/anki/stats/ChartView.java rename to AnkiDroid/src/main/java/com/ichi2/anki/stats/ChartView.java diff --git a/src/com/ichi2/anki/stats/InfoStatsBuilder.java b/AnkiDroid/src/main/java/com/ichi2/anki/stats/InfoStatsBuilder.java similarity index 100% rename from src/com/ichi2/anki/stats/InfoStatsBuilder.java rename to AnkiDroid/src/main/java/com/ichi2/anki/stats/InfoStatsBuilder.java diff --git a/src/com/ichi2/anki/web/HttpFetcher.java b/AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.java similarity index 100% rename from src/com/ichi2/anki/web/HttpFetcher.java rename to AnkiDroid/src/main/java/com/ichi2/anki/web/HttpFetcher.java diff --git a/src/com/ichi2/anki/web/UrlTools.java b/AnkiDroid/src/main/java/com/ichi2/anki/web/UrlTools.java similarity index 100% rename from src/com/ichi2/anki/web/UrlTools.java rename to AnkiDroid/src/main/java/com/ichi2/anki/web/UrlTools.java diff --git a/src/com/ichi2/async/BaseAsyncTask.java b/AnkiDroid/src/main/java/com/ichi2/async/BaseAsyncTask.java similarity index 100% rename from src/com/ichi2/async/BaseAsyncTask.java rename to AnkiDroid/src/main/java/com/ichi2/async/BaseAsyncTask.java diff --git a/src/com/ichi2/async/CollectionLoader.java b/AnkiDroid/src/main/java/com/ichi2/async/CollectionLoader.java similarity index 100% rename from src/com/ichi2/async/CollectionLoader.java rename to AnkiDroid/src/main/java/com/ichi2/async/CollectionLoader.java diff --git a/src/com/ichi2/async/Connection.java b/AnkiDroid/src/main/java/com/ichi2/async/Connection.java similarity index 100% rename from src/com/ichi2/async/Connection.java rename to AnkiDroid/src/main/java/com/ichi2/async/Connection.java diff --git a/src/com/ichi2/async/DeckTask.java b/AnkiDroid/src/main/java/com/ichi2/async/DeckTask.java similarity index 100% rename from src/com/ichi2/async/DeckTask.java rename to AnkiDroid/src/main/java/com/ichi2/async/DeckTask.java diff --git a/src/com/ichi2/compat/Compat.java b/AnkiDroid/src/main/java/com/ichi2/compat/Compat.java similarity index 100% rename from src/com/ichi2/compat/Compat.java rename to AnkiDroid/src/main/java/com/ichi2/compat/Compat.java diff --git a/src/com/ichi2/compat/CompatV15.java b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV15.java similarity index 100% rename from src/com/ichi2/compat/CompatV15.java rename to AnkiDroid/src/main/java/com/ichi2/compat/CompatV15.java diff --git a/src/com/ichi2/compat/CompatV15NookHdOrHdPlus.java b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV15NookHdOrHdPlus.java similarity index 100% rename from src/com/ichi2/compat/CompatV15NookHdOrHdPlus.java rename to AnkiDroid/src/main/java/com/ichi2/compat/CompatV15NookHdOrHdPlus.java diff --git a/src/com/ichi2/compat/CompatV16.java b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV16.java similarity index 100% rename from src/com/ichi2/compat/CompatV16.java rename to AnkiDroid/src/main/java/com/ichi2/compat/CompatV16.java diff --git a/src/com/ichi2/compat/CompatV7.java b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV7.java similarity index 100% rename from src/com/ichi2/compat/CompatV7.java rename to AnkiDroid/src/main/java/com/ichi2/compat/CompatV7.java diff --git a/src/com/ichi2/compat/CompatV7Nook.java b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV7Nook.java similarity index 100% rename from src/com/ichi2/compat/CompatV7Nook.java rename to AnkiDroid/src/main/java/com/ichi2/compat/CompatV7Nook.java diff --git a/src/com/ichi2/compat/CompatV8.java b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV8.java similarity index 100% rename from src/com/ichi2/compat/CompatV8.java rename to AnkiDroid/src/main/java/com/ichi2/compat/CompatV8.java diff --git a/src/com/ichi2/compat/CompatV9.java b/AnkiDroid/src/main/java/com/ichi2/compat/CompatV9.java similarity index 100% rename from src/com/ichi2/compat/CompatV9.java rename to AnkiDroid/src/main/java/com/ichi2/compat/CompatV9.java diff --git a/src/com/ichi2/filters/AbstractCardFilter.java b/AnkiDroid/src/main/java/com/ichi2/filters/AbstractCardFilter.java similarity index 100% rename from src/com/ichi2/filters/AbstractCardFilter.java rename to AnkiDroid/src/main/java/com/ichi2/filters/AbstractCardFilter.java diff --git a/src/com/ichi2/filters/CardFilter.java b/AnkiDroid/src/main/java/com/ichi2/filters/CardFilter.java similarity index 100% rename from src/com/ichi2/filters/CardFilter.java rename to AnkiDroid/src/main/java/com/ichi2/filters/CardFilter.java diff --git a/src/com/ichi2/filters/FilterFacade.java b/AnkiDroid/src/main/java/com/ichi2/filters/FilterFacade.java similarity index 100% rename from src/com/ichi2/filters/FilterFacade.java rename to AnkiDroid/src/main/java/com/ichi2/filters/FilterFacade.java diff --git a/src/com/ichi2/filters/GoogleTranslaterFilter.java b/AnkiDroid/src/main/java/com/ichi2/filters/GoogleTranslaterFilter.java similarity index 100% rename from src/com/ichi2/filters/GoogleTranslaterFilter.java rename to AnkiDroid/src/main/java/com/ichi2/filters/GoogleTranslaterFilter.java diff --git a/src/com/ichi2/libanki/AnkiPackageExporter.java b/AnkiDroid/src/main/java/com/ichi2/libanki/AnkiPackageExporter.java similarity index 100% rename from src/com/ichi2/libanki/AnkiPackageExporter.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/AnkiPackageExporter.java diff --git a/src/com/ichi2/libanki/Card.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Card.java similarity index 100% rename from src/com/ichi2/libanki/Card.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Card.java diff --git a/src/com/ichi2/libanki/CardStats.java b/AnkiDroid/src/main/java/com/ichi2/libanki/CardStats.java similarity index 100% rename from src/com/ichi2/libanki/CardStats.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/CardStats.java diff --git a/src/com/ichi2/libanki/Collection.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Collection.java similarity index 100% rename from src/com/ichi2/libanki/Collection.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Collection.java diff --git a/src/com/ichi2/libanki/Consts.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Consts.java similarity index 100% rename from src/com/ichi2/libanki/Consts.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Consts.java diff --git a/src/com/ichi2/libanki/Decks.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Decks.java similarity index 100% rename from src/com/ichi2/libanki/Decks.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Decks.java diff --git a/src/com/ichi2/libanki/Finder.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Finder.java similarity index 100% rename from src/com/ichi2/libanki/Finder.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Finder.java diff --git a/src/com/ichi2/libanki/LaTeX.java b/AnkiDroid/src/main/java/com/ichi2/libanki/LaTeX.java similarity index 100% rename from src/com/ichi2/libanki/LaTeX.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/LaTeX.java diff --git a/src/com/ichi2/libanki/Media.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Media.java similarity index 100% rename from src/com/ichi2/libanki/Media.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Media.java diff --git a/src/com/ichi2/libanki/Models.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Models.java similarity index 100% rename from src/com/ichi2/libanki/Models.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Models.java diff --git a/src/com/ichi2/libanki/Note.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Note.java similarity index 100% rename from src/com/ichi2/libanki/Note.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Note.java diff --git a/src/com/ichi2/libanki/Sched.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Sched.java similarity index 100% rename from src/com/ichi2/libanki/Sched.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Sched.java diff --git a/src/com/ichi2/libanki/Sound.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Sound.java similarity index 100% rename from src/com/ichi2/libanki/Sound.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Sound.java diff --git a/src/com/ichi2/libanki/Stats.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Stats.java similarity index 100% rename from src/com/ichi2/libanki/Stats.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Stats.java diff --git a/src/com/ichi2/libanki/Storage.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Storage.java similarity index 100% rename from src/com/ichi2/libanki/Storage.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Storage.java diff --git a/src/com/ichi2/libanki/Tags.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Tags.java similarity index 100% rename from src/com/ichi2/libanki/Tags.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Tags.java diff --git a/src/com/ichi2/libanki/Utils.java b/AnkiDroid/src/main/java/com/ichi2/libanki/Utils.java similarity index 100% rename from src/com/ichi2/libanki/Utils.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/Utils.java diff --git a/src/com/ichi2/libanki/hooks/ChessFilter.java b/AnkiDroid/src/main/java/com/ichi2/libanki/hooks/ChessFilter.java similarity index 100% rename from src/com/ichi2/libanki/hooks/ChessFilter.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/hooks/ChessFilter.java diff --git a/src/com/ichi2/libanki/hooks/FuriganaFilters.java b/AnkiDroid/src/main/java/com/ichi2/libanki/hooks/FuriganaFilters.java similarity index 100% rename from src/com/ichi2/libanki/hooks/FuriganaFilters.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/hooks/FuriganaFilters.java diff --git a/src/com/ichi2/libanki/hooks/HebrewFixFilter.java b/AnkiDroid/src/main/java/com/ichi2/libanki/hooks/HebrewFixFilter.java similarity index 100% rename from src/com/ichi2/libanki/hooks/HebrewFixFilter.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/hooks/HebrewFixFilter.java diff --git a/src/com/ichi2/libanki/hooks/HintFilter.java b/AnkiDroid/src/main/java/com/ichi2/libanki/hooks/HintFilter.java similarity index 100% rename from src/com/ichi2/libanki/hooks/HintFilter.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/hooks/HintFilter.java diff --git a/src/com/ichi2/libanki/hooks/Hook.java b/AnkiDroid/src/main/java/com/ichi2/libanki/hooks/Hook.java similarity index 100% rename from src/com/ichi2/libanki/hooks/Hook.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/hooks/Hook.java diff --git a/src/com/ichi2/libanki/hooks/Hooks.java b/AnkiDroid/src/main/java/com/ichi2/libanki/hooks/Hooks.java similarity index 100% rename from src/com/ichi2/libanki/hooks/Hooks.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/hooks/Hooks.java diff --git a/src/com/ichi2/libanki/hooks/Leech.java b/AnkiDroid/src/main/java/com/ichi2/libanki/hooks/Leech.java similarity index 100% rename from src/com/ichi2/libanki/hooks/Leech.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/hooks/Leech.java diff --git a/src/com/ichi2/libanki/importer/Anki2Importer.java b/AnkiDroid/src/main/java/com/ichi2/libanki/importer/Anki2Importer.java similarity index 100% rename from src/com/ichi2/libanki/importer/Anki2Importer.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/importer/Anki2Importer.java diff --git a/src/com/ichi2/libanki/sync/FullSyncer.java b/AnkiDroid/src/main/java/com/ichi2/libanki/sync/FullSyncer.java similarity index 100% rename from src/com/ichi2/libanki/sync/FullSyncer.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/sync/FullSyncer.java diff --git a/src/com/ichi2/libanki/sync/HttpSyncer.java b/AnkiDroid/src/main/java/com/ichi2/libanki/sync/HttpSyncer.java similarity index 100% rename from src/com/ichi2/libanki/sync/HttpSyncer.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/sync/HttpSyncer.java diff --git a/src/com/ichi2/libanki/sync/MediaSyncer.java b/AnkiDroid/src/main/java/com/ichi2/libanki/sync/MediaSyncer.java similarity index 100% rename from src/com/ichi2/libanki/sync/MediaSyncer.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/sync/MediaSyncer.java diff --git a/src/com/ichi2/libanki/sync/RemoteMediaServer.java b/AnkiDroid/src/main/java/com/ichi2/libanki/sync/RemoteMediaServer.java similarity index 100% rename from src/com/ichi2/libanki/sync/RemoteMediaServer.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/sync/RemoteMediaServer.java diff --git a/src/com/ichi2/libanki/sync/RemoteServer.java b/AnkiDroid/src/main/java/com/ichi2/libanki/sync/RemoteServer.java similarity index 100% rename from src/com/ichi2/libanki/sync/RemoteServer.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/sync/RemoteServer.java diff --git a/src/com/ichi2/libanki/sync/Syncer.java b/AnkiDroid/src/main/java/com/ichi2/libanki/sync/Syncer.java similarity index 100% rename from src/com/ichi2/libanki/sync/Syncer.java rename to AnkiDroid/src/main/java/com/ichi2/libanki/sync/Syncer.java diff --git a/src/com/ichi2/preferences/CustomDialogPreference.java b/AnkiDroid/src/main/java/com/ichi2/preferences/CustomDialogPreference.java similarity index 100% rename from src/com/ichi2/preferences/CustomDialogPreference.java rename to AnkiDroid/src/main/java/com/ichi2/preferences/CustomDialogPreference.java diff --git a/src/com/ichi2/preferences/NumberRangePreference.java b/AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreference.java similarity index 100% rename from src/com/ichi2/preferences/NumberRangePreference.java rename to AnkiDroid/src/main/java/com/ichi2/preferences/NumberRangePreference.java diff --git a/src/com/ichi2/preferences/StepsPreference.java b/AnkiDroid/src/main/java/com/ichi2/preferences/StepsPreference.java similarity index 100% rename from src/com/ichi2/preferences/StepsPreference.java rename to AnkiDroid/src/main/java/com/ichi2/preferences/StepsPreference.java diff --git a/src/com/ichi2/themes/HtmlColors.java b/AnkiDroid/src/main/java/com/ichi2/themes/HtmlColors.java similarity index 100% rename from src/com/ichi2/themes/HtmlColors.java rename to AnkiDroid/src/main/java/com/ichi2/themes/HtmlColors.java diff --git a/src/com/ichi2/themes/StyledDialog.java b/AnkiDroid/src/main/java/com/ichi2/themes/StyledDialog.java similarity index 100% rename from src/com/ichi2/themes/StyledDialog.java rename to AnkiDroid/src/main/java/com/ichi2/themes/StyledDialog.java diff --git a/src/com/ichi2/themes/StyledOpenCollectionDialog.java b/AnkiDroid/src/main/java/com/ichi2/themes/StyledOpenCollectionDialog.java similarity index 100% rename from src/com/ichi2/themes/StyledOpenCollectionDialog.java rename to AnkiDroid/src/main/java/com/ichi2/themes/StyledOpenCollectionDialog.java diff --git a/src/com/ichi2/themes/StyledProgressDialog.java b/AnkiDroid/src/main/java/com/ichi2/themes/StyledProgressDialog.java similarity index 100% rename from src/com/ichi2/themes/StyledProgressDialog.java rename to AnkiDroid/src/main/java/com/ichi2/themes/StyledProgressDialog.java diff --git a/src/com/ichi2/themes/Themes.java b/AnkiDroid/src/main/java/com/ichi2/themes/Themes.java similarity index 100% rename from src/com/ichi2/themes/Themes.java rename to AnkiDroid/src/main/java/com/ichi2/themes/Themes.java diff --git a/src/com/ichi2/upgrade/Upgrade.java b/AnkiDroid/src/main/java/com/ichi2/upgrade/Upgrade.java similarity index 100% rename from src/com/ichi2/upgrade/Upgrade.java rename to AnkiDroid/src/main/java/com/ichi2/upgrade/Upgrade.java diff --git a/src/com/ichi2/utils/Base64.java b/AnkiDroid/src/main/java/com/ichi2/utils/Base64.java similarity index 100% rename from src/com/ichi2/utils/Base64.java rename to AnkiDroid/src/main/java/com/ichi2/utils/Base64.java diff --git a/src/com/ichi2/utils/BitmapUtil.java b/AnkiDroid/src/main/java/com/ichi2/utils/BitmapUtil.java similarity index 100% rename from src/com/ichi2/utils/BitmapUtil.java rename to AnkiDroid/src/main/java/com/ichi2/utils/BitmapUtil.java diff --git a/src/com/ichi2/utils/ConvUtils.java b/AnkiDroid/src/main/java/com/ichi2/utils/ConvUtils.java similarity index 100% rename from src/com/ichi2/utils/ConvUtils.java rename to AnkiDroid/src/main/java/com/ichi2/utils/ConvUtils.java diff --git a/src/com/ichi2/utils/DiffEngine.java b/AnkiDroid/src/main/java/com/ichi2/utils/DiffEngine.java similarity index 100% rename from src/com/ichi2/utils/DiffEngine.java rename to AnkiDroid/src/main/java/com/ichi2/utils/DiffEngine.java diff --git a/src/com/ichi2/utils/DiskUtil.java b/AnkiDroid/src/main/java/com/ichi2/utils/DiskUtil.java similarity index 100% rename from src/com/ichi2/utils/DiskUtil.java rename to AnkiDroid/src/main/java/com/ichi2/utils/DiskUtil.java diff --git a/src/com/ichi2/utils/ExifUtil.java b/AnkiDroid/src/main/java/com/ichi2/utils/ExifUtil.java similarity index 100% rename from src/com/ichi2/utils/ExifUtil.java rename to AnkiDroid/src/main/java/com/ichi2/utils/ExifUtil.java diff --git a/src/com/ichi2/utils/HtmlUtil.java b/AnkiDroid/src/main/java/com/ichi2/utils/HtmlUtil.java similarity index 100% rename from src/com/ichi2/utils/HtmlUtil.java rename to AnkiDroid/src/main/java/com/ichi2/utils/HtmlUtil.java diff --git a/src/com/ichi2/utils/HttpUtility.java b/AnkiDroid/src/main/java/com/ichi2/utils/HttpUtility.java similarity index 100% rename from src/com/ichi2/utils/HttpUtility.java rename to AnkiDroid/src/main/java/com/ichi2/utils/HttpUtility.java diff --git a/src/com/ichi2/utils/JSONNameComparator.java b/AnkiDroid/src/main/java/com/ichi2/utils/JSONNameComparator.java similarity index 100% rename from src/com/ichi2/utils/JSONNameComparator.java rename to AnkiDroid/src/main/java/com/ichi2/utils/JSONNameComparator.java diff --git a/src/com/ichi2/utils/LanguageUtil.java b/AnkiDroid/src/main/java/com/ichi2/utils/LanguageUtil.java similarity index 100% rename from src/com/ichi2/utils/LanguageUtil.java rename to AnkiDroid/src/main/java/com/ichi2/utils/LanguageUtil.java diff --git a/src/com/ichi2/utils/MethodLogger.java b/AnkiDroid/src/main/java/com/ichi2/utils/MethodLogger.java similarity index 100% rename from src/com/ichi2/utils/MethodLogger.java rename to AnkiDroid/src/main/java/com/ichi2/utils/MethodLogger.java diff --git a/src/com/ichi2/utils/Threads.java b/AnkiDroid/src/main/java/com/ichi2/utils/Threads.java similarity index 100% rename from src/com/ichi2/utils/Threads.java rename to AnkiDroid/src/main/java/com/ichi2/utils/Threads.java diff --git a/src/com/ichi2/widget/AnkiDroidWidgetBig.java b/AnkiDroid/src/main/java/com/ichi2/widget/AnkiDroidWidgetBig.java similarity index 100% rename from src/com/ichi2/widget/AnkiDroidWidgetBig.java rename to AnkiDroid/src/main/java/com/ichi2/widget/AnkiDroidWidgetBig.java diff --git a/src/com/ichi2/widget/AnkiDroidWidgetMedium.java b/AnkiDroid/src/main/java/com/ichi2/widget/AnkiDroidWidgetMedium.java similarity index 100% rename from src/com/ichi2/widget/AnkiDroidWidgetMedium.java rename to AnkiDroid/src/main/java/com/ichi2/widget/AnkiDroidWidgetMedium.java diff --git a/src/com/ichi2/widget/AnkiDroidWidgetSmall.java b/AnkiDroid/src/main/java/com/ichi2/widget/AnkiDroidWidgetSmall.java similarity index 100% rename from src/com/ichi2/widget/AnkiDroidWidgetSmall.java rename to AnkiDroid/src/main/java/com/ichi2/widget/AnkiDroidWidgetSmall.java diff --git a/src/com/ichi2/widget/DeckStatus.java b/AnkiDroid/src/main/java/com/ichi2/widget/DeckStatus.java similarity index 100% rename from src/com/ichi2/widget/DeckStatus.java rename to AnkiDroid/src/main/java/com/ichi2/widget/DeckStatus.java diff --git a/src/com/ichi2/widget/PopupMenuWithIcons.java b/AnkiDroid/src/main/java/com/ichi2/widget/PopupMenuWithIcons.java similarity index 100% rename from src/com/ichi2/widget/PopupMenuWithIcons.java rename to AnkiDroid/src/main/java/com/ichi2/widget/PopupMenuWithIcons.java diff --git a/src/com/ichi2/widget/WidgetContentService.java b/AnkiDroid/src/main/java/com/ichi2/widget/WidgetContentService.java similarity index 100% rename from src/com/ichi2/widget/WidgetContentService.java rename to AnkiDroid/src/main/java/com/ichi2/widget/WidgetContentService.java diff --git a/src/com/ichi2/widget/WidgetDialog.java b/AnkiDroid/src/main/java/com/ichi2/widget/WidgetDialog.java similarity index 100% rename from src/com/ichi2/widget/WidgetDialog.java rename to AnkiDroid/src/main/java/com/ichi2/widget/WidgetDialog.java diff --git a/src/com/ichi2/widget/WidgetStatus.java b/AnkiDroid/src/main/java/com/ichi2/widget/WidgetStatus.java similarity index 100% rename from src/com/ichi2/widget/WidgetStatus.java rename to AnkiDroid/src/main/java/com/ichi2/widget/WidgetStatus.java diff --git a/src/com/samskivert/mustache/Mustache.java b/AnkiDroid/src/main/java/com/samskivert/mustache/Mustache.java similarity index 100% rename from src/com/samskivert/mustache/Mustache.java rename to AnkiDroid/src/main/java/com/samskivert/mustache/Mustache.java diff --git a/src/com/samskivert/mustache/MustacheException.java b/AnkiDroid/src/main/java/com/samskivert/mustache/MustacheException.java similarity index 100% rename from src/com/samskivert/mustache/MustacheException.java rename to AnkiDroid/src/main/java/com/samskivert/mustache/MustacheException.java diff --git a/src/com/samskivert/mustache/Template.java b/AnkiDroid/src/main/java/com/samskivert/mustache/Template.java similarity index 100% rename from src/com/samskivert/mustache/Template.java rename to AnkiDroid/src/main/java/com/samskivert/mustache/Template.java diff --git a/src/com/wildplot/android/parsing/Atom.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/Atom.java similarity index 100% rename from src/com/wildplot/android/parsing/Atom.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/Atom.java diff --git a/src/com/wildplot/android/parsing/AtomTypes/FunctionXAtom.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/FunctionXAtom.java similarity index 100% rename from src/com/wildplot/android/parsing/AtomTypes/FunctionXAtom.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/FunctionXAtom.java diff --git a/src/com/wildplot/android/parsing/AtomTypes/FunctionXYAtom.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/FunctionXYAtom.java similarity index 100% rename from src/com/wildplot/android/parsing/AtomTypes/FunctionXYAtom.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/FunctionXYAtom.java diff --git a/src/com/wildplot/android/parsing/AtomTypes/MathFunctionAtom.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/MathFunctionAtom.java similarity index 100% rename from src/com/wildplot/android/parsing/AtomTypes/MathFunctionAtom.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/MathFunctionAtom.java diff --git a/src/com/wildplot/android/parsing/AtomTypes/NumberAtom.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/NumberAtom.java similarity index 100% rename from src/com/wildplot/android/parsing/AtomTypes/NumberAtom.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/NumberAtom.java diff --git a/src/com/wildplot/android/parsing/AtomTypes/VariableAtom.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/VariableAtom.java similarity index 100% rename from src/com/wildplot/android/parsing/AtomTypes/VariableAtom.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/VariableAtom.java diff --git a/src/com/wildplot/android/parsing/AtomTypes/XVariableAtom.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/XVariableAtom.java similarity index 100% rename from src/com/wildplot/android/parsing/AtomTypes/XVariableAtom.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/XVariableAtom.java diff --git a/src/com/wildplot/android/parsing/AtomTypes/YVariableAtom.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/YVariableAtom.java similarity index 100% rename from src/com/wildplot/android/parsing/AtomTypes/YVariableAtom.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/AtomTypes/YVariableAtom.java diff --git a/src/com/wildplot/android/parsing/Expression.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/Expression.java similarity index 100% rename from src/com/wildplot/android/parsing/Expression.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/Expression.java diff --git a/src/com/wildplot/android/parsing/ExpressionFormatException.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/ExpressionFormatException.java similarity index 100% rename from src/com/wildplot/android/parsing/ExpressionFormatException.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/ExpressionFormatException.java diff --git a/src/com/wildplot/android/parsing/Factor.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/Factor.java similarity index 100% rename from src/com/wildplot/android/parsing/Factor.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/Factor.java diff --git a/src/com/wildplot/android/parsing/Pow.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/Pow.java similarity index 100% rename from src/com/wildplot/android/parsing/Pow.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/Pow.java diff --git a/src/com/wildplot/android/parsing/Term.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/Term.java similarity index 100% rename from src/com/wildplot/android/parsing/Term.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/Term.java diff --git a/src/com/wildplot/android/parsing/TopLevelParser.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/TopLevelParser.java similarity index 100% rename from src/com/wildplot/android/parsing/TopLevelParser.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/TopLevelParser.java diff --git a/src/com/wildplot/android/parsing/TreeElement.java b/AnkiDroid/src/main/java/com/wildplot/android/parsing/TreeElement.java similarity index 100% rename from src/com/wildplot/android/parsing/TreeElement.java rename to AnkiDroid/src/main/java/com/wildplot/android/parsing/TreeElement.java diff --git a/src/com/wildplot/android/rendering/BarGraph.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/BarGraph.java similarity index 100% rename from src/com/wildplot/android/rendering/BarGraph.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/BarGraph.java diff --git a/src/com/wildplot/android/rendering/DrawableContainer.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/DrawableContainer.java similarity index 100% rename from src/com/wildplot/android/rendering/DrawableContainer.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/DrawableContainer.java diff --git a/src/com/wildplot/android/rendering/FunctionDrawer.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/FunctionDrawer.java similarity index 100% rename from src/com/wildplot/android/rendering/FunctionDrawer.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/FunctionDrawer.java diff --git a/src/com/wildplot/android/rendering/FunctionDrawer_y.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/FunctionDrawer_y.java similarity index 100% rename from src/com/wildplot/android/rendering/FunctionDrawer_y.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/FunctionDrawer_y.java diff --git a/src/com/wildplot/android/rendering/Integral.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/Integral.java similarity index 100% rename from src/com/wildplot/android/rendering/Integral.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/Integral.java diff --git a/src/com/wildplot/android/rendering/LegendDrawable.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/LegendDrawable.java similarity index 100% rename from src/com/wildplot/android/rendering/LegendDrawable.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/LegendDrawable.java diff --git a/src/com/wildplot/android/rendering/Lines.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/Lines.java similarity index 100% rename from src/com/wildplot/android/rendering/Lines.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/Lines.java diff --git a/src/com/wildplot/android/rendering/LinesPoints.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/LinesPoints.java similarity index 100% rename from src/com/wildplot/android/rendering/LinesPoints.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/LinesPoints.java diff --git a/src/com/wildplot/android/rendering/MultiScreenPart.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/MultiScreenPart.java similarity index 100% rename from src/com/wildplot/android/rendering/MultiScreenPart.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/MultiScreenPart.java diff --git a/src/com/wildplot/android/rendering/PieChart.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/PieChart.java similarity index 100% rename from src/com/wildplot/android/rendering/PieChart.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/PieChart.java diff --git a/src/com/wildplot/android/rendering/PlotSheet.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/PlotSheet.java similarity index 100% rename from src/com/wildplot/android/rendering/PlotSheet.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/PlotSheet.java diff --git a/src/com/wildplot/android/rendering/PointDrawer2D.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/PointDrawer2D.java similarity index 100% rename from src/com/wildplot/android/rendering/PointDrawer2D.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/PointDrawer2D.java diff --git a/src/com/wildplot/android/rendering/RelativeColorGradient.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/RelativeColorGradient.java similarity index 100% rename from src/com/wildplot/android/rendering/RelativeColorGradient.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/RelativeColorGradient.java diff --git a/src/com/wildplot/android/rendering/ReliefDrawer.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/ReliefDrawer.java similarity index 100% rename from src/com/wildplot/android/rendering/ReliefDrawer.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/ReliefDrawer.java diff --git a/src/com/wildplot/android/rendering/XAxis.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/XAxis.java similarity index 100% rename from src/com/wildplot/android/rendering/XAxis.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/XAxis.java diff --git a/src/com/wildplot/android/rendering/XAxisBarGraph.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/XAxisBarGraph.java similarity index 100% rename from src/com/wildplot/android/rendering/XAxisBarGraph.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/XAxisBarGraph.java diff --git a/src/com/wildplot/android/rendering/XAxisHistoGram.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/XAxisHistoGram.java similarity index 100% rename from src/com/wildplot/android/rendering/XAxisHistoGram.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/XAxisHistoGram.java diff --git a/src/com/wildplot/android/rendering/XGrid.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/XGrid.java similarity index 100% rename from src/com/wildplot/android/rendering/XGrid.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/XGrid.java diff --git a/src/com/wildplot/android/rendering/YAxis.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/YAxis.java similarity index 100% rename from src/com/wildplot/android/rendering/YAxis.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/YAxis.java diff --git a/src/com/wildplot/android/rendering/YAxisBarGraph.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/YAxisBarGraph.java similarity index 100% rename from src/com/wildplot/android/rendering/YAxisBarGraph.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/YAxisBarGraph.java diff --git a/src/com/wildplot/android/rendering/YAxisHistoGram.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/YAxisHistoGram.java similarity index 100% rename from src/com/wildplot/android/rendering/YAxisHistoGram.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/YAxisHistoGram.java diff --git a/src/com/wildplot/android/rendering/YGrid.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/YGrid.java similarity index 100% rename from src/com/wildplot/android/rendering/YGrid.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/YGrid.java diff --git a/src/com/wildplot/android/rendering/graphics/wrapper/BasicStrokeWrap.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/BasicStrokeWrap.java similarity index 100% rename from src/com/wildplot/android/rendering/graphics/wrapper/BasicStrokeWrap.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/BasicStrokeWrap.java diff --git a/src/com/wildplot/android/rendering/graphics/wrapper/BufferedImageWrap.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/BufferedImageWrap.java similarity index 100% rename from src/com/wildplot/android/rendering/graphics/wrapper/BufferedImageWrap.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/BufferedImageWrap.java diff --git a/src/com/wildplot/android/rendering/graphics/wrapper/ColorWrap.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/ColorWrap.java similarity index 100% rename from src/com/wildplot/android/rendering/graphics/wrapper/ColorWrap.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/ColorWrap.java diff --git a/src/com/wildplot/android/rendering/graphics/wrapper/FontMetricsWrap.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/FontMetricsWrap.java similarity index 100% rename from src/com/wildplot/android/rendering/graphics/wrapper/FontMetricsWrap.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/FontMetricsWrap.java diff --git a/src/com/wildplot/android/rendering/graphics/wrapper/GraphicsWrap.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/GraphicsWrap.java similarity index 100% rename from src/com/wildplot/android/rendering/graphics/wrapper/GraphicsWrap.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/GraphicsWrap.java diff --git a/src/com/wildplot/android/rendering/graphics/wrapper/RectangleWrap.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/RectangleWrap.java similarity index 100% rename from src/com/wildplot/android/rendering/graphics/wrapper/RectangleWrap.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/RectangleWrap.java diff --git a/src/com/wildplot/android/rendering/graphics/wrapper/StrokeWrap.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/StrokeWrap.java similarity index 100% rename from src/com/wildplot/android/rendering/graphics/wrapper/StrokeWrap.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/graphics/wrapper/StrokeWrap.java diff --git a/src/com/wildplot/android/rendering/interfaces/Drawable.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/Drawable.java similarity index 100% rename from src/com/wildplot/android/rendering/interfaces/Drawable.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/Drawable.java diff --git a/src/com/wildplot/android/rendering/interfaces/Function2D.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/Function2D.java similarity index 100% rename from src/com/wildplot/android/rendering/interfaces/Function2D.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/Function2D.java diff --git a/src/com/wildplot/android/rendering/interfaces/Function3D.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/Function3D.java similarity index 100% rename from src/com/wildplot/android/rendering/interfaces/Function3D.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/Function3D.java diff --git a/src/com/wildplot/android/rendering/interfaces/Legendable.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/Legendable.java similarity index 100% rename from src/com/wildplot/android/rendering/interfaces/Legendable.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/Legendable.java diff --git a/src/com/wildplot/android/rendering/interfaces/StepFunction2D.java b/AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/StepFunction2D.java similarity index 100% rename from src/com/wildplot/android/rendering/interfaces/StepFunction2D.java rename to AnkiDroid/src/main/java/com/wildplot/android/rendering/interfaces/StepFunction2D.java diff --git a/src/org/amr/arabic/ArabicReshaper.java b/AnkiDroid/src/main/java/org/amr/arabic/ArabicReshaper.java old mode 100755 new mode 100644 similarity index 100% rename from src/org/amr/arabic/ArabicReshaper.java rename to AnkiDroid/src/main/java/org/amr/arabic/ArabicReshaper.java diff --git a/src/org/amr/arabic/ArabicUtilities.java b/AnkiDroid/src/main/java/org/amr/arabic/ArabicUtilities.java old mode 100755 new mode 100644 similarity index 100% rename from src/org/amr/arabic/ArabicUtilities.java rename to AnkiDroid/src/main/java/org/amr/arabic/ArabicUtilities.java diff --git a/src/org/apache/commons/httpclient/contrib/ssl/EasySSLSocketFactory.java b/AnkiDroid/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasySSLSocketFactory.java similarity index 100% rename from src/org/apache/commons/httpclient/contrib/ssl/EasySSLSocketFactory.java rename to AnkiDroid/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasySSLSocketFactory.java diff --git a/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java b/AnkiDroid/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java similarity index 100% rename from src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java rename to AnkiDroid/src/main/java/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java diff --git a/res/anim/dialog_exit.xml b/AnkiDroid/src/main/res/anim/dialog_exit.xml similarity index 100% rename from res/anim/dialog_exit.xml rename to AnkiDroid/src/main/res/anim/dialog_exit.xml diff --git a/res/anim/fade_in.xml b/AnkiDroid/src/main/res/anim/fade_in.xml similarity index 100% rename from res/anim/fade_in.xml rename to AnkiDroid/src/main/res/anim/fade_in.xml diff --git a/res/anim/fade_out.xml b/AnkiDroid/src/main/res/anim/fade_out.xml similarity index 100% rename from res/anim/fade_out.xml rename to AnkiDroid/src/main/res/anim/fade_out.xml diff --git a/res/anim/linear_interpolator.xml b/AnkiDroid/src/main/res/anim/linear_interpolator.xml similarity index 100% rename from res/anim/linear_interpolator.xml rename to AnkiDroid/src/main/res/anim/linear_interpolator.xml diff --git a/res/anim/none.xml b/AnkiDroid/src/main/res/anim/none.xml similarity index 100% rename from res/anim/none.xml rename to AnkiDroid/src/main/res/anim/none.xml diff --git a/res/anim/slide_down_in.xml b/AnkiDroid/src/main/res/anim/slide_down_in.xml similarity index 100% rename from res/anim/slide_down_in.xml rename to AnkiDroid/src/main/res/anim/slide_down_in.xml diff --git a/res/anim/slide_down_out.xml b/AnkiDroid/src/main/res/anim/slide_down_out.xml similarity index 100% rename from res/anim/slide_down_out.xml rename to AnkiDroid/src/main/res/anim/slide_down_out.xml diff --git a/res/anim/slide_left_in.xml b/AnkiDroid/src/main/res/anim/slide_left_in.xml similarity index 100% rename from res/anim/slide_left_in.xml rename to AnkiDroid/src/main/res/anim/slide_left_in.xml diff --git a/res/anim/slide_left_out.xml b/AnkiDroid/src/main/res/anim/slide_left_out.xml similarity index 100% rename from res/anim/slide_left_out.xml rename to AnkiDroid/src/main/res/anim/slide_left_out.xml diff --git a/res/anim/slide_right_in.xml b/AnkiDroid/src/main/res/anim/slide_right_in.xml similarity index 100% rename from res/anim/slide_right_in.xml rename to AnkiDroid/src/main/res/anim/slide_right_in.xml diff --git a/res/anim/slide_right_out.xml b/AnkiDroid/src/main/res/anim/slide_right_out.xml similarity index 100% rename from res/anim/slide_right_out.xml rename to AnkiDroid/src/main/res/anim/slide_right_out.xml diff --git a/res/anim/slide_up_in.xml b/AnkiDroid/src/main/res/anim/slide_up_in.xml similarity index 100% rename from res/anim/slide_up_in.xml rename to AnkiDroid/src/main/res/anim/slide_up_in.xml diff --git a/res/anim/slide_up_out.xml b/AnkiDroid/src/main/res/anim/slide_up_out.xml similarity index 100% rename from res/anim/slide_up_out.xml rename to AnkiDroid/src/main/res/anim/slide_up_out.xml diff --git a/res/anim/translucent_enter.xml b/AnkiDroid/src/main/res/anim/translucent_enter.xml similarity index 100% rename from res/anim/translucent_enter.xml rename to AnkiDroid/src/main/res/anim/translucent_enter.xml diff --git a/res/anim/translucent_exit.xml b/AnkiDroid/src/main/res/anim/translucent_exit.xml similarity index 100% rename from res/anim/translucent_exit.xml rename to AnkiDroid/src/main/res/anim/translucent_exit.xml diff --git a/res/drawable-hdpi/android_std_content_discard.png b/AnkiDroid/src/main/res/drawable-hdpi/android_std_content_discard.png similarity index 100% rename from res/drawable-hdpi/android_std_content_discard.png rename to AnkiDroid/src/main/res/drawable-hdpi/android_std_content_discard.png diff --git a/res/drawable-hdpi/anki.png b/AnkiDroid/src/main/res/drawable-hdpi/anki.png similarity index 100% rename from res/drawable-hdpi/anki.png rename to AnkiDroid/src/main/res/drawable-hdpi/anki.png diff --git a/res/drawable-hdpi/av_pause.png b/AnkiDroid/src/main/res/drawable-hdpi/av_pause.png similarity index 100% rename from res/drawable-hdpi/av_pause.png rename to AnkiDroid/src/main/res/drawable-hdpi/av_pause.png diff --git a/res/drawable-hdpi/av_play.png b/AnkiDroid/src/main/res/drawable-hdpi/av_play.png similarity index 100% rename from res/drawable-hdpi/av_play.png rename to AnkiDroid/src/main/res/drawable-hdpi/av_play.png diff --git a/res/drawable-hdpi/av_rec.png b/AnkiDroid/src/main/res/drawable-hdpi/av_rec.png similarity index 100% rename from res/drawable-hdpi/av_rec.png rename to AnkiDroid/src/main/res/drawable-hdpi/av_rec.png diff --git a/res/drawable-hdpi/av_rec_stop.png b/AnkiDroid/src/main/res/drawable-hdpi/av_rec_stop.png similarity index 100% rename from res/drawable-hdpi/av_rec_stop.png rename to AnkiDroid/src/main/res/drawable-hdpi/av_rec_stop.png diff --git a/res/drawable-hdpi/av_stop.png b/AnkiDroid/src/main/res/drawable-hdpi/av_stop.png similarity index 100% rename from res/drawable-hdpi/av_stop.png rename to AnkiDroid/src/main/res/drawable-hdpi/av_stop.png diff --git a/res/drawable-hdpi/blue_bg_cardbrowser_marked_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_marked_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_cardbrowser_marked_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_marked_normal.9.png diff --git a/res/drawable-hdpi/blue_bg_cardbrowser_marked_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_marked_pressed.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_cardbrowser_marked_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_marked_pressed.9.png diff --git a/res/drawable-hdpi/blue_bg_cardbrowser_marked_suspended_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_marked_suspended_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_cardbrowser_marked_suspended_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_marked_suspended_normal.9.png diff --git a/res/drawable-hdpi/blue_bg_cardbrowser_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_cardbrowser_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_normal.9.png diff --git a/res/drawable-hdpi/blue_bg_cardbrowser_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_pressed.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_cardbrowser_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_pressed.9.png diff --git a/res/drawable-hdpi/blue_bg_cardbrowser_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_selected.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_cardbrowser_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_selected.9.png diff --git a/res/drawable-hdpi/blue_bg_cardbrowser_suspended_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_suspended_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_cardbrowser_suspended_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_cardbrowser_suspended_normal.9.png diff --git a/res/drawable-hdpi/blue_bg_deckpicker_focused.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_deckpicker_focused.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_deckpicker_focused.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_deckpicker_focused.9.png diff --git a/res/drawable-hdpi/blue_bg_deckpicker_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_deckpicker_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_deckpicker_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_deckpicker_normal.9.png diff --git a/res/drawable-hdpi/blue_bg_deckpicker_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_deckpicker_pressed.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_deckpicker_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_deckpicker_pressed.9.png diff --git a/res/drawable-hdpi/blue_bg_deckpicker_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_deckpicker_selected.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_deckpicker_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_deckpicker_selected.9.png diff --git a/res/drawable-hdpi/blue_bg_webview.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_webview.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_webview.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_webview.9.png diff --git a/res/drawable-hdpi/blue_bg_webview_night.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_bg_webview_night.9.png similarity index 100% rename from res/drawable-hdpi/blue_bg_webview_night.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_bg_webview_night.9.png diff --git a/res/drawable-hdpi/blue_btn_check_off.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_check_off.png similarity index 100% rename from res/drawable-hdpi/blue_btn_check_off.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_check_off.png diff --git a/res/drawable-hdpi/blue_btn_check_on.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_check_on.png similarity index 100% rename from res/drawable-hdpi/blue_btn_check_on.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_check_on.png diff --git a/res/drawable-hdpi/blue_btn_default_disabled.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_disabled.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_default_disabled.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_disabled.9.png diff --git a/res/drawable-hdpi/blue_btn_default_disabled_night.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_disabled_night.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_default_disabled_night.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_disabled_night.9.png diff --git a/res/drawable-hdpi/blue_btn_default_focused.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_focused.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_default_focused.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_focused.9.png diff --git a/res/drawable-hdpi/blue_btn_default_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_default_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_normal.9.png diff --git a/res/drawable-hdpi/blue_btn_default_normal_night.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_normal_night.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_default_normal_night.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_normal_night.9.png diff --git a/res/drawable-hdpi/blue_btn_default_normal_night_focused.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_normal_night_focused.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_default_normal_night_focused.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_normal_night_focused.9.png diff --git a/res/drawable-hdpi/blue_btn_default_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_pressed.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_default_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_default_pressed.9.png diff --git a/res/drawable-hdpi/blue_btn_dropdown_disabled.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_dropdown_disabled.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_dropdown_disabled.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_dropdown_disabled.9.png diff --git a/res/drawable-hdpi/blue_btn_dropdown_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_dropdown_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_dropdown_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_dropdown_normal.9.png diff --git a/res/drawable-hdpi/blue_btn_dropdown_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_dropdown_pressed.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_dropdown_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_dropdown_pressed.9.png diff --git a/res/drawable-hdpi/blue_btn_radio_off.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_radio_off.png similarity index 100% rename from res/drawable-hdpi/blue_btn_radio_off.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_radio_off.png diff --git a/res/drawable-hdpi/blue_btn_radio_on.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_radio_on.png similarity index 100% rename from res/drawable-hdpi/blue_btn_radio_on.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_radio_on.png diff --git a/res/drawable-hdpi/blue_btn_small_disabled.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_small_disabled.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_small_disabled.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_small_disabled.9.png diff --git a/res/drawable-hdpi/blue_btn_small_focused.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_small_focused.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_small_focused.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_small_focused.9.png diff --git a/res/drawable-hdpi/blue_btn_small_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_small_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_small_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_small_normal.9.png diff --git a/res/drawable-hdpi/blue_btn_small_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_small_pressed.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_small_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_small_pressed.9.png diff --git a/res/drawable-hdpi/blue_btn_toggle_off.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_toggle_off.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_toggle_off.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_toggle_off.9.png diff --git a/res/drawable-hdpi/blue_btn_toggle_on.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_btn_toggle_on.9.png similarity index 100% rename from res/drawable-hdpi/blue_btn_toggle_on.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_btn_toggle_on.9.png diff --git a/res/drawable-hdpi/blue_divider_horizontal_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_divider_horizontal_bright.9.png similarity index 100% rename from res/drawable-hdpi/blue_divider_horizontal_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_divider_horizontal_bright.9.png diff --git a/res/drawable-hdpi/blue_list_selector_background_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_list_selector_background_normal.9.png similarity index 100% rename from res/drawable-hdpi/blue_list_selector_background_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_list_selector_background_normal.9.png diff --git a/res/drawable-hdpi/blue_list_selector_background_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_list_selector_background_pressed.9.png similarity index 100% rename from res/drawable-hdpi/blue_list_selector_background_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_list_selector_background_pressed.9.png diff --git a/res/drawable-hdpi/blue_menu_background.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_menu_background.9.png similarity index 100% rename from res/drawable-hdpi/blue_menu_background.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_menu_background.9.png diff --git a/res/drawable-hdpi/blue_menu_background_fill_parent_width.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_menu_background_fill_parent_width.9.png similarity index 100% rename from res/drawable-hdpi/blue_menu_background_fill_parent_width.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_menu_background_fill_parent_width.9.png diff --git a/res/drawable-hdpi/blue_popup_bottom_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_bottom_bright.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_bottom_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_bottom_bright.9.png diff --git a/res/drawable-hdpi/blue_popup_bottom_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_bottom_dark.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_bottom_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_bottom_dark.9.png diff --git a/res/drawable-hdpi/blue_popup_bottom_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_bottom_medium.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_bottom_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_bottom_medium.9.png diff --git a/res/drawable-hdpi/blue_popup_center_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_center_bright.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_center_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_center_bright.9.png diff --git a/res/drawable-hdpi/blue_popup_center_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_center_dark.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_center_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_center_dark.9.png diff --git a/res/drawable-hdpi/blue_popup_center_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_center_medium.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_center_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_center_medium.9.png diff --git a/res/drawable-hdpi/blue_popup_full_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_full_bright.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_full_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_full_bright.9.png diff --git a/res/drawable-hdpi/blue_popup_full_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_full_dark.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_full_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_full_dark.9.png diff --git a/res/drawable-hdpi/blue_popup_full_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_full_medium.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_full_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_full_medium.9.png diff --git a/res/drawable-hdpi/blue_popup_top_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_top_bright.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_top_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_top_bright.9.png diff --git a/res/drawable-hdpi/blue_popup_top_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_top_dark.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_top_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_top_dark.9.png diff --git a/res/drawable-hdpi/blue_popup_top_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_popup_top_medium.9.png similarity index 100% rename from res/drawable-hdpi/blue_popup_top_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_popup_top_medium.9.png diff --git a/res/drawable-hdpi/blue_textfield_default.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_textfield_default.9.png similarity index 100% rename from res/drawable-hdpi/blue_textfield_default.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_textfield_default.9.png diff --git a/res/drawable-hdpi/blue_textfield_disabled.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_textfield_disabled.9.png similarity index 100% rename from res/drawable-hdpi/blue_textfield_disabled.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_textfield_disabled.9.png diff --git a/res/drawable-hdpi/blue_textfield_disabled_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_textfield_disabled_selected.9.png similarity index 100% rename from res/drawable-hdpi/blue_textfield_disabled_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_textfield_disabled_selected.9.png diff --git a/res/drawable-hdpi/blue_textfield_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_textfield_selected.9.png similarity index 100% rename from res/drawable-hdpi/blue_textfield_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_textfield_selected.9.png diff --git a/res/drawable-hdpi/blue_textview.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_textview.9.png similarity index 100% rename from res/drawable-hdpi/blue_textview.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_textview.9.png diff --git a/res/drawable-hdpi/blue_title.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_title.9.png similarity index 100% rename from res/drawable-hdpi/blue_title.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_title.9.png diff --git a/res/drawable-hdpi/blue_toast_frame.9.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_toast_frame.9.png similarity index 100% rename from res/drawable-hdpi/blue_toast_frame.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_toast_frame.9.png diff --git a/res/drawable-hdpi/blue_wallpaper.png b/AnkiDroid/src/main/res/drawable-hdpi/blue_wallpaper.png similarity index 100% rename from res/drawable-hdpi/blue_wallpaper.png rename to AnkiDroid/src/main/res/drawable-hdpi/blue_wallpaper.png diff --git a/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png similarity index 100% rename from res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/btn_keyboard_key_fulltrans_normal.9.png diff --git a/res/drawable-hdpi/content_picture.png b/AnkiDroid/src/main/res/drawable-hdpi/content_picture.png similarity index 100% rename from res/drawable-hdpi/content_picture.png rename to AnkiDroid/src/main/res/drawable-hdpi/content_picture.png diff --git a/res/drawable-hdpi/device_access_mic.png b/AnkiDroid/src/main/res/drawable-hdpi/device_access_mic.png similarity index 100% rename from res/drawable-hdpi/device_access_mic.png rename to AnkiDroid/src/main/res/drawable-hdpi/device_access_mic.png diff --git a/res/drawable-hdpi/divider_horizontal_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/divider_horizontal_bright.9.png similarity index 100% rename from res/drawable-hdpi/divider_horizontal_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/divider_horizontal_bright.9.png diff --git a/res/drawable-hdpi/divider_horizontal_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/divider_horizontal_dark.9.png similarity index 100% rename from res/drawable-hdpi/divider_horizontal_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/divider_horizontal_dark.9.png diff --git a/res/drawable-hdpi/drawer_shadow.9.png b/AnkiDroid/src/main/res/drawable-hdpi/drawer_shadow.9.png similarity index 100% rename from res/drawable-hdpi/drawer_shadow.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/drawer_shadow.9.png diff --git a/res/drawable-hdpi/flat_textview.9.png b/AnkiDroid/src/main/res/drawable-hdpi/flat_textview.9.png similarity index 100% rename from res/drawable-hdpi/flat_textview.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/flat_textview.9.png diff --git a/res/drawable-hdpi/flat_title.9.png b/AnkiDroid/src/main/res/drawable-hdpi/flat_title.9.png similarity index 100% rename from res/drawable-hdpi/flat_title.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/flat_title.9.png diff --git a/res/drawable-hdpi/flat_wallpaper.png b/AnkiDroid/src/main/res/drawable-hdpi/flat_wallpaper.png similarity index 100% rename from res/drawable-hdpi/flat_wallpaper.png rename to AnkiDroid/src/main/res/drawable-hdpi/flat_wallpaper.png diff --git a/res/drawable-hdpi/help.png b/AnkiDroid/src/main/res/drawable-hdpi/help.png similarity index 100% rename from res/drawable-hdpi/help.png rename to AnkiDroid/src/main/res/drawable-hdpi/help.png diff --git a/res/drawable-hdpi/help_inverted.png b/AnkiDroid/src/main/res/drawable-hdpi/help_inverted.png similarity index 100% rename from res/drawable-hdpi/help_inverted.png rename to AnkiDroid/src/main/res/drawable-hdpi/help_inverted.png diff --git a/res/drawable-hdpi/ic_action_accept.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_accept.png similarity index 100% rename from res/drawable-hdpi/ic_action_accept.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_accept.png diff --git a/res/drawable-hdpi/ic_action_action_settings.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_action_settings.png similarity index 100% rename from res/drawable-hdpi/ic_action_action_settings.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_action_settings.png diff --git a/res/drawable-hdpi/ic_action_camera.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_camera.png similarity index 100% rename from res/drawable-hdpi/ic_action_camera.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_camera.png diff --git a/res/drawable-hdpi/ic_action_cancel.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_cancel.png similarity index 100% rename from res/drawable-hdpi/ic_action_cancel.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_cancel.png diff --git a/res/drawable-hdpi/ic_action_cancel_dark.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_cancel_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_cancel_dark.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_cancel_dark.png diff --git a/res/drawable-hdpi/ic_action_email.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_email.png similarity index 100% rename from res/drawable-hdpi/ic_action_email.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_email.png diff --git a/res/drawable-hdpi/ic_action_help.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_help.png similarity index 100% rename from res/drawable-hdpi/ic_action_help.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_help.png diff --git a/res/drawable-hdpi/ic_action_import_export.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_import_export.png similarity index 100% rename from res/drawable-hdpi/ic_action_import_export.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_import_export.png diff --git a/res/drawable-hdpi/ic_action_mic.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_mic.png similarity index 100% rename from res/drawable-hdpi/ic_action_mic.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_mic.png diff --git a/res/drawable-hdpi/ic_action_replay.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_replay.png similarity index 100% rename from res/drawable-hdpi/ic_action_replay.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_replay.png diff --git a/res/drawable-hdpi/ic_action_replay_dark.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_replay_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_replay_dark.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_replay_dark.png diff --git a/res/drawable-hdpi/ic_action_search.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_search.png similarity index 100% rename from res/drawable-hdpi/ic_action_search.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_search.png diff --git a/res/drawable-hdpi/ic_action_settings.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_settings.png similarity index 100% rename from res/drawable-hdpi/ic_action_settings.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_settings.png diff --git a/res/drawable-hdpi/ic_action_storage.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_storage.png similarity index 100% rename from res/drawable-hdpi/ic_action_storage.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_storage.png diff --git a/res/drawable-hdpi/ic_action_time.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_time.png similarity index 100% rename from res/drawable-hdpi/ic_action_time.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_time.png diff --git a/res/drawable-hdpi/ic_action_whiteboard_enable_dark.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_whiteboard_enable_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_whiteboard_enable_dark.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_whiteboard_enable_dark.png diff --git a/res/drawable-hdpi/ic_action_whiteboard_enable_dark_disabled.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_whiteboard_enable_dark_disabled.png similarity index 100% rename from res/drawable-hdpi/ic_action_whiteboard_enable_dark_disabled.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_whiteboard_enable_dark_disabled.png diff --git a/res/drawable-hdpi/ic_action_whiteboard_enable_light.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_whiteboard_enable_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_whiteboard_enable_light.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_whiteboard_enable_light.png diff --git a/res/drawable-hdpi/ic_action_whiteboard_enable_light_disabled.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_action_whiteboard_enable_light_disabled.png similarity index 100% rename from res/drawable-hdpi/ic_action_whiteboard_enable_light_disabled.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_action_whiteboard_enable_light_disabled.png diff --git a/res/drawable-hdpi/ic_addtag_normal.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_addtag_normal.png similarity index 100% rename from res/drawable-hdpi/ic_addtag_normal.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_addtag_normal.png diff --git a/res/drawable-hdpi/ic_addtag_pressed.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_addtag_pressed.png similarity index 100% rename from res/drawable-hdpi/ic_addtag_pressed.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_addtag_pressed.png diff --git a/res/drawable-hdpi/ic_circle_normal.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_circle_normal.png similarity index 100% rename from res/drawable-hdpi/ic_circle_normal.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_circle_normal.png diff --git a/res/drawable-hdpi/ic_circle_pressed.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_circle_pressed.png similarity index 100% rename from res/drawable-hdpi/ic_circle_pressed.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_circle_pressed.png diff --git a/res/drawable-hdpi/ic_dialog_alert.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_dialog_alert.png similarity index 100% rename from res/drawable-hdpi/ic_dialog_alert.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_dialog_alert.png diff --git a/res/drawable-hdpi/ic_dialog_info.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_dialog_info.png similarity index 100% rename from res/drawable-hdpi/ic_dialog_info.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_dialog_info.png diff --git a/res/drawable-hdpi/ic_drawer.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_drawer.png similarity index 100% rename from res/drawable-hdpi/ic_drawer.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_drawer.png diff --git a/res/drawable-hdpi/ic_lookup_normal.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_lookup_normal.png similarity index 100% rename from res/drawable-hdpi/ic_lookup_normal.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_lookup_normal.png diff --git a/res/drawable-hdpi/ic_lookup_pressed.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_lookup_pressed.png similarity index 100% rename from res/drawable-hdpi/ic_lookup_pressed.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_lookup_pressed.png diff --git a/res/drawable-hdpi/ic_media.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_media.png similarity index 100% rename from res/drawable-hdpi/ic_media.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_media.png diff --git a/res/drawable-hdpi/ic_menu_add.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_add.png similarity index 100% rename from res/drawable-hdpi/ic_menu_add.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_add.png diff --git a/res/drawable-hdpi/ic_menu_always_landscape_portrait.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_always_landscape_portrait.png similarity index 100% rename from res/drawable-hdpi/ic_menu_always_landscape_portrait.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_always_landscape_portrait.png diff --git a/res/drawable-hdpi/ic_menu_archive.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_archive.png similarity index 100% rename from res/drawable-hdpi/ic_menu_archive.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_archive.png diff --git a/res/drawable-hdpi/ic_menu_close_clear_cancel.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel.png similarity index 100% rename from res/drawable-hdpi/ic_menu_close_clear_cancel.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_close_clear_cancel.png diff --git a/res/drawable-hdpi/ic_menu_compose.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_compose.png similarity index 100% rename from res/drawable-hdpi/ic_menu_compose.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_compose.png diff --git a/res/drawable-hdpi/ic_menu_delete.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_delete.png similarity index 100% rename from res/drawable-hdpi/ic_menu_delete.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_delete.png diff --git a/res/drawable-hdpi/ic_menu_download.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_download.png similarity index 100% rename from res/drawable-hdpi/ic_menu_download.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_download.png diff --git a/res/drawable-hdpi/ic_menu_edit.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_edit.png similarity index 100% rename from res/drawable-hdpi/ic_menu_edit.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_edit.png diff --git a/res/drawable-hdpi/ic_menu_help.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_help.png similarity index 100% rename from res/drawable-hdpi/ic_menu_help.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_help.png diff --git a/res/drawable-hdpi/ic_menu_home.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_home.png similarity index 100% rename from res/drawable-hdpi/ic_menu_home.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_home.png diff --git a/res/drawable-hdpi/ic_menu_info_details.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_info_details.png similarity index 100% rename from res/drawable-hdpi/ic_menu_info_details.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_info_details.png diff --git a/res/drawable-hdpi/ic_menu_manage.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_manage.png similarity index 100% rename from res/drawable-hdpi/ic_menu_manage.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_manage.png diff --git a/res/drawable-hdpi/ic_menu_mark.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_mark.png similarity index 100% rename from res/drawable-hdpi/ic_menu_mark.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_mark.png diff --git a/res/drawable-hdpi/ic_menu_marked.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_marked.png similarity index 100% rename from res/drawable-hdpi/ic_menu_marked.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_marked.png diff --git a/res/drawable-hdpi/ic_menu_night.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_night.png similarity index 100% rename from res/drawable-hdpi/ic_menu_night.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_night.png diff --git a/res/drawable-hdpi/ic_menu_night_checked.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_night_checked.png similarity index 100% rename from res/drawable-hdpi/ic_menu_night_checked.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_night_checked.png diff --git a/res/drawable-hdpi/ic_menu_preferences.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_preferences.png similarity index 100% rename from res/drawable-hdpi/ic_menu_preferences.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_preferences.png diff --git a/res/drawable-hdpi/ic_menu_refresh.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-hdpi/ic_menu_refresh.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_refresh.png diff --git a/res/drawable-hdpi/ic_menu_revert.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_revert.png similarity index 100% rename from res/drawable-hdpi/ic_menu_revert.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_revert.png diff --git a/res/drawable-hdpi/ic_menu_revert_disabled.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_revert_disabled.png similarity index 100% rename from res/drawable-hdpi/ic_menu_revert_disabled.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_revert_disabled.png diff --git a/res/drawable-hdpi/ic_menu_search.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_search.png similarity index 100% rename from res/drawable-hdpi/ic_menu_search.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_search.png diff --git a/res/drawable-hdpi/ic_menu_send.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_send.png similarity index 100% rename from res/drawable-hdpi/ic_menu_send.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_send.png diff --git a/res/drawable-hdpi/ic_menu_sort_by_size.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_sort_by_size.png similarity index 100% rename from res/drawable-hdpi/ic_menu_sort_by_size.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_sort_by_size.png diff --git a/res/drawable-hdpi/ic_menu_star_off.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_star_off.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-hdpi/ic_menu_star_off.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_star_off.png diff --git a/res/drawable-hdpi/ic_menu_star_on.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_star_on.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-hdpi/ic_menu_star_on.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_star_on.png diff --git a/res/drawable-hdpi/ic_menu_statistics.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_statistics.png similarity index 100% rename from res/drawable-hdpi/ic_menu_statistics.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_statistics.png diff --git a/res/drawable-hdpi/ic_menu_stop.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_stop.png similarity index 100% rename from res/drawable-hdpi/ic_menu_stop.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_stop.png diff --git a/res/drawable-hdpi/ic_menu_upload.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_upload.png similarity index 100% rename from res/drawable-hdpi/ic_menu_upload.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_upload.png diff --git a/res/drawable-hdpi/ic_menu_view.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_view.png similarity index 100% rename from res/drawable-hdpi/ic_menu_view.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_view.png diff --git a/res/drawable-hdpi/ic_menu_zeemote.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_zeemote.png similarity index 100% rename from res/drawable-hdpi/ic_menu_zeemote.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_zeemote.png diff --git a/res/drawable-hdpi/ic_menu_zoom_in.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_zoom_in.png similarity index 100% rename from res/drawable-hdpi/ic_menu_zoom_in.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_zoom_in.png diff --git a/res/drawable-hdpi/ic_menu_zoom_out.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_menu_zoom_out.png similarity index 100% rename from res/drawable-hdpi/ic_menu_zoom_out.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_menu_zoom_out.png diff --git a/res/drawable-hdpi/ic_start.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_start.png similarity index 100% rename from res/drawable-hdpi/ic_start.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_start.png diff --git a/res/drawable-hdpi/ic_stat_notify.png b/AnkiDroid/src/main/res/drawable-hdpi/ic_stat_notify.png similarity index 100% rename from res/drawable-hdpi/ic_stat_notify.png rename to AnkiDroid/src/main/res/drawable-hdpi/ic_stat_notify.png diff --git a/res/drawable-hdpi/inline_play_button.png b/AnkiDroid/src/main/res/drawable-hdpi/inline_play_button.png similarity index 100% rename from res/drawable-hdpi/inline_play_button.png rename to AnkiDroid/src/main/res/drawable-hdpi/inline_play_button.png diff --git a/res/drawable-hdpi/popup_bottom_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_bottom_bright.9.png similarity index 100% rename from res/drawable-hdpi/popup_bottom_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_bottom_bright.9.png diff --git a/res/drawable-hdpi/popup_bottom_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_bottom_dark.9.png similarity index 100% rename from res/drawable-hdpi/popup_bottom_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_bottom_dark.9.png diff --git a/res/drawable-hdpi/popup_bottom_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_bottom_medium.9.png similarity index 100% rename from res/drawable-hdpi/popup_bottom_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_bottom_medium.9.png diff --git a/res/drawable-hdpi/popup_center_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_center_bright.9.png similarity index 100% rename from res/drawable-hdpi/popup_center_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_center_bright.9.png diff --git a/res/drawable-hdpi/popup_center_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_center_dark.9.png similarity index 100% rename from res/drawable-hdpi/popup_center_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_center_dark.9.png diff --git a/res/drawable-hdpi/popup_center_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_center_medium.9.png similarity index 100% rename from res/drawable-hdpi/popup_center_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_center_medium.9.png diff --git a/res/drawable-hdpi/popup_full_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_full_bright.9.png similarity index 100% rename from res/drawable-hdpi/popup_full_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_full_bright.9.png diff --git a/res/drawable-hdpi/popup_full_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_full_dark.9.png similarity index 100% rename from res/drawable-hdpi/popup_full_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_full_dark.9.png diff --git a/res/drawable-hdpi/popup_top_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_top_bright.9.png similarity index 100% rename from res/drawable-hdpi/popup_top_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_top_bright.9.png diff --git a/res/drawable-hdpi/popup_top_dark.9.png b/AnkiDroid/src/main/res/drawable-hdpi/popup_top_dark.9.png similarity index 100% rename from res/drawable-hdpi/popup_top_dark.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/popup_top_dark.9.png diff --git a/res/drawable-hdpi/progress_bigwidget_primary.9.png b/AnkiDroid/src/main/res/drawable-hdpi/progress_bigwidget_primary.9.png similarity index 100% rename from res/drawable-hdpi/progress_bigwidget_primary.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/progress_bigwidget_primary.9.png diff --git a/res/drawable-hdpi/progress_widget_primary.9.png b/AnkiDroid/src/main/res/drawable-hdpi/progress_widget_primary.9.png similarity index 100% rename from res/drawable-hdpi/progress_widget_primary.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/progress_widget_primary.9.png diff --git a/res/drawable-hdpi/spinner_inner.png b/AnkiDroid/src/main/res/drawable-hdpi/spinner_inner.png similarity index 100% rename from res/drawable-hdpi/spinner_inner.png rename to AnkiDroid/src/main/res/drawable-hdpi/spinner_inner.png diff --git a/res/drawable-hdpi/spinner_outer.png b/AnkiDroid/src/main/res/drawable-hdpi/spinner_outer.png similarity index 100% rename from res/drawable-hdpi/spinner_outer.png rename to AnkiDroid/src/main/res/drawable-hdpi/spinner_outer.png diff --git a/res/drawable-hdpi/spinner_white_inner.png b/AnkiDroid/src/main/res/drawable-hdpi/spinner_white_inner.png similarity index 100% rename from res/drawable-hdpi/spinner_white_inner.png rename to AnkiDroid/src/main/res/drawable-hdpi/spinner_white_inner.png diff --git a/res/drawable-hdpi/spinner_white_outer.png b/AnkiDroid/src/main/res/drawable-hdpi/spinner_white_outer.png similarity index 100% rename from res/drawable-hdpi/spinner_white_outer.png rename to AnkiDroid/src/main/res/drawable-hdpi/spinner_white_outer.png diff --git a/res/drawable-hdpi/studyoptions_add.png b/AnkiDroid/src/main/res/drawable-hdpi/studyoptions_add.png similarity index 100% rename from res/drawable-hdpi/studyoptions_add.png rename to AnkiDroid/src/main/res/drawable-hdpi/studyoptions_add.png diff --git a/res/drawable-hdpi/studyoptions_opts.png b/AnkiDroid/src/main/res/drawable-hdpi/studyoptions_opts.png similarity index 100% rename from res/drawable-hdpi/studyoptions_opts.png rename to AnkiDroid/src/main/res/drawable-hdpi/studyoptions_opts.png diff --git a/res/drawable-hdpi/text.png b/AnkiDroid/src/main/res/drawable-hdpi/text.png similarity index 100% rename from res/drawable-hdpi/text.png rename to AnkiDroid/src/main/res/drawable-hdpi/text.png diff --git a/res/drawable-hdpi/white_bg_cardbrowser_marked_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_marked_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_cardbrowser_marked_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_marked_normal.9.png diff --git a/res/drawable-hdpi/white_bg_cardbrowser_marked_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_marked_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_cardbrowser_marked_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_marked_pressed.9.png diff --git a/res/drawable-hdpi/white_bg_cardbrowser_marked_suspended_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_marked_suspended_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_cardbrowser_marked_suspended_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_marked_suspended_normal.9.png diff --git a/res/drawable-hdpi/white_bg_cardbrowser_marked_suspended_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_marked_suspended_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_cardbrowser_marked_suspended_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_marked_suspended_pressed.9.png diff --git a/res/drawable-hdpi/white_bg_cardbrowser_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_cardbrowser_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_normal.9.png diff --git a/res/drawable-hdpi/white_bg_cardbrowser_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_cardbrowser_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_pressed.9.png diff --git a/res/drawable-hdpi/white_bg_cardbrowser_suspended_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_suspended_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_cardbrowser_suspended_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_suspended_normal.9.png diff --git a/res/drawable-hdpi/white_bg_cardbrowser_suspended_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_suspended_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_cardbrowser_suspended_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_cardbrowser_suspended_pressed.9.png diff --git a/res/drawable-hdpi/white_bg_deckpicker_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_deckpicker_selected.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_deckpicker_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_deckpicker_selected.9.png diff --git a/res/drawable-hdpi/white_bg_webview.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_webview.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_webview.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_webview.9.png diff --git a/res/drawable-hdpi/white_bg_webview_night.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_bg_webview_night.9.png similarity index 100% rename from res/drawable-hdpi/white_bg_webview_night.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_bg_webview_night.9.png diff --git a/res/drawable-hdpi/white_btn_check_on.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_check_on.png similarity index 100% rename from res/drawable-hdpi/white_btn_check_on.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_check_on.png diff --git a/res/drawable-hdpi/white_btn_default_disabled.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_default_disabled.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_default_disabled.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_default_disabled.9.png diff --git a/res/drawable-hdpi/white_btn_default_focused.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_default_focused.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_default_focused.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_default_focused.9.png diff --git a/res/drawable-hdpi/white_btn_default_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_default_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_default_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_default_normal.9.png diff --git a/res/drawable-hdpi/white_btn_default_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_default_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_default_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_default_pressed.9.png diff --git a/res/drawable-hdpi/white_btn_radio_on.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_radio_on.png similarity index 100% rename from res/drawable-hdpi/white_btn_radio_on.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_radio_on.png diff --git a/res/drawable-hdpi/white_btn_small_disabled.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_disabled.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_disabled.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_disabled.9.png diff --git a/res/drawable-hdpi/white_btn_small_focused.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_focused.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_focused.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_focused.9.png diff --git a/res/drawable-hdpi/white_btn_small_night_disabled.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_disabled.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_night_disabled.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_disabled.9.png diff --git a/res/drawable-hdpi/white_btn_small_night_focused.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_focused.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_night_focused.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_focused.9.png diff --git a/res/drawable-hdpi/white_btn_small_night_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_night_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_normal.9.png diff --git a/res/drawable-hdpi/white_btn_small_night_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_night_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_pressed.9.png diff --git a/res/drawable-hdpi/white_btn_small_night_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_selected.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_night_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_night_selected.9.png diff --git a/res/drawable-hdpi/white_btn_small_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_normal.9.png diff --git a/res/drawable-hdpi/white_btn_small_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_small_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_small_pressed.9.png diff --git a/res/drawable-hdpi/white_btn_toggle_on.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_btn_toggle_on.9.png similarity index 100% rename from res/drawable-hdpi/white_btn_toggle_on.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_btn_toggle_on.9.png diff --git a/res/drawable-hdpi/white_deckpicker_bottom_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_bottom_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_bottom_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_bottom_normal.9.png diff --git a/res/drawable-hdpi/white_deckpicker_bottom_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_bottom_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_bottom_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_bottom_pressed.9.png diff --git a/res/drawable-hdpi/white_deckpicker_center_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_center_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_center_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_center_normal.9.png diff --git a/res/drawable-hdpi/white_deckpicker_center_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_center_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_center_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_center_pressed.9.png diff --git a/res/drawable-hdpi/white_deckpicker_full_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_full_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_full_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_full_normal.9.png diff --git a/res/drawable-hdpi/white_deckpicker_full_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_full_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_full_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_full_pressed.9.png diff --git a/res/drawable-hdpi/white_deckpicker_lv_background.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_lv_background.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_lv_background.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_lv_background.9.png diff --git a/res/drawable-hdpi/white_deckpicker_top_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_top_normal.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_top_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_top_normal.9.png diff --git a/res/drawable-hdpi/white_deckpicker_top_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_top_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_deckpicker_top_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_deckpicker_top_pressed.9.png diff --git a/res/drawable-hdpi/white_dialog_divider.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_dialog_divider.9.png similarity index 100% rename from res/drawable-hdpi/white_dialog_divider.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_dialog_divider.9.png diff --git a/res/drawable-hdpi/white_list_selector_background_focused.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_list_selector_background_focused.9.png similarity index 100% rename from res/drawable-hdpi/white_list_selector_background_focused.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_list_selector_background_focused.9.png diff --git a/res/drawable-hdpi/white_list_selector_background_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_list_selector_background_pressed.9.png similarity index 100% rename from res/drawable-hdpi/white_list_selector_background_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_list_selector_background_pressed.9.png diff --git a/res/drawable-hdpi/white_listdivider.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_listdivider.9.png similarity index 100% rename from res/drawable-hdpi/white_listdivider.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_listdivider.9.png diff --git a/res/drawable-hdpi/white_next_time_separator.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_next_time_separator.9.png similarity index 100% rename from res/drawable-hdpi/white_next_time_separator.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_next_time_separator.9.png diff --git a/res/drawable-hdpi/white_popup_bottom_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_popup_bottom_bright.9.png similarity index 100% rename from res/drawable-hdpi/white_popup_bottom_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_popup_bottom_bright.9.png diff --git a/res/drawable-hdpi/white_popup_bottom_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_popup_bottom_medium.9.png similarity index 100% rename from res/drawable-hdpi/white_popup_bottom_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_popup_bottom_medium.9.png diff --git a/res/drawable-hdpi/white_popup_center_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_popup_center_bright.9.png similarity index 100% rename from res/drawable-hdpi/white_popup_center_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_popup_center_bright.9.png diff --git a/res/drawable-hdpi/white_popup_center_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_popup_center_medium.9.png similarity index 100% rename from res/drawable-hdpi/white_popup_center_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_popup_center_medium.9.png diff --git a/res/drawable-hdpi/white_popup_full_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_popup_full_bright.9.png similarity index 100% rename from res/drawable-hdpi/white_popup_full_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_popup_full_bright.9.png diff --git a/res/drawable-hdpi/white_popup_full_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_popup_full_medium.9.png similarity index 100% rename from res/drawable-hdpi/white_popup_full_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_popup_full_medium.9.png diff --git a/res/drawable-hdpi/white_popup_top_bright.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_popup_top_bright.9.png similarity index 100% rename from res/drawable-hdpi/white_popup_top_bright.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_popup_top_bright.9.png diff --git a/res/drawable-hdpi/white_popup_top_medium.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_popup_top_medium.9.png similarity index 100% rename from res/drawable-hdpi/white_popup_top_medium.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_popup_top_medium.9.png diff --git a/res/drawable-hdpi/white_textfield_default.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_textfield_default.9.png similarity index 100% rename from res/drawable-hdpi/white_textfield_default.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_textfield_default.9.png diff --git a/res/drawable-hdpi/white_textfield_disabled.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_textfield_disabled.9.png similarity index 100% rename from res/drawable-hdpi/white_textfield_disabled.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_textfield_disabled.9.png diff --git a/res/drawable-hdpi/white_textfield_disabled_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_textfield_disabled_selected.9.png similarity index 100% rename from res/drawable-hdpi/white_textfield_disabled_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_textfield_disabled_selected.9.png diff --git a/res/drawable-hdpi/white_textfield_dupe_default.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_textfield_dupe_default.9.png similarity index 100% rename from res/drawable-hdpi/white_textfield_dupe_default.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_textfield_dupe_default.9.png diff --git a/res/drawable-hdpi/white_textfield_dupe_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_textfield_dupe_selected.9.png similarity index 100% rename from res/drawable-hdpi/white_textfield_dupe_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_textfield_dupe_selected.9.png diff --git a/res/drawable-hdpi/white_textfield_selected.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_textfield_selected.9.png similarity index 100% rename from res/drawable-hdpi/white_textfield_selected.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_textfield_selected.9.png diff --git a/res/drawable-hdpi/white_textview.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_textview.9.png similarity index 100% rename from res/drawable-hdpi/white_textview.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_textview.9.png diff --git a/res/drawable-hdpi/white_textview_padding.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_textview_padding.9.png similarity index 100% rename from res/drawable-hdpi/white_textview_padding.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_textview_padding.9.png diff --git a/res/drawable-hdpi/white_toast_frame.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_toast_frame.9.png similarity index 100% rename from res/drawable-hdpi/white_toast_frame.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_toast_frame.9.png diff --git a/res/drawable-hdpi/white_wallpaper.9.png b/AnkiDroid/src/main/res/drawable-hdpi/white_wallpaper.9.png similarity index 100% rename from res/drawable-hdpi/white_wallpaper.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/white_wallpaper.9.png diff --git a/res/drawable-hdpi/widget_bg_medium.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_bg_medium.png similarity index 100% rename from res/drawable-hdpi/widget_bg_medium.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_bg_medium.png diff --git a/res/drawable-hdpi/widget_bg_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_bg_normal.9.png similarity index 100% rename from res/drawable-hdpi/widget_bg_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_bg_normal.9.png diff --git a/res/drawable-hdpi/widget_bg_number.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_bg_number.9.png similarity index 100% rename from res/drawable-hdpi/widget_bg_number.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_bg_number.9.png diff --git a/res/drawable-hdpi/widget_bg_small.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_bg_small.png similarity index 100% rename from res/drawable-hdpi/widget_bg_small.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_bg_small.png diff --git a/res/drawable-hdpi/widget_bg_small_finish.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_bg_small_finish.png similarity index 100% rename from res/drawable-hdpi/widget_bg_small_finish.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_bg_small_finish.png diff --git a/res/drawable-hdpi/widget_bg_time.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_bg_time.9.png similarity index 100% rename from res/drawable-hdpi/widget_bg_time.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_bg_time.9.png diff --git a/res/drawable-hdpi/widget_big_add.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_add.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_add.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_add.9.png diff --git a/res/drawable-hdpi/widget_big_bg.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_bg.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_bg.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_bg.9.png diff --git a/res/drawable-hdpi/widget_big_button_bottom_right_pressed.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_button_bottom_right_pressed.png similarity index 100% rename from res/drawable-hdpi/widget_big_button_bottom_right_pressed.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_button_bottom_right_pressed.png diff --git a/res/drawable-hdpi/widget_big_button_normal.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_button_normal.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_button_normal.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_button_normal.9.png diff --git a/res/drawable-hdpi/widget_big_button_pressed.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_button_pressed.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_button_pressed.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_button_pressed.9.png diff --git a/res/drawable-hdpi/widget_big_button_star.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_button_star.png similarity index 100% rename from res/drawable-hdpi/widget_big_button_star.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_button_star.png diff --git a/res/drawable-hdpi/widget_big_closedeck.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_closedeck.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_closedeck.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_closedeck.9.png diff --git a/res/drawable-hdpi/widget_big_deckfield.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_deckfield.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_deckfield.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_deckfield.9.png diff --git a/res/drawable-hdpi/widget_big_ease1.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease1.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_ease1.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease1.9.png diff --git a/res/drawable-hdpi/widget_big_ease2.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease2.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_ease2.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease2.9.png diff --git a/res/drawable-hdpi/widget_big_ease2_rec.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease2_rec.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_ease2_rec.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease2_rec.9.png diff --git a/res/drawable-hdpi/widget_big_ease3.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease3.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_ease3.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease3.9.png diff --git a/res/drawable-hdpi/widget_big_ease3_rec.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease3_rec.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_ease3_rec.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease3_rec.9.png diff --git a/res/drawable-hdpi/widget_big_ease4.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease4.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_ease4.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_ease4.9.png diff --git a/res/drawable-hdpi/widget_big_eta.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_eta.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_eta.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_eta.9.png diff --git a/res/drawable-hdpi/widget_big_flipcard.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_flipcard.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_flipcard.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_flipcard.9.png diff --git a/res/drawable-hdpi/widget_big_help.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_help.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_help.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_help.9.png diff --git a/res/drawable-hdpi/widget_big_opendeck.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_opendeck.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_opendeck.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_opendeck.9.png diff --git a/res/drawable-hdpi/widget_big_progress_bg.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_progress_bg.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_progress_bg.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_progress_bg.9.png diff --git a/res/drawable-hdpi/widget_big_star.9.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_big_star.9.png similarity index 100% rename from res/drawable-hdpi/widget_big_star.9.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_big_star.9.png diff --git a/res/drawable-hdpi/widget_left_arrow.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_left_arrow.png similarity index 100% rename from res/drawable-hdpi/widget_left_arrow.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_left_arrow.png diff --git a/res/drawable-hdpi/widget_left_arrow_disabled.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_left_arrow_disabled.png similarity index 100% rename from res/drawable-hdpi/widget_left_arrow_disabled.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_left_arrow_disabled.png diff --git a/res/drawable-hdpi/widget_right_arrow.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_right_arrow.png similarity index 100% rename from res/drawable-hdpi/widget_right_arrow.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_right_arrow.png diff --git a/res/drawable-hdpi/widget_right_arrow_disabled.png b/AnkiDroid/src/main/res/drawable-hdpi/widget_right_arrow_disabled.png similarity index 100% rename from res/drawable-hdpi/widget_right_arrow_disabled.png rename to AnkiDroid/src/main/res/drawable-hdpi/widget_right_arrow_disabled.png diff --git a/res/drawable-ldpi/anki.png b/AnkiDroid/src/main/res/drawable-ldpi/anki.png similarity index 100% rename from res/drawable-ldpi/anki.png rename to AnkiDroid/src/main/res/drawable-ldpi/anki.png diff --git a/res/drawable-ldpi/blue_btn_check_off.png b/AnkiDroid/src/main/res/drawable-ldpi/blue_btn_check_off.png similarity index 100% rename from res/drawable-ldpi/blue_btn_check_off.png rename to AnkiDroid/src/main/res/drawable-ldpi/blue_btn_check_off.png diff --git a/res/drawable-ldpi/blue_btn_check_on.png b/AnkiDroid/src/main/res/drawable-ldpi/blue_btn_check_on.png similarity index 100% rename from res/drawable-ldpi/blue_btn_check_on.png rename to AnkiDroid/src/main/res/drawable-ldpi/blue_btn_check_on.png diff --git a/res/drawable-ldpi/ic_menu_night.png b/AnkiDroid/src/main/res/drawable-ldpi/ic_menu_night.png similarity index 100% rename from res/drawable-ldpi/ic_menu_night.png rename to AnkiDroid/src/main/res/drawable-ldpi/ic_menu_night.png diff --git a/res/drawable-ldpi/ic_menu_night_checked.png b/AnkiDroid/src/main/res/drawable-ldpi/ic_menu_night_checked.png similarity index 100% rename from res/drawable-ldpi/ic_menu_night_checked.png rename to AnkiDroid/src/main/res/drawable-ldpi/ic_menu_night_checked.png diff --git a/res/drawable-ldpi/ic_menu_view.png b/AnkiDroid/src/main/res/drawable-ldpi/ic_menu_view.png similarity index 100% rename from res/drawable-ldpi/ic_menu_view.png rename to AnkiDroid/src/main/res/drawable-ldpi/ic_menu_view.png diff --git a/res/drawable-mdpi/android_std_content_discard.png b/AnkiDroid/src/main/res/drawable-mdpi/android_std_content_discard.png similarity index 100% rename from res/drawable-mdpi/android_std_content_discard.png rename to AnkiDroid/src/main/res/drawable-mdpi/android_std_content_discard.png diff --git a/res/drawable-mdpi/anki.png b/AnkiDroid/src/main/res/drawable-mdpi/anki.png similarity index 100% rename from res/drawable-mdpi/anki.png rename to AnkiDroid/src/main/res/drawable-mdpi/anki.png diff --git a/res/drawable-mdpi/av_pause.png b/AnkiDroid/src/main/res/drawable-mdpi/av_pause.png similarity index 100% rename from res/drawable-mdpi/av_pause.png rename to AnkiDroid/src/main/res/drawable-mdpi/av_pause.png diff --git a/res/drawable-mdpi/av_play.png b/AnkiDroid/src/main/res/drawable-mdpi/av_play.png similarity index 100% rename from res/drawable-mdpi/av_play.png rename to AnkiDroid/src/main/res/drawable-mdpi/av_play.png diff --git a/res/drawable-mdpi/av_rec.png b/AnkiDroid/src/main/res/drawable-mdpi/av_rec.png similarity index 100% rename from res/drawable-mdpi/av_rec.png rename to AnkiDroid/src/main/res/drawable-mdpi/av_rec.png diff --git a/res/drawable-mdpi/av_rec_stop.png b/AnkiDroid/src/main/res/drawable-mdpi/av_rec_stop.png similarity index 100% rename from res/drawable-mdpi/av_rec_stop.png rename to AnkiDroid/src/main/res/drawable-mdpi/av_rec_stop.png diff --git a/res/drawable-mdpi/av_stop.png b/AnkiDroid/src/main/res/drawable-mdpi/av_stop.png similarity index 100% rename from res/drawable-mdpi/av_stop.png rename to AnkiDroid/src/main/res/drawable-mdpi/av_stop.png diff --git a/res/drawable-mdpi/blue_bg_cardbrowser_marked_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_marked_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_cardbrowser_marked_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_marked_normal.9.png diff --git a/res/drawable-mdpi/blue_bg_cardbrowser_marked_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_marked_pressed.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_cardbrowser_marked_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_marked_pressed.9.png diff --git a/res/drawable-mdpi/blue_bg_cardbrowser_marked_suspended_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_marked_suspended_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_cardbrowser_marked_suspended_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_marked_suspended_normal.9.png diff --git a/res/drawable-mdpi/blue_bg_cardbrowser_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_cardbrowser_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_normal.9.png diff --git a/res/drawable-mdpi/blue_bg_cardbrowser_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_pressed.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_cardbrowser_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_pressed.9.png diff --git a/res/drawable-mdpi/blue_bg_cardbrowser_selected.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_selected.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_cardbrowser_selected.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_selected.9.png diff --git a/res/drawable-mdpi/blue_bg_cardbrowser_suspended_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_suspended_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_cardbrowser_suspended_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_cardbrowser_suspended_normal.9.png diff --git a/res/drawable-mdpi/blue_bg_deckpicker_focused.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_deckpicker_focused.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_deckpicker_focused.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_deckpicker_focused.9.png diff --git a/res/drawable-mdpi/blue_bg_deckpicker_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_deckpicker_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_deckpicker_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_deckpicker_normal.9.png diff --git a/res/drawable-mdpi/blue_bg_deckpicker_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_deckpicker_pressed.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_deckpicker_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_deckpicker_pressed.9.png diff --git a/res/drawable-mdpi/blue_bg_deckpicker_selected.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_deckpicker_selected.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_deckpicker_selected.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_deckpicker_selected.9.png diff --git a/res/drawable-mdpi/blue_bg_webview.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_webview.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_webview.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_webview.9.png diff --git a/res/drawable-mdpi/blue_bg_webview_night.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_bg_webview_night.9.png similarity index 100% rename from res/drawable-mdpi/blue_bg_webview_night.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_bg_webview_night.9.png diff --git a/res/drawable-mdpi/blue_btn_check_off.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_check_off.png similarity index 100% rename from res/drawable-mdpi/blue_btn_check_off.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_check_off.png diff --git a/res/drawable-mdpi/blue_btn_check_on.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_check_on.png similarity index 100% rename from res/drawable-mdpi/blue_btn_check_on.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_check_on.png diff --git a/res/drawable-mdpi/blue_btn_default_disabled.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_disabled.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_default_disabled.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_disabled.9.png diff --git a/res/drawable-mdpi/blue_btn_default_disabled_night.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_disabled_night.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_default_disabled_night.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_disabled_night.9.png diff --git a/res/drawable-mdpi/blue_btn_default_focused.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_focused.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_default_focused.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_focused.9.png diff --git a/res/drawable-mdpi/blue_btn_default_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_default_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_normal.9.png diff --git a/res/drawable-mdpi/blue_btn_default_normal_night.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_normal_night.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_default_normal_night.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_normal_night.9.png diff --git a/res/drawable-mdpi/blue_btn_default_normal_night_focused.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_normal_night_focused.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_default_normal_night_focused.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_normal_night_focused.9.png diff --git a/res/drawable-mdpi/blue_btn_default_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_pressed.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_default_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_default_pressed.9.png diff --git a/res/drawable-mdpi/blue_btn_dropdown_disabled.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_dropdown_disabled.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_dropdown_disabled.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_dropdown_disabled.9.png diff --git a/res/drawable-mdpi/blue_btn_dropdown_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_dropdown_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_dropdown_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_dropdown_normal.9.png diff --git a/res/drawable-mdpi/blue_btn_dropdown_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_dropdown_pressed.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_dropdown_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_dropdown_pressed.9.png diff --git a/res/drawable-mdpi/blue_btn_radio_off.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_radio_off.png similarity index 100% rename from res/drawable-mdpi/blue_btn_radio_off.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_radio_off.png diff --git a/res/drawable-mdpi/blue_btn_radio_on.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_radio_on.png similarity index 100% rename from res/drawable-mdpi/blue_btn_radio_on.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_radio_on.png diff --git a/res/drawable-mdpi/blue_btn_small_disabled.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_small_disabled.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_small_disabled.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_small_disabled.9.png diff --git a/res/drawable-mdpi/blue_btn_small_focused.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_small_focused.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_small_focused.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_small_focused.9.png diff --git a/res/drawable-mdpi/blue_btn_small_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_small_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_small_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_small_normal.9.png diff --git a/res/drawable-mdpi/blue_btn_small_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_small_pressed.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_small_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_small_pressed.9.png diff --git a/res/drawable-mdpi/blue_btn_toggle_off.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_toggle_off.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_toggle_off.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_toggle_off.9.png diff --git a/res/drawable-mdpi/blue_btn_toggle_on.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_btn_toggle_on.9.png similarity index 100% rename from res/drawable-mdpi/blue_btn_toggle_on.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_btn_toggle_on.9.png diff --git a/res/drawable-mdpi/blue_divider_horizontal_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_divider_horizontal_bright.9.png similarity index 100% rename from res/drawable-mdpi/blue_divider_horizontal_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_divider_horizontal_bright.9.png diff --git a/res/drawable-mdpi/blue_list_selector_background_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_list_selector_background_normal.9.png similarity index 100% rename from res/drawable-mdpi/blue_list_selector_background_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_list_selector_background_normal.9.png diff --git a/res/drawable-mdpi/blue_list_selector_background_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_list_selector_background_pressed.9.png similarity index 100% rename from res/drawable-mdpi/blue_list_selector_background_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_list_selector_background_pressed.9.png diff --git a/res/drawable-mdpi/blue_menu_background.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_menu_background.9.png similarity index 100% rename from res/drawable-mdpi/blue_menu_background.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_menu_background.9.png diff --git a/res/drawable-mdpi/blue_menu_background_fill_parent_width.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_menu_background_fill_parent_width.9.png similarity index 100% rename from res/drawable-mdpi/blue_menu_background_fill_parent_width.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_menu_background_fill_parent_width.9.png diff --git a/res/drawable-mdpi/blue_popup_bottom_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_bottom_bright.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_bottom_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_bottom_bright.9.png diff --git a/res/drawable-mdpi/blue_popup_bottom_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_bottom_dark.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_bottom_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_bottom_dark.9.png diff --git a/res/drawable-mdpi/blue_popup_bottom_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_bottom_medium.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_bottom_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_bottom_medium.9.png diff --git a/res/drawable-mdpi/blue_popup_center_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_center_bright.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_center_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_center_bright.9.png diff --git a/res/drawable-mdpi/blue_popup_center_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_center_dark.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_center_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_center_dark.9.png diff --git a/res/drawable-mdpi/blue_popup_center_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_center_medium.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_center_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_center_medium.9.png diff --git a/res/drawable-mdpi/blue_popup_full_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_full_bright.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_full_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_full_bright.9.png diff --git a/res/drawable-mdpi/blue_popup_full_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_full_dark.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_full_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_full_dark.9.png diff --git a/res/drawable-mdpi/blue_popup_full_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_full_medium.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_full_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_full_medium.9.png diff --git a/res/drawable-mdpi/blue_popup_top_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_top_bright.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_top_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_top_bright.9.png diff --git a/res/drawable-mdpi/blue_popup_top_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_top_dark.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_top_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_top_dark.9.png diff --git a/res/drawable-mdpi/blue_popup_top_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_popup_top_medium.9.png similarity index 100% rename from res/drawable-mdpi/blue_popup_top_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_popup_top_medium.9.png diff --git a/res/drawable-mdpi/blue_textfield_default.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_textfield_default.9.png similarity index 100% rename from res/drawable-mdpi/blue_textfield_default.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_textfield_default.9.png diff --git a/res/drawable-mdpi/blue_textfield_disabled.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_textfield_disabled.9.png similarity index 100% rename from res/drawable-mdpi/blue_textfield_disabled.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_textfield_disabled.9.png diff --git a/res/drawable-mdpi/blue_textfield_disabled_selected.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_textfield_disabled_selected.9.png similarity index 100% rename from res/drawable-mdpi/blue_textfield_disabled_selected.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_textfield_disabled_selected.9.png diff --git a/res/drawable-mdpi/blue_textfield_selected.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_textfield_selected.9.png similarity index 100% rename from res/drawable-mdpi/blue_textfield_selected.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_textfield_selected.9.png diff --git a/res/drawable-mdpi/blue_textview.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_textview.9.png similarity index 100% rename from res/drawable-mdpi/blue_textview.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_textview.9.png diff --git a/res/drawable-mdpi/blue_title.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_title.9.png similarity index 100% rename from res/drawable-mdpi/blue_title.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_title.9.png diff --git a/res/drawable-mdpi/blue_toast_frame.9.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_toast_frame.9.png similarity index 100% rename from res/drawable-mdpi/blue_toast_frame.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_toast_frame.9.png diff --git a/res/drawable-mdpi/blue_wallpaper.png b/AnkiDroid/src/main/res/drawable-mdpi/blue_wallpaper.png similarity index 100% rename from res/drawable-mdpi/blue_wallpaper.png rename to AnkiDroid/src/main/res/drawable-mdpi/blue_wallpaper.png diff --git a/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png similarity index 100% rename from res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/btn_keyboard_key_fulltrans_normal.9.png diff --git a/res/drawable-mdpi/content_picture.png b/AnkiDroid/src/main/res/drawable-mdpi/content_picture.png similarity index 100% rename from res/drawable-mdpi/content_picture.png rename to AnkiDroid/src/main/res/drawable-mdpi/content_picture.png diff --git a/res/drawable-mdpi/deckpicker_cram.png b/AnkiDroid/src/main/res/drawable-mdpi/deckpicker_cram.png similarity index 100% rename from res/drawable-mdpi/deckpicker_cram.png rename to AnkiDroid/src/main/res/drawable-mdpi/deckpicker_cram.png diff --git a/res/drawable-mdpi/deckpicker_sync.png b/AnkiDroid/src/main/res/drawable-mdpi/deckpicker_sync.png similarity index 100% rename from res/drawable-mdpi/deckpicker_sync.png rename to AnkiDroid/src/main/res/drawable-mdpi/deckpicker_sync.png diff --git a/res/drawable-mdpi/device_access_mic.png b/AnkiDroid/src/main/res/drawable-mdpi/device_access_mic.png similarity index 100% rename from res/drawable-mdpi/device_access_mic.png rename to AnkiDroid/src/main/res/drawable-mdpi/device_access_mic.png diff --git a/res/drawable-mdpi/divider_horizontal_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/divider_horizontal_bright.9.png similarity index 100% rename from res/drawable-mdpi/divider_horizontal_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/divider_horizontal_bright.9.png diff --git a/res/drawable-mdpi/divider_horizontal_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/divider_horizontal_dark.9.png similarity index 100% rename from res/drawable-mdpi/divider_horizontal_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/divider_horizontal_dark.9.png diff --git a/res/drawable-mdpi/drawer_shadow.9.png b/AnkiDroid/src/main/res/drawable-mdpi/drawer_shadow.9.png similarity index 100% rename from res/drawable-mdpi/drawer_shadow.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/drawer_shadow.9.png diff --git a/res/drawable-mdpi/flat_textview.9.png b/AnkiDroid/src/main/res/drawable-mdpi/flat_textview.9.png similarity index 100% rename from res/drawable-mdpi/flat_textview.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/flat_textview.9.png diff --git a/res/drawable-mdpi/flat_title.9.png b/AnkiDroid/src/main/res/drawable-mdpi/flat_title.9.png similarity index 100% rename from res/drawable-mdpi/flat_title.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/flat_title.9.png diff --git a/res/drawable-mdpi/flat_wallpaper.png b/AnkiDroid/src/main/res/drawable-mdpi/flat_wallpaper.png similarity index 100% rename from res/drawable-mdpi/flat_wallpaper.png rename to AnkiDroid/src/main/res/drawable-mdpi/flat_wallpaper.png diff --git a/res/drawable-mdpi/help.png b/AnkiDroid/src/main/res/drawable-mdpi/help.png similarity index 100% rename from res/drawable-mdpi/help.png rename to AnkiDroid/src/main/res/drawable-mdpi/help.png diff --git a/res/drawable-mdpi/help_inverted.png b/AnkiDroid/src/main/res/drawable-mdpi/help_inverted.png similarity index 100% rename from res/drawable-mdpi/help_inverted.png rename to AnkiDroid/src/main/res/drawable-mdpi/help_inverted.png diff --git a/res/drawable-mdpi/ic_action_accept.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_accept.png similarity index 100% rename from res/drawable-mdpi/ic_action_accept.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_accept.png diff --git a/res/drawable-mdpi/ic_action_action_settings.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_action_settings.png similarity index 100% rename from res/drawable-mdpi/ic_action_action_settings.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_action_settings.png diff --git a/res/drawable-mdpi/ic_action_camera.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_camera.png similarity index 100% rename from res/drawable-mdpi/ic_action_camera.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_camera.png diff --git a/res/drawable-mdpi/ic_action_cancel.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_cancel.png similarity index 100% rename from res/drawable-mdpi/ic_action_cancel.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_cancel.png diff --git a/res/drawable-mdpi/ic_action_cancel_dark.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_cancel_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_cancel_dark.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_cancel_dark.png diff --git a/res/drawable-mdpi/ic_action_email.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_email.png similarity index 100% rename from res/drawable-mdpi/ic_action_email.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_email.png diff --git a/res/drawable-mdpi/ic_action_help.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_help.png similarity index 100% rename from res/drawable-mdpi/ic_action_help.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_help.png diff --git a/res/drawable-mdpi/ic_action_import_export.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_import_export.png similarity index 100% rename from res/drawable-mdpi/ic_action_import_export.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_import_export.png diff --git a/res/drawable-mdpi/ic_action_mic.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_mic.png similarity index 100% rename from res/drawable-mdpi/ic_action_mic.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_mic.png diff --git a/res/drawable-mdpi/ic_action_replay.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_replay.png similarity index 100% rename from res/drawable-mdpi/ic_action_replay.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_replay.png diff --git a/res/drawable-mdpi/ic_action_replay_dark.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_replay_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_replay_dark.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_replay_dark.png diff --git a/res/drawable-mdpi/ic_action_search.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_search.png similarity index 100% rename from res/drawable-mdpi/ic_action_search.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_search.png diff --git a/res/drawable-mdpi/ic_action_settings.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_settings.png similarity index 100% rename from res/drawable-mdpi/ic_action_settings.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_settings.png diff --git a/res/drawable-mdpi/ic_action_storage.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_storage.png similarity index 100% rename from res/drawable-mdpi/ic_action_storage.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_storage.png diff --git a/res/drawable-mdpi/ic_action_time.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_time.png similarity index 100% rename from res/drawable-mdpi/ic_action_time.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_time.png diff --git a/res/drawable-mdpi/ic_action_whiteboard_enable_dark.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_whiteboard_enable_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_whiteboard_enable_dark.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_whiteboard_enable_dark.png diff --git a/res/drawable-mdpi/ic_action_whiteboard_enable_dark_disabled.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_whiteboard_enable_dark_disabled.png similarity index 100% rename from res/drawable-mdpi/ic_action_whiteboard_enable_dark_disabled.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_whiteboard_enable_dark_disabled.png diff --git a/res/drawable-mdpi/ic_action_whiteboard_enable_light.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_whiteboard_enable_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_whiteboard_enable_light.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_whiteboard_enable_light.png diff --git a/res/drawable-mdpi/ic_action_whiteboard_enable_light_disabled.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_action_whiteboard_enable_light_disabled.png similarity index 100% rename from res/drawable-mdpi/ic_action_whiteboard_enable_light_disabled.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_action_whiteboard_enable_light_disabled.png diff --git a/res/drawable-mdpi/ic_addtag_normal.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_addtag_normal.png similarity index 100% rename from res/drawable-mdpi/ic_addtag_normal.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_addtag_normal.png diff --git a/res/drawable-mdpi/ic_addtag_pressed.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_addtag_pressed.png similarity index 100% rename from res/drawable-mdpi/ic_addtag_pressed.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_addtag_pressed.png diff --git a/res/drawable-mdpi/ic_circle_normal.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_circle_normal.png similarity index 100% rename from res/drawable-mdpi/ic_circle_normal.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_circle_normal.png diff --git a/res/drawable-mdpi/ic_circle_pressed.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_circle_pressed.png similarity index 100% rename from res/drawable-mdpi/ic_circle_pressed.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_circle_pressed.png diff --git a/res/drawable-mdpi/ic_dialog_alert.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_dialog_alert.png similarity index 100% rename from res/drawable-mdpi/ic_dialog_alert.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_dialog_alert.png diff --git a/res/drawable-mdpi/ic_dialog_info.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_dialog_info.png similarity index 100% rename from res/drawable-mdpi/ic_dialog_info.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_dialog_info.png diff --git a/res/drawable-mdpi/ic_drawer.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_drawer.png similarity index 100% rename from res/drawable-mdpi/ic_drawer.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_drawer.png diff --git a/res/drawable-mdpi/ic_lookup_normal.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_lookup_normal.png similarity index 100% rename from res/drawable-mdpi/ic_lookup_normal.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_lookup_normal.png diff --git a/res/drawable-mdpi/ic_lookup_pressed.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_lookup_pressed.png similarity index 100% rename from res/drawable-mdpi/ic_lookup_pressed.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_lookup_pressed.png diff --git a/res/drawable-mdpi/ic_media.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_media.png similarity index 100% rename from res/drawable-mdpi/ic_media.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_media.png diff --git a/res/drawable-mdpi/ic_menu_add.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_add.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-mdpi/ic_menu_add.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_add.png diff --git a/res/drawable-mdpi/ic_menu_always_landscape_portrait.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_always_landscape_portrait.png similarity index 100% rename from res/drawable-mdpi/ic_menu_always_landscape_portrait.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_always_landscape_portrait.png diff --git a/res/drawable-mdpi/ic_menu_archive.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_archive.png similarity index 100% rename from res/drawable-mdpi/ic_menu_archive.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_archive.png diff --git a/res/drawable-mdpi/ic_menu_close_clear_cancel.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel.png similarity index 100% rename from res/drawable-mdpi/ic_menu_close_clear_cancel.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_close_clear_cancel.png diff --git a/res/drawable-mdpi/ic_menu_compose.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_compose.png similarity index 100% rename from res/drawable-mdpi/ic_menu_compose.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_compose.png diff --git a/res/drawable-mdpi/ic_menu_delete.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_delete.png similarity index 100% rename from res/drawable-mdpi/ic_menu_delete.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_delete.png diff --git a/res/drawable-mdpi/ic_menu_download.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_download.png similarity index 100% rename from res/drawable-mdpi/ic_menu_download.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_download.png diff --git a/res/drawable-mdpi/ic_menu_edit.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_edit.png similarity index 100% rename from res/drawable-mdpi/ic_menu_edit.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_edit.png diff --git a/res/drawable-mdpi/ic_menu_help.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_help.png similarity index 100% rename from res/drawable-mdpi/ic_menu_help.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_help.png diff --git a/res/drawable-mdpi/ic_menu_home.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_home.png similarity index 100% rename from res/drawable-mdpi/ic_menu_home.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_home.png diff --git a/res/drawable-mdpi/ic_menu_info_details.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_info_details.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-mdpi/ic_menu_info_details.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_info_details.png diff --git a/res/drawable-mdpi/ic_menu_manage.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_manage.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-mdpi/ic_menu_manage.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_manage.png diff --git a/res/drawable-mdpi/ic_menu_mark.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_mark.png similarity index 100% rename from res/drawable-mdpi/ic_menu_mark.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_mark.png diff --git a/res/drawable-mdpi/ic_menu_marked.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_marked.png similarity index 100% rename from res/drawable-mdpi/ic_menu_marked.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_marked.png diff --git a/res/drawable-mdpi/ic_menu_night.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_night.png similarity index 100% rename from res/drawable-mdpi/ic_menu_night.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_night.png diff --git a/res/drawable-mdpi/ic_menu_night_checked.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_night_checked.png similarity index 100% rename from res/drawable-mdpi/ic_menu_night_checked.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_night_checked.png diff --git a/res/drawable-mdpi/ic_menu_preferences.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_preferences.png similarity index 100% rename from res/drawable-mdpi/ic_menu_preferences.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_preferences.png diff --git a/res/drawable-mdpi/ic_menu_refresh.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-mdpi/ic_menu_refresh.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_refresh.png diff --git a/res/drawable-mdpi/ic_menu_revert.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_revert.png similarity index 100% rename from res/drawable-mdpi/ic_menu_revert.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_revert.png diff --git a/res/drawable-mdpi/ic_menu_revert_disabled.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_revert_disabled.png similarity index 100% rename from res/drawable-mdpi/ic_menu_revert_disabled.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_revert_disabled.png diff --git a/res/drawable-mdpi/ic_menu_search.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_search.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-mdpi/ic_menu_search.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_search.png diff --git a/res/drawable-mdpi/ic_menu_send.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_send.png similarity index 100% rename from res/drawable-mdpi/ic_menu_send.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_send.png diff --git a/res/drawable-mdpi/ic_menu_sort_by_size.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_sort_by_size.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-mdpi/ic_menu_sort_by_size.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_sort_by_size.png diff --git a/res/drawable-mdpi/ic_menu_star_off.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_star_off.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-mdpi/ic_menu_star_off.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_star_off.png diff --git a/res/drawable-mdpi/ic_menu_star_on.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_star_on.png old mode 100755 new mode 100644 similarity index 100% rename from res/drawable-mdpi/ic_menu_star_on.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_star_on.png diff --git a/res/drawable-mdpi/ic_menu_statistics.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_statistics.png similarity index 100% rename from res/drawable-mdpi/ic_menu_statistics.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_statistics.png diff --git a/res/drawable-mdpi/ic_menu_stop.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_stop.png similarity index 100% rename from res/drawable-mdpi/ic_menu_stop.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_stop.png diff --git a/res/drawable-mdpi/ic_menu_upload.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_upload.png similarity index 100% rename from res/drawable-mdpi/ic_menu_upload.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_upload.png diff --git a/res/drawable-mdpi/ic_menu_view.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_view.png similarity index 100% rename from res/drawable-mdpi/ic_menu_view.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_view.png diff --git a/res/drawable-mdpi/ic_menu_zeemote.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_zeemote.png similarity index 100% rename from res/drawable-mdpi/ic_menu_zeemote.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_zeemote.png diff --git a/res/drawable-mdpi/ic_menu_zoom_in.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_zoom_in.png similarity index 100% rename from res/drawable-mdpi/ic_menu_zoom_in.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_zoom_in.png diff --git a/res/drawable-mdpi/ic_menu_zoom_out.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_menu_zoom_out.png similarity index 100% rename from res/drawable-mdpi/ic_menu_zoom_out.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_menu_zoom_out.png diff --git a/res/drawable-mdpi/ic_start.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_start.png similarity index 100% rename from res/drawable-mdpi/ic_start.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_start.png diff --git a/res/drawable-mdpi/ic_stat_notify.png b/AnkiDroid/src/main/res/drawable-mdpi/ic_stat_notify.png similarity index 100% rename from res/drawable-mdpi/ic_stat_notify.png rename to AnkiDroid/src/main/res/drawable-mdpi/ic_stat_notify.png diff --git a/res/drawable-mdpi/inline_play_button.png b/AnkiDroid/src/main/res/drawable-mdpi/inline_play_button.png similarity index 100% rename from res/drawable-mdpi/inline_play_button.png rename to AnkiDroid/src/main/res/drawable-mdpi/inline_play_button.png diff --git a/res/drawable-mdpi/menu_add.png b/AnkiDroid/src/main/res/drawable-mdpi/menu_add.png similarity index 100% rename from res/drawable-mdpi/menu_add.png rename to AnkiDroid/src/main/res/drawable-mdpi/menu_add.png diff --git a/res/drawable-mdpi/menu_help.png b/AnkiDroid/src/main/res/drawable-mdpi/menu_help.png similarity index 100% rename from res/drawable-mdpi/menu_help.png rename to AnkiDroid/src/main/res/drawable-mdpi/menu_help.png diff --git a/res/drawable-mdpi/menu_statistics.png b/AnkiDroid/src/main/res/drawable-mdpi/menu_statistics.png similarity index 100% rename from res/drawable-mdpi/menu_statistics.png rename to AnkiDroid/src/main/res/drawable-mdpi/menu_statistics.png diff --git a/res/drawable-mdpi/menu_sync.png b/AnkiDroid/src/main/res/drawable-mdpi/menu_sync.png similarity index 100% rename from res/drawable-mdpi/menu_sync.png rename to AnkiDroid/src/main/res/drawable-mdpi/menu_sync.png diff --git a/res/drawable-mdpi/popup_bottom_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_bottom_bright.9.png similarity index 100% rename from res/drawable-mdpi/popup_bottom_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_bottom_bright.9.png diff --git a/res/drawable-mdpi/popup_bottom_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_bottom_dark.9.png similarity index 100% rename from res/drawable-mdpi/popup_bottom_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_bottom_dark.9.png diff --git a/res/drawable-mdpi/popup_bottom_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_bottom_medium.9.png similarity index 100% rename from res/drawable-mdpi/popup_bottom_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_bottom_medium.9.png diff --git a/res/drawable-mdpi/popup_center_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_center_bright.9.png similarity index 100% rename from res/drawable-mdpi/popup_center_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_center_bright.9.png diff --git a/res/drawable-mdpi/popup_center_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_center_dark.9.png similarity index 100% rename from res/drawable-mdpi/popup_center_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_center_dark.9.png diff --git a/res/drawable-mdpi/popup_center_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_center_medium.9.png similarity index 100% rename from res/drawable-mdpi/popup_center_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_center_medium.9.png diff --git a/res/drawable-mdpi/popup_full_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_full_bright.9.png similarity index 100% rename from res/drawable-mdpi/popup_full_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_full_bright.9.png diff --git a/res/drawable-mdpi/popup_full_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_full_dark.9.png similarity index 100% rename from res/drawable-mdpi/popup_full_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_full_dark.9.png diff --git a/res/drawable-mdpi/popup_top_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_top_bright.9.png similarity index 100% rename from res/drawable-mdpi/popup_top_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_top_bright.9.png diff --git a/res/drawable-mdpi/popup_top_dark.9.png b/AnkiDroid/src/main/res/drawable-mdpi/popup_top_dark.9.png similarity index 100% rename from res/drawable-mdpi/popup_top_dark.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/popup_top_dark.9.png diff --git a/res/drawable-mdpi/progress_bigwidget_primary.9.png b/AnkiDroid/src/main/res/drawable-mdpi/progress_bigwidget_primary.9.png similarity index 100% rename from res/drawable-mdpi/progress_bigwidget_primary.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/progress_bigwidget_primary.9.png diff --git a/res/drawable-mdpi/progress_widget_primary.9.png b/AnkiDroid/src/main/res/drawable-mdpi/progress_widget_primary.9.png similarity index 100% rename from res/drawable-mdpi/progress_widget_primary.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/progress_widget_primary.9.png diff --git a/res/drawable-mdpi/spinner_inner.png b/AnkiDroid/src/main/res/drawable-mdpi/spinner_inner.png similarity index 100% rename from res/drawable-mdpi/spinner_inner.png rename to AnkiDroid/src/main/res/drawable-mdpi/spinner_inner.png diff --git a/res/drawable-mdpi/spinner_outer.png b/AnkiDroid/src/main/res/drawable-mdpi/spinner_outer.png similarity index 100% rename from res/drawable-mdpi/spinner_outer.png rename to AnkiDroid/src/main/res/drawable-mdpi/spinner_outer.png diff --git a/res/drawable-mdpi/spinner_white_inner.png b/AnkiDroid/src/main/res/drawable-mdpi/spinner_white_inner.png similarity index 100% rename from res/drawable-mdpi/spinner_white_inner.png rename to AnkiDroid/src/main/res/drawable-mdpi/spinner_white_inner.png diff --git a/res/drawable-mdpi/spinner_white_outer.png b/AnkiDroid/src/main/res/drawable-mdpi/spinner_white_outer.png similarity index 100% rename from res/drawable-mdpi/spinner_white_outer.png rename to AnkiDroid/src/main/res/drawable-mdpi/spinner_white_outer.png diff --git a/res/drawable-mdpi/studyoptions_add.png b/AnkiDroid/src/main/res/drawable-mdpi/studyoptions_add.png similarity index 100% rename from res/drawable-mdpi/studyoptions_add.png rename to AnkiDroid/src/main/res/drawable-mdpi/studyoptions_add.png diff --git a/res/drawable-mdpi/studyoptions_opts.png b/AnkiDroid/src/main/res/drawable-mdpi/studyoptions_opts.png similarity index 100% rename from res/drawable-mdpi/studyoptions_opts.png rename to AnkiDroid/src/main/res/drawable-mdpi/studyoptions_opts.png diff --git a/res/drawable-mdpi/text.png b/AnkiDroid/src/main/res/drawable-mdpi/text.png similarity index 100% rename from res/drawable-mdpi/text.png rename to AnkiDroid/src/main/res/drawable-mdpi/text.png diff --git a/res/drawable-mdpi/white_bg_cardbrowser_marked_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_marked_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_cardbrowser_marked_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_marked_normal.9.png diff --git a/res/drawable-mdpi/white_bg_cardbrowser_marked_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_marked_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_cardbrowser_marked_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_marked_pressed.9.png diff --git a/res/drawable-mdpi/white_bg_cardbrowser_marked_suspended_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_marked_suspended_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_cardbrowser_marked_suspended_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_marked_suspended_normal.9.png diff --git a/res/drawable-mdpi/white_bg_cardbrowser_marked_suspended_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_marked_suspended_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_cardbrowser_marked_suspended_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_marked_suspended_pressed.9.png diff --git a/res/drawable-mdpi/white_bg_cardbrowser_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_cardbrowser_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_normal.9.png diff --git a/res/drawable-mdpi/white_bg_cardbrowser_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_cardbrowser_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_pressed.9.png diff --git a/res/drawable-mdpi/white_bg_cardbrowser_suspended_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_suspended_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_cardbrowser_suspended_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_suspended_normal.9.png diff --git a/res/drawable-mdpi/white_bg_cardbrowser_suspended_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_suspended_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_cardbrowser_suspended_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_cardbrowser_suspended_pressed.9.png diff --git a/res/drawable-mdpi/white_bg_webview.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_webview.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_webview.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_webview.9.png diff --git a/res/drawable-mdpi/white_bg_webview_night.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_bg_webview_night.9.png similarity index 100% rename from res/drawable-mdpi/white_bg_webview_night.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_bg_webview_night.9.png diff --git a/res/drawable-mdpi/white_btn_check_on.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_check_on.png similarity index 100% rename from res/drawable-mdpi/white_btn_check_on.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_check_on.png diff --git a/res/drawable-mdpi/white_btn_default_disabled.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_default_disabled.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_default_disabled.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_default_disabled.9.png diff --git a/res/drawable-mdpi/white_btn_default_focused.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_default_focused.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_default_focused.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_default_focused.9.png diff --git a/res/drawable-mdpi/white_btn_default_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_default_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_default_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_default_normal.9.png diff --git a/res/drawable-mdpi/white_btn_default_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_default_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_default_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_default_pressed.9.png diff --git a/res/drawable-mdpi/white_btn_radio_on.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_radio_on.png similarity index 100% rename from res/drawable-mdpi/white_btn_radio_on.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_radio_on.png diff --git a/res/drawable-mdpi/white_btn_small_disabled.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_disabled.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_small_disabled.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_disabled.9.png diff --git a/res/drawable-mdpi/white_btn_small_focused.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_focused.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_small_focused.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_focused.9.png diff --git a/res/drawable-mdpi/white_btn_small_night_disabled.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_disabled.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_small_night_disabled.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_disabled.9.png diff --git a/res/drawable-mdpi/white_btn_small_night_focused.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_focused.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_small_night_focused.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_focused.9.png diff --git a/res/drawable-mdpi/white_btn_small_night_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_small_night_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_normal.9.png diff --git a/res/drawable-mdpi/white_btn_small_night_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_small_night_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_pressed.9.png diff --git a/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_selected.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_selected.9.png new file mode 100644 index 0000000000..be228f6b24 Binary files /dev/null and b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_night_selected.9.png differ diff --git a/res/drawable-mdpi/white_btn_small_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_small_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_normal.9.png diff --git a/res/drawable-mdpi/white_btn_small_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_small_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_small_pressed.9.png diff --git a/res/drawable-mdpi/white_btn_toggle_on.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_btn_toggle_on.9.png similarity index 100% rename from res/drawable-mdpi/white_btn_toggle_on.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_btn_toggle_on.9.png diff --git a/res/drawable-mdpi/white_deckpicker_bottom_activated.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_bottom_activated.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_bottom_activated.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_bottom_activated.9.png diff --git a/res/drawable-mdpi/white_deckpicker_bottom_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_bottom_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_bottom_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_bottom_normal.9.png diff --git a/res/drawable-mdpi/white_deckpicker_bottom_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_bottom_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_bottom_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_bottom_pressed.9.png diff --git a/res/drawable-mdpi/white_deckpicker_center_activated.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_center_activated.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_center_activated.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_center_activated.9.png diff --git a/res/drawable-mdpi/white_deckpicker_center_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_center_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_center_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_center_normal.9.png diff --git a/res/drawable-mdpi/white_deckpicker_center_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_center_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_center_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_center_pressed.9.png diff --git a/res/drawable-mdpi/white_deckpicker_full_activated.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_full_activated.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_full_activated.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_full_activated.9.png diff --git a/res/drawable-mdpi/white_deckpicker_full_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_full_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_full_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_full_normal.9.png diff --git a/res/drawable-mdpi/white_deckpicker_full_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_full_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_full_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_full_pressed.9.png diff --git a/res/drawable-mdpi/white_deckpicker_lv_background.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_lv_background.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_lv_background.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_lv_background.9.png diff --git a/res/drawable-mdpi/white_deckpicker_separator.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_separator.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_separator.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_separator.9.png diff --git a/res/drawable-mdpi/white_deckpicker_top_activated.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_top_activated.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_top_activated.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_top_activated.9.png diff --git a/res/drawable-mdpi/white_deckpicker_top_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_top_normal.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_top_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_top_normal.9.png diff --git a/res/drawable-mdpi/white_deckpicker_top_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_top_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_deckpicker_top_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_deckpicker_top_pressed.9.png diff --git a/res/drawable-mdpi/white_dialog_divider.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_dialog_divider.9.png similarity index 100% rename from res/drawable-mdpi/white_dialog_divider.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_dialog_divider.9.png diff --git a/res/drawable-mdpi/white_list_selector_background_focused.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_list_selector_background_focused.9.png similarity index 100% rename from res/drawable-mdpi/white_list_selector_background_focused.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_list_selector_background_focused.9.png diff --git a/res/drawable-mdpi/white_list_selector_background_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_list_selector_background_pressed.9.png similarity index 100% rename from res/drawable-mdpi/white_list_selector_background_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_list_selector_background_pressed.9.png diff --git a/res/drawable-mdpi/white_listdivider.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_listdivider.9.png similarity index 100% rename from res/drawable-mdpi/white_listdivider.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_listdivider.9.png diff --git a/res/drawable-mdpi/white_next_time_separator.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_next_time_separator.9.png similarity index 100% rename from res/drawable-mdpi/white_next_time_separator.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_next_time_separator.9.png diff --git a/res/drawable-mdpi/white_popup_bottom_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_popup_bottom_bright.9.png similarity index 100% rename from res/drawable-mdpi/white_popup_bottom_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_popup_bottom_bright.9.png diff --git a/res/drawable-mdpi/white_popup_bottom_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_popup_bottom_medium.9.png similarity index 100% rename from res/drawable-mdpi/white_popup_bottom_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_popup_bottom_medium.9.png diff --git a/res/drawable-mdpi/white_popup_center_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_popup_center_bright.9.png similarity index 100% rename from res/drawable-mdpi/white_popup_center_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_popup_center_bright.9.png diff --git a/res/drawable-mdpi/white_popup_center_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_popup_center_medium.9.png similarity index 100% rename from res/drawable-mdpi/white_popup_center_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_popup_center_medium.9.png diff --git a/res/drawable-mdpi/white_popup_full_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_popup_full_bright.9.png similarity index 100% rename from res/drawable-mdpi/white_popup_full_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_popup_full_bright.9.png diff --git a/res/drawable-mdpi/white_popup_full_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_popup_full_medium.9.png similarity index 100% rename from res/drawable-mdpi/white_popup_full_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_popup_full_medium.9.png diff --git a/res/drawable-mdpi/white_popup_top_bright.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_popup_top_bright.9.png similarity index 100% rename from res/drawable-mdpi/white_popup_top_bright.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_popup_top_bright.9.png diff --git a/res/drawable-mdpi/white_popup_top_medium.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_popup_top_medium.9.png similarity index 100% rename from res/drawable-mdpi/white_popup_top_medium.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_popup_top_medium.9.png diff --git a/res/drawable-mdpi/white_textfield_default.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_textfield_default.9.png similarity index 100% rename from res/drawable-mdpi/white_textfield_default.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_textfield_default.9.png diff --git a/res/drawable-mdpi/white_textfield_disabled.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_textfield_disabled.9.png similarity index 100% rename from res/drawable-mdpi/white_textfield_disabled.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_textfield_disabled.9.png diff --git a/res/drawable-mdpi/white_textfield_disabled_selected.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_textfield_disabled_selected.9.png similarity index 100% rename from res/drawable-mdpi/white_textfield_disabled_selected.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_textfield_disabled_selected.9.png diff --git a/res/drawable-mdpi/white_textfield_dupe_default.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_textfield_dupe_default.9.png similarity index 100% rename from res/drawable-mdpi/white_textfield_dupe_default.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_textfield_dupe_default.9.png diff --git a/res/drawable-mdpi/white_textfield_dupe_selected.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_textfield_dupe_selected.9.png similarity index 100% rename from res/drawable-mdpi/white_textfield_dupe_selected.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_textfield_dupe_selected.9.png diff --git a/res/drawable-mdpi/white_textfield_selected.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_textfield_selected.9.png similarity index 100% rename from res/drawable-mdpi/white_textfield_selected.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_textfield_selected.9.png diff --git a/res/drawable-mdpi/white_textview.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_textview.9.png similarity index 100% rename from res/drawable-mdpi/white_textview.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_textview.9.png diff --git a/res/drawable-mdpi/white_textview_padding.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_textview_padding.9.png similarity index 100% rename from res/drawable-mdpi/white_textview_padding.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_textview_padding.9.png diff --git a/res/drawable-mdpi/white_toast_frame.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_toast_frame.9.png similarity index 100% rename from res/drawable-mdpi/white_toast_frame.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_toast_frame.9.png diff --git a/res/drawable-mdpi/white_wallpaper.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_wallpaper.9.png similarity index 100% rename from res/drawable-mdpi/white_wallpaper.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_wallpaper.9.png diff --git a/res/drawable-mdpi/white_wallpaper_deckpicker_fragments.9.png b/AnkiDroid/src/main/res/drawable-mdpi/white_wallpaper_deckpicker_fragments.9.png similarity index 100% rename from res/drawable-mdpi/white_wallpaper_deckpicker_fragments.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/white_wallpaper_deckpicker_fragments.9.png diff --git a/res/drawable-mdpi/widget_bg_medium.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_bg_medium.png similarity index 100% rename from res/drawable-mdpi/widget_bg_medium.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_bg_medium.png diff --git a/res/drawable-mdpi/widget_bg_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_bg_normal.9.png similarity index 100% rename from res/drawable-mdpi/widget_bg_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_bg_normal.9.png diff --git a/res/drawable-mdpi/widget_bg_number.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_bg_number.9.png similarity index 100% rename from res/drawable-mdpi/widget_bg_number.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_bg_number.9.png diff --git a/res/drawable-mdpi/widget_bg_small.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_bg_small.png similarity index 100% rename from res/drawable-mdpi/widget_bg_small.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_bg_small.png diff --git a/res/drawable-mdpi/widget_bg_small_finish.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_bg_small_finish.png similarity index 100% rename from res/drawable-mdpi/widget_bg_small_finish.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_bg_small_finish.png diff --git a/res/drawable-mdpi/widget_bg_time.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_bg_time.9.png similarity index 100% rename from res/drawable-mdpi/widget_bg_time.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_bg_time.9.png diff --git a/res/drawable-mdpi/widget_big_add.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_add.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_add.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_add.9.png diff --git a/res/drawable-mdpi/widget_big_bg.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_bg.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_bg.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_bg.9.png diff --git a/res/drawable-mdpi/widget_big_button_bottom_right_pressed.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_button_bottom_right_pressed.png similarity index 100% rename from res/drawable-mdpi/widget_big_button_bottom_right_pressed.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_button_bottom_right_pressed.png diff --git a/res/drawable-mdpi/widget_big_button_normal.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_button_normal.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_button_normal.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_button_normal.9.png diff --git a/res/drawable-mdpi/widget_big_button_pressed.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_button_pressed.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_button_pressed.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_button_pressed.9.png diff --git a/res/drawable-mdpi/widget_big_button_star.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_button_star.png similarity index 100% rename from res/drawable-mdpi/widget_big_button_star.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_button_star.png diff --git a/res/drawable-mdpi/widget_big_closedeck.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_closedeck.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_closedeck.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_closedeck.9.png diff --git a/res/drawable-mdpi/widget_big_deckfield.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_deckfield.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_deckfield.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_deckfield.9.png diff --git a/res/drawable-mdpi/widget_big_ease1.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease1.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_ease1.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease1.9.png diff --git a/res/drawable-mdpi/widget_big_ease2.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease2.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_ease2.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease2.9.png diff --git a/res/drawable-mdpi/widget_big_ease2_rec.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease2_rec.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_ease2_rec.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease2_rec.9.png diff --git a/res/drawable-mdpi/widget_big_ease3.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease3.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_ease3.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease3.9.png diff --git a/res/drawable-mdpi/widget_big_ease3_rec.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease3_rec.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_ease3_rec.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease3_rec.9.png diff --git a/res/drawable-mdpi/widget_big_ease4.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease4.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_ease4.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_ease4.9.png diff --git a/res/drawable-mdpi/widget_big_eta.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_eta.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_eta.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_eta.9.png diff --git a/res/drawable-mdpi/widget_big_flipcard.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_flipcard.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_flipcard.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_flipcard.9.png diff --git a/res/drawable-mdpi/widget_big_help.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_help.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_help.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_help.9.png diff --git a/res/drawable-mdpi/widget_big_opendeck.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_opendeck.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_opendeck.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_opendeck.9.png diff --git a/res/drawable-mdpi/widget_big_progress_bg.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_progress_bg.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_progress_bg.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_progress_bg.9.png diff --git a/res/drawable-mdpi/widget_big_star.9.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_big_star.9.png similarity index 100% rename from res/drawable-mdpi/widget_big_star.9.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_big_star.9.png diff --git a/res/drawable-mdpi/widget_left_arrow.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_left_arrow.png similarity index 100% rename from res/drawable-mdpi/widget_left_arrow.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_left_arrow.png diff --git a/res/drawable-mdpi/widget_left_arrow_disabled.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_left_arrow_disabled.png similarity index 100% rename from res/drawable-mdpi/widget_left_arrow_disabled.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_left_arrow_disabled.png diff --git a/res/drawable-mdpi/widget_right_arrow.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_right_arrow.png similarity index 100% rename from res/drawable-mdpi/widget_right_arrow.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_right_arrow.png diff --git a/res/drawable-mdpi/widget_right_arrow_disabled.png b/AnkiDroid/src/main/res/drawable-mdpi/widget_right_arrow_disabled.png similarity index 100% rename from res/drawable-mdpi/widget_right_arrow_disabled.png rename to AnkiDroid/src/main/res/drawable-mdpi/widget_right_arrow_disabled.png diff --git a/res/drawable-xhdpi/android_std_content_discard.png b/AnkiDroid/src/main/res/drawable-xhdpi/android_std_content_discard.png similarity index 100% rename from res/drawable-xhdpi/android_std_content_discard.png rename to AnkiDroid/src/main/res/drawable-xhdpi/android_std_content_discard.png diff --git a/res/drawable-xhdpi/anki.png b/AnkiDroid/src/main/res/drawable-xhdpi/anki.png similarity index 100% rename from res/drawable-xhdpi/anki.png rename to AnkiDroid/src/main/res/drawable-xhdpi/anki.png diff --git a/res/drawable-xhdpi/av_pause.png b/AnkiDroid/src/main/res/drawable-xhdpi/av_pause.png similarity index 100% rename from res/drawable-xhdpi/av_pause.png rename to AnkiDroid/src/main/res/drawable-xhdpi/av_pause.png diff --git a/res/drawable-xhdpi/av_play.png b/AnkiDroid/src/main/res/drawable-xhdpi/av_play.png similarity index 100% rename from res/drawable-xhdpi/av_play.png rename to AnkiDroid/src/main/res/drawable-xhdpi/av_play.png diff --git a/res/drawable-xhdpi/av_rec.png b/AnkiDroid/src/main/res/drawable-xhdpi/av_rec.png similarity index 100% rename from res/drawable-xhdpi/av_rec.png rename to AnkiDroid/src/main/res/drawable-xhdpi/av_rec.png diff --git a/res/drawable-xhdpi/av_rec_stop.png b/AnkiDroid/src/main/res/drawable-xhdpi/av_rec_stop.png similarity index 100% rename from res/drawable-xhdpi/av_rec_stop.png rename to AnkiDroid/src/main/res/drawable-xhdpi/av_rec_stop.png diff --git a/res/drawable-xhdpi/av_stop.png b/AnkiDroid/src/main/res/drawable-xhdpi/av_stop.png similarity index 100% rename from res/drawable-xhdpi/av_stop.png rename to AnkiDroid/src/main/res/drawable-xhdpi/av_stop.png diff --git a/res/drawable-xhdpi/content_picture.png b/AnkiDroid/src/main/res/drawable-xhdpi/content_picture.png similarity index 100% rename from res/drawable-xhdpi/content_picture.png rename to AnkiDroid/src/main/res/drawable-xhdpi/content_picture.png diff --git a/res/drawable-xhdpi/deckpicker_load_bg.xml b/AnkiDroid/src/main/res/drawable-xhdpi/deckpicker_load_bg.xml similarity index 100% rename from res/drawable-xhdpi/deckpicker_load_bg.xml rename to AnkiDroid/src/main/res/drawable-xhdpi/deckpicker_load_bg.xml diff --git a/res/drawable-xhdpi/deckpicker_load_bg_big.xml b/AnkiDroid/src/main/res/drawable-xhdpi/deckpicker_load_bg_big.xml similarity index 100% rename from res/drawable-xhdpi/deckpicker_load_bg_big.xml rename to AnkiDroid/src/main/res/drawable-xhdpi/deckpicker_load_bg_big.xml diff --git a/res/drawable-xhdpi/device_access_mic.png b/AnkiDroid/src/main/res/drawable-xhdpi/device_access_mic.png similarity index 100% rename from res/drawable-xhdpi/device_access_mic.png rename to AnkiDroid/src/main/res/drawable-xhdpi/device_access_mic.png diff --git a/res/drawable-xhdpi/drawer_shadow.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/drawer_shadow.9.png similarity index 100% rename from res/drawable-xhdpi/drawer_shadow.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/drawer_shadow.9.png diff --git a/res/drawable-xhdpi/ic_action_accept.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_accept.png similarity index 100% rename from res/drawable-xhdpi/ic_action_accept.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_accept.png diff --git a/res/drawable-xhdpi/ic_action_action_settings.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_action_settings.png similarity index 100% rename from res/drawable-xhdpi/ic_action_action_settings.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_action_settings.png diff --git a/res/drawable-xhdpi/ic_action_camera.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_camera.png similarity index 100% rename from res/drawable-xhdpi/ic_action_camera.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_camera.png diff --git a/res/drawable-xhdpi/ic_action_cancel.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_cancel.png similarity index 100% rename from res/drawable-xhdpi/ic_action_cancel.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_cancel.png diff --git a/res/drawable-xhdpi/ic_action_cancel_dark.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_cancel_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_cancel_dark.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_cancel_dark.png diff --git a/res/drawable-xhdpi/ic_action_email.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_email.png similarity index 100% rename from res/drawable-xhdpi/ic_action_email.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_email.png diff --git a/res/drawable-xhdpi/ic_action_help.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_help.png similarity index 100% rename from res/drawable-xhdpi/ic_action_help.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_help.png diff --git a/res/drawable-xhdpi/ic_action_import_export.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_import_export.png similarity index 100% rename from res/drawable-xhdpi/ic_action_import_export.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_import_export.png diff --git a/res/drawable-xhdpi/ic_action_mic.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_mic.png similarity index 100% rename from res/drawable-xhdpi/ic_action_mic.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_mic.png diff --git a/res/drawable-xhdpi/ic_action_replay.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_replay.png similarity index 100% rename from res/drawable-xhdpi/ic_action_replay.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_replay.png diff --git a/res/drawable-xhdpi/ic_action_replay_dark.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_replay_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_replay_dark.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_replay_dark.png diff --git a/res/drawable-xhdpi/ic_action_search.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_search.png similarity index 100% rename from res/drawable-xhdpi/ic_action_search.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_search.png diff --git a/res/drawable-xhdpi/ic_action_settings.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_settings.png similarity index 100% rename from res/drawable-xhdpi/ic_action_settings.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_settings.png diff --git a/res/drawable-xhdpi/ic_action_storage.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_storage.png similarity index 100% rename from res/drawable-xhdpi/ic_action_storage.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_storage.png diff --git a/res/drawable-xhdpi/ic_action_time.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_time.png similarity index 100% rename from res/drawable-xhdpi/ic_action_time.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_time.png diff --git a/res/drawable-xhdpi/ic_action_whiteboard_enable_dark.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_whiteboard_enable_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_whiteboard_enable_dark.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_whiteboard_enable_dark.png diff --git a/res/drawable-xhdpi/ic_action_whiteboard_enable_dark_disabled.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_whiteboard_enable_dark_disabled.png similarity index 100% rename from res/drawable-xhdpi/ic_action_whiteboard_enable_dark_disabled.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_whiteboard_enable_dark_disabled.png diff --git a/res/drawable-xhdpi/ic_action_whiteboard_enable_light.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_whiteboard_enable_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_whiteboard_enable_light.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_whiteboard_enable_light.png diff --git a/res/drawable-xhdpi/ic_action_whiteboard_enable_light_disabled.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_action_whiteboard_enable_light_disabled.png similarity index 100% rename from res/drawable-xhdpi/ic_action_whiteboard_enable_light_disabled.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_action_whiteboard_enable_light_disabled.png diff --git a/res/drawable-xhdpi/ic_circle_normal.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_circle_normal.png similarity index 100% rename from res/drawable-xhdpi/ic_circle_normal.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_circle_normal.png diff --git a/res/drawable-xhdpi/ic_circle_pressed.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_circle_pressed.png similarity index 100% rename from res/drawable-xhdpi/ic_circle_pressed.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_circle_pressed.png diff --git a/res/drawable-xhdpi/ic_dialog_alert.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_dialog_alert.png similarity index 100% rename from res/drawable-xhdpi/ic_dialog_alert.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_dialog_alert.png diff --git a/res/drawable-xhdpi/ic_dialog_info.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_dialog_info.png similarity index 100% rename from res/drawable-xhdpi/ic_dialog_info.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_dialog_info.png diff --git a/res/drawable-xhdpi/ic_drawer.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_drawer.png similarity index 100% rename from res/drawable-xhdpi/ic_drawer.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_drawer.png diff --git a/res/drawable-xhdpi/ic_lookup_normal.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_lookup_normal.png similarity index 100% rename from res/drawable-xhdpi/ic_lookup_normal.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_lookup_normal.png diff --git a/res/drawable-xhdpi/ic_lookup_pressed.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_lookup_pressed.png similarity index 100% rename from res/drawable-xhdpi/ic_lookup_pressed.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_lookup_pressed.png diff --git a/res/drawable-xhdpi/ic_media.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_media.png similarity index 100% rename from res/drawable-xhdpi/ic_media.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_media.png diff --git a/res/drawable-xhdpi/ic_menu_add.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_add.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_add.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_add.png diff --git a/res/drawable-xhdpi/ic_menu_help.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_help.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_help.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_help.png diff --git a/res/drawable-xhdpi/ic_menu_mark.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_mark.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_mark.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_mark.png diff --git a/res/drawable-xhdpi/ic_menu_marked.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_marked.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_marked.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_marked.png diff --git a/res/drawable-xhdpi/ic_menu_night.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_night.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_night.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_night.png diff --git a/res/drawable-xhdpi/ic_menu_night_checked.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_night_checked.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_night_checked.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_night_checked.png diff --git a/res/drawable-xhdpi/ic_menu_refresh.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_refresh.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_refresh.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_refresh.png diff --git a/res/drawable-xhdpi/ic_menu_revert.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_revert.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_revert.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_revert.png diff --git a/res/drawable-xhdpi/ic_menu_revert_disabled.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_revert_disabled.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_revert_disabled.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_revert_disabled.png diff --git a/res/drawable-xhdpi/ic_menu_statistics.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_statistics.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_statistics.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_statistics.png diff --git a/res/drawable-xhdpi/ic_menu_view.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_view.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_view.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_menu_view.png diff --git a/res/drawable-xhdpi/ic_start.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_start.png similarity index 100% rename from res/drawable-xhdpi/ic_start.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_start.png diff --git a/res/drawable-xhdpi/ic_stat_notify.png b/AnkiDroid/src/main/res/drawable-xhdpi/ic_stat_notify.png similarity index 100% rename from res/drawable-xhdpi/ic_stat_notify.png rename to AnkiDroid/src/main/res/drawable-xhdpi/ic_stat_notify.png diff --git a/res/drawable-xhdpi/inline_play_button.png b/AnkiDroid/src/main/res/drawable-xhdpi/inline_play_button.png similarity index 100% rename from res/drawable-xhdpi/inline_play_button.png rename to AnkiDroid/src/main/res/drawable-xhdpi/inline_play_button.png diff --git a/res/drawable-xhdpi/spinner_inner.png b/AnkiDroid/src/main/res/drawable-xhdpi/spinner_inner.png similarity index 100% rename from res/drawable-xhdpi/spinner_inner.png rename to AnkiDroid/src/main/res/drawable-xhdpi/spinner_inner.png diff --git a/res/drawable-xhdpi/spinner_outer.png b/AnkiDroid/src/main/res/drawable-xhdpi/spinner_outer.png similarity index 100% rename from res/drawable-xhdpi/spinner_outer.png rename to AnkiDroid/src/main/res/drawable-xhdpi/spinner_outer.png diff --git a/res/drawable-xhdpi/spinner_white_inner.png b/AnkiDroid/src/main/res/drawable-xhdpi/spinner_white_inner.png similarity index 100% rename from res/drawable-xhdpi/spinner_white_inner.png rename to AnkiDroid/src/main/res/drawable-xhdpi/spinner_white_inner.png diff --git a/res/drawable-xhdpi/spinner_white_outer.png b/AnkiDroid/src/main/res/drawable-xhdpi/spinner_white_outer.png similarity index 100% rename from res/drawable-xhdpi/spinner_white_outer.png rename to AnkiDroid/src/main/res/drawable-xhdpi/spinner_white_outer.png diff --git a/res/drawable-xhdpi/studyoptions_add.png b/AnkiDroid/src/main/res/drawable-xhdpi/studyoptions_add.png similarity index 100% rename from res/drawable-xhdpi/studyoptions_add.png rename to AnkiDroid/src/main/res/drawable-xhdpi/studyoptions_add.png diff --git a/res/drawable-xhdpi/studyoptions_opts.png b/AnkiDroid/src/main/res/drawable-xhdpi/studyoptions_opts.png similarity index 100% rename from res/drawable-xhdpi/studyoptions_opts.png rename to AnkiDroid/src/main/res/drawable-xhdpi/studyoptions_opts.png diff --git a/res/drawable-xhdpi/text.png b/AnkiDroid/src/main/res/drawable-xhdpi/text.png similarity index 100% rename from res/drawable-xhdpi/text.png rename to AnkiDroid/src/main/res/drawable-xhdpi/text.png diff --git a/res/drawable-xhdpi/white_bg_deckpicker_selected.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_bg_deckpicker_selected.9.png similarity index 100% rename from res/drawable-xhdpi/white_bg_deckpicker_selected.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_bg_deckpicker_selected.9.png diff --git a/res/drawable-xhdpi/white_bg_webview.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_bg_webview.9.png similarity index 100% rename from res/drawable-xhdpi/white_bg_webview.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_bg_webview.9.png diff --git a/res/drawable-xhdpi/white_bg_webview_night.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_bg_webview_night.9.png similarity index 100% rename from res/drawable-xhdpi/white_bg_webview_night.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_bg_webview_night.9.png diff --git a/res/drawable-xhdpi/white_btn_default_disabled.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_default_disabled.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_default_disabled.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_default_disabled.9.png diff --git a/res/drawable-xhdpi/white_btn_default_focused.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_default_focused.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_default_focused.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_default_focused.9.png diff --git a/res/drawable-xhdpi/white_btn_default_normal.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_default_normal.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_default_normal.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_default_normal.9.png diff --git a/res/drawable-xhdpi/white_btn_default_pressed.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_default_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_default_pressed.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_default_pressed.9.png diff --git a/res/drawable-xhdpi/white_btn_small_disabled.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_disabled.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_small_disabled.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_disabled.9.png diff --git a/res/drawable-xhdpi/white_btn_small_focused.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_focused.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_small_focused.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_focused.9.png diff --git a/res/drawable-xhdpi/white_btn_small_night_disabled.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_night_disabled.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_small_night_disabled.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_night_disabled.9.png diff --git a/res/drawable-xhdpi/white_btn_small_night_focused.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_night_focused.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_small_night_focused.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_night_focused.9.png diff --git a/res/drawable-xhdpi/white_btn_small_night_normal.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_night_normal.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_small_night_normal.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_night_normal.9.png diff --git a/res/drawable-xhdpi/white_btn_small_night_pressed.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_night_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_small_night_pressed.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_night_pressed.9.png diff --git a/res/drawable-xhdpi/white_btn_small_normal.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_normal.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_small_normal.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_normal.9.png diff --git a/res/drawable-xhdpi/white_btn_small_pressed.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/white_btn_small_pressed.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_btn_small_pressed.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_bottom_normal.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_bottom_normal.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_bottom_normal.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_bottom_normal.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_bottom_pressed.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_bottom_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_bottom_pressed.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_bottom_pressed.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_center_normal.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_center_normal.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_center_normal.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_center_normal.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_center_pressed.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_center_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_center_pressed.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_center_pressed.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_full_normal.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_full_normal.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_full_normal.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_full_normal.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_full_pressed.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_full_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_full_pressed.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_full_pressed.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_lv_background.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_lv_background.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_lv_background.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_lv_background.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_top_normal.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_top_normal.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_top_normal.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_top_normal.9.png diff --git a/res/drawable-xhdpi/white_deckpicker_top_pressed.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_top_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/white_deckpicker_top_pressed.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_deckpicker_top_pressed.9.png diff --git a/res/drawable-xhdpi/white_dialog_divider.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_dialog_divider.9.png similarity index 100% rename from res/drawable-xhdpi/white_dialog_divider.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_dialog_divider.9.png diff --git a/res/drawable-xhdpi/white_listdivider.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_listdivider.9.png similarity index 100% rename from res/drawable-xhdpi/white_listdivider.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_listdivider.9.png diff --git a/res/drawable-xhdpi/white_next_time_separator.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_next_time_separator.9.png similarity index 100% rename from res/drawable-xhdpi/white_next_time_separator.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_next_time_separator.9.png diff --git a/res/drawable-xhdpi/white_popup_bottom_bright.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_popup_bottom_bright.9.png similarity index 100% rename from res/drawable-xhdpi/white_popup_bottom_bright.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_popup_bottom_bright.9.png diff --git a/res/drawable-xhdpi/white_popup_bottom_medium.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_popup_bottom_medium.9.png similarity index 100% rename from res/drawable-xhdpi/white_popup_bottom_medium.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_popup_bottom_medium.9.png diff --git a/res/drawable-xhdpi/white_popup_center_bright.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_popup_center_bright.9.png similarity index 100% rename from res/drawable-xhdpi/white_popup_center_bright.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_popup_center_bright.9.png diff --git a/res/drawable-xhdpi/white_popup_center_medium.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_popup_center_medium.9.png similarity index 100% rename from res/drawable-xhdpi/white_popup_center_medium.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_popup_center_medium.9.png diff --git a/res/drawable-xhdpi/white_popup_full_bright.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_popup_full_bright.9.png similarity index 100% rename from res/drawable-xhdpi/white_popup_full_bright.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_popup_full_bright.9.png diff --git a/res/drawable-xhdpi/white_popup_full_medium.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_popup_full_medium.9.png similarity index 100% rename from res/drawable-xhdpi/white_popup_full_medium.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_popup_full_medium.9.png diff --git a/res/drawable-xhdpi/white_popup_top_bright.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_popup_top_bright.9.png similarity index 100% rename from res/drawable-xhdpi/white_popup_top_bright.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_popup_top_bright.9.png diff --git a/res/drawable-xhdpi/white_popup_top_medium.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_popup_top_medium.9.png similarity index 100% rename from res/drawable-xhdpi/white_popup_top_medium.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_popup_top_medium.9.png diff --git a/res/drawable-xhdpi/white_textfield_default.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_default.9.png similarity index 100% rename from res/drawable-xhdpi/white_textfield_default.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_default.9.png diff --git a/res/drawable-xhdpi/white_textfield_disabled.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_disabled.9.png similarity index 100% rename from res/drawable-xhdpi/white_textfield_disabled.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_disabled.9.png diff --git a/res/drawable-xhdpi/white_textfield_disabled_selected.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_disabled_selected.9.png similarity index 100% rename from res/drawable-xhdpi/white_textfield_disabled_selected.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_disabled_selected.9.png diff --git a/res/drawable-xhdpi/white_textfield_dupe_default.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_dupe_default.9.png similarity index 100% rename from res/drawable-xhdpi/white_textfield_dupe_default.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_dupe_default.9.png diff --git a/res/drawable-xhdpi/white_textfield_dupe_selected.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_dupe_selected.9.png similarity index 100% rename from res/drawable-xhdpi/white_textfield_dupe_selected.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_dupe_selected.9.png diff --git a/res/drawable-xhdpi/white_textfield_selected.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_selected.9.png similarity index 100% rename from res/drawable-xhdpi/white_textfield_selected.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_textfield_selected.9.png diff --git a/res/drawable-xhdpi/white_textview.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_textview.9.png similarity index 100% rename from res/drawable-xhdpi/white_textview.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_textview.9.png diff --git a/res/drawable-xhdpi/white_textview_padding.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_textview_padding.9.png similarity index 100% rename from res/drawable-xhdpi/white_textview_padding.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_textview_padding.9.png diff --git a/res/drawable-xhdpi/white_wallpaper.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/white_wallpaper.9.png similarity index 100% rename from res/drawable-xhdpi/white_wallpaper.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/white_wallpaper.9.png diff --git a/res/drawable-xhdpi/widget_bg_number.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/widget_bg_number.9.png similarity index 100% rename from res/drawable-xhdpi/widget_bg_number.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/widget_bg_number.9.png diff --git a/res/drawable-xhdpi/widget_bg_small.png b/AnkiDroid/src/main/res/drawable-xhdpi/widget_bg_small.png similarity index 100% rename from res/drawable-xhdpi/widget_bg_small.png rename to AnkiDroid/src/main/res/drawable-xhdpi/widget_bg_small.png diff --git a/res/drawable-xhdpi/widget_bg_small_finish.png b/AnkiDroid/src/main/res/drawable-xhdpi/widget_bg_small_finish.png similarity index 100% rename from res/drawable-xhdpi/widget_bg_small_finish.png rename to AnkiDroid/src/main/res/drawable-xhdpi/widget_bg_small_finish.png diff --git a/res/drawable-xhdpi/widget_bg_time.9.png b/AnkiDroid/src/main/res/drawable-xhdpi/widget_bg_time.9.png similarity index 100% rename from res/drawable-xhdpi/widget_bg_time.9.png rename to AnkiDroid/src/main/res/drawable-xhdpi/widget_bg_time.9.png diff --git a/res/drawable-xxhdpi/drawer_shadow.9.png b/AnkiDroid/src/main/res/drawable-xxhdpi/drawer_shadow.9.png similarity index 100% rename from res/drawable-xxhdpi/drawer_shadow.9.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/drawer_shadow.9.png diff --git a/res/drawable-xxhdpi/ic_action_accept.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_accept.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_accept.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_accept.png diff --git a/res/drawable-xxhdpi/ic_action_action_settings.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_action_settings.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_action_settings.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_action_settings.png diff --git a/res/drawable-xxhdpi/ic_action_camera.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_camera.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_camera.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_camera.png diff --git a/res/drawable-xxhdpi/ic_action_cancel.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_cancel.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_cancel.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_cancel.png diff --git a/res/drawable-xxhdpi/ic_action_cancel_dark.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_cancel_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_cancel_dark.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_cancel_dark.png diff --git a/res/drawable-xxhdpi/ic_action_email.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_email.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_email.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_email.png diff --git a/res/drawable-xxhdpi/ic_action_help.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_help.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_help.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_help.png diff --git a/res/drawable-xxhdpi/ic_action_mic.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_mic.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_mic.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_mic.png diff --git a/res/drawable-xxhdpi/ic_action_replay.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_replay.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_replay.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_replay.png diff --git a/res/drawable-xxhdpi/ic_action_replay_dark.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_replay_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_replay_dark.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_replay_dark.png diff --git a/res/drawable-xxhdpi/ic_action_search.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_search.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_search.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_search.png diff --git a/res/drawable-xxhdpi/ic_action_settings.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_settings.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_settings.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_settings.png diff --git a/res/drawable-xxhdpi/ic_action_storage.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_storage.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_storage.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_storage.png diff --git a/res/drawable-xxhdpi/ic_action_time.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_time.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_time.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_time.png diff --git a/res/drawable-xxhdpi/ic_action_whiteboard_enable_dark.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_whiteboard_enable_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_whiteboard_enable_dark.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_whiteboard_enable_dark.png diff --git a/res/drawable-xxhdpi/ic_action_whiteboard_enable_dark_disabled.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_whiteboard_enable_dark_disabled.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_whiteboard_enable_dark_disabled.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_whiteboard_enable_dark_disabled.png diff --git a/res/drawable-xxhdpi/ic_action_whiteboard_enable_light.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_whiteboard_enable_light.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_whiteboard_enable_light.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_whiteboard_enable_light.png diff --git a/res/drawable-xxhdpi/ic_action_whiteboard_enable_light_disabled.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_whiteboard_enable_light_disabled.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_whiteboard_enable_light_disabled.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_action_whiteboard_enable_light_disabled.png diff --git a/res/drawable-xxhdpi/ic_drawer.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_drawer.png similarity index 100% rename from res/drawable-xxhdpi/ic_drawer.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_drawer.png diff --git a/res/drawable-xxhdpi/ic_media.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_media.png similarity index 100% rename from res/drawable-xxhdpi/ic_media.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_media.png diff --git a/res/drawable-xxhdpi/ic_menu_view.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_menu_view.png similarity index 100% rename from res/drawable-xxhdpi/ic_menu_view.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_menu_view.png diff --git a/res/drawable-xxhdpi/ic_stat_notify.png b/AnkiDroid/src/main/res/drawable-xxhdpi/ic_stat_notify.png similarity index 100% rename from res/drawable-xxhdpi/ic_stat_notify.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/ic_stat_notify.png diff --git a/res/drawable-xxhdpi/inline_play_button.png b/AnkiDroid/src/main/res/drawable-xxhdpi/inline_play_button.png similarity index 100% rename from res/drawable-xxhdpi/inline_play_button.png rename to AnkiDroid/src/main/res/drawable-xxhdpi/inline_play_button.png diff --git a/res/drawable/anki.png b/AnkiDroid/src/main/res/drawable/anki.png similarity index 100% rename from res/drawable/anki.png rename to AnkiDroid/src/main/res/drawable/anki.png diff --git a/res/drawable/blue_background.xml b/AnkiDroid/src/main/res/drawable/blue_background.xml similarity index 100% rename from res/drawable/blue_background.xml rename to AnkiDroid/src/main/res/drawable/blue_background.xml diff --git a/res/drawable/blue_bg_cardbrowser.xml b/AnkiDroid/src/main/res/drawable/blue_bg_cardbrowser.xml similarity index 100% rename from res/drawable/blue_bg_cardbrowser.xml rename to AnkiDroid/src/main/res/drawable/blue_bg_cardbrowser.xml diff --git a/res/drawable/blue_bg_cardbrowser_marked.xml b/AnkiDroid/src/main/res/drawable/blue_bg_cardbrowser_marked.xml similarity index 100% rename from res/drawable/blue_bg_cardbrowser_marked.xml rename to AnkiDroid/src/main/res/drawable/blue_bg_cardbrowser_marked.xml diff --git a/res/drawable/blue_bg_cardbrowser_marked_suspended.xml b/AnkiDroid/src/main/res/drawable/blue_bg_cardbrowser_marked_suspended.xml similarity index 100% rename from res/drawable/blue_bg_cardbrowser_marked_suspended.xml rename to AnkiDroid/src/main/res/drawable/blue_bg_cardbrowser_marked_suspended.xml diff --git a/res/drawable/blue_bg_cardbrowser_suspended.xml b/AnkiDroid/src/main/res/drawable/blue_bg_cardbrowser_suspended.xml similarity index 100% rename from res/drawable/blue_bg_cardbrowser_suspended.xml rename to AnkiDroid/src/main/res/drawable/blue_bg_cardbrowser_suspended.xml diff --git a/res/drawable/blue_bg_deckpicker.xml b/AnkiDroid/src/main/res/drawable/blue_bg_deckpicker.xml similarity index 100% rename from res/drawable/blue_bg_deckpicker.xml rename to AnkiDroid/src/main/res/drawable/blue_bg_deckpicker.xml diff --git a/res/drawable/blue_btn_check.xml b/AnkiDroid/src/main/res/drawable/blue_btn_check.xml similarity index 100% rename from res/drawable/blue_btn_check.xml rename to AnkiDroid/src/main/res/drawable/blue_btn_check.xml diff --git a/res/drawable/blue_btn_default.xml b/AnkiDroid/src/main/res/drawable/blue_btn_default.xml similarity index 100% rename from res/drawable/blue_btn_default.xml rename to AnkiDroid/src/main/res/drawable/blue_btn_default.xml diff --git a/res/drawable/blue_btn_dropdown.xml b/AnkiDroid/src/main/res/drawable/blue_btn_dropdown.xml similarity index 100% rename from res/drawable/blue_btn_dropdown.xml rename to AnkiDroid/src/main/res/drawable/blue_btn_dropdown.xml diff --git a/res/drawable/blue_btn_night.xml b/AnkiDroid/src/main/res/drawable/blue_btn_night.xml similarity index 100% rename from res/drawable/blue_btn_night.xml rename to AnkiDroid/src/main/res/drawable/blue_btn_night.xml diff --git a/res/drawable/blue_btn_radio.xml b/AnkiDroid/src/main/res/drawable/blue_btn_radio.xml similarity index 100% rename from res/drawable/blue_btn_radio.xml rename to AnkiDroid/src/main/res/drawable/blue_btn_radio.xml diff --git a/res/drawable/blue_btn_small.xml b/AnkiDroid/src/main/res/drawable/blue_btn_small.xml similarity index 100% rename from res/drawable/blue_btn_small.xml rename to AnkiDroid/src/main/res/drawable/blue_btn_small.xml diff --git a/res/drawable/blue_btn_toggle.xml b/AnkiDroid/src/main/res/drawable/blue_btn_toggle.xml similarity index 100% rename from res/drawable/blue_btn_toggle.xml rename to AnkiDroid/src/main/res/drawable/blue_btn_toggle.xml diff --git a/res/drawable/blue_btn_toggle_bg.xml b/AnkiDroid/src/main/res/drawable/blue_btn_toggle_bg.xml similarity index 100% rename from res/drawable/blue_btn_toggle_bg.xml rename to AnkiDroid/src/main/res/drawable/blue_btn_toggle_bg.xml diff --git a/res/drawable/blue_cardbrowser_list_selector.xml b/AnkiDroid/src/main/res/drawable/blue_cardbrowser_list_selector.xml similarity index 100% rename from res/drawable/blue_cardbrowser_list_selector.xml rename to AnkiDroid/src/main/res/drawable/blue_cardbrowser_list_selector.xml diff --git a/res/drawable/blue_deckpicker_list_selector.xml b/AnkiDroid/src/main/res/drawable/blue_deckpicker_list_selector.xml similarity index 100% rename from res/drawable/blue_deckpicker_list_selector.xml rename to AnkiDroid/src/main/res/drawable/blue_deckpicker_list_selector.xml diff --git a/res/drawable/blue_edit_text.xml b/AnkiDroid/src/main/res/drawable/blue_edit_text.xml similarity index 100% rename from res/drawable/blue_edit_text.xml rename to AnkiDroid/src/main/res/drawable/blue_edit_text.xml diff --git a/res/drawable/blue_list_selector_background.xml b/AnkiDroid/src/main/res/drawable/blue_list_selector_background.xml similarity index 100% rename from res/drawable/blue_list_selector_background.xml rename to AnkiDroid/src/main/res/drawable/blue_list_selector_background.xml diff --git a/res/drawable/border.xml b/AnkiDroid/src/main/res/drawable/border.xml similarity index 100% rename from res/drawable/border.xml rename to AnkiDroid/src/main/res/drawable/border.xml diff --git a/res/drawable/deckpicker_load_bg.xml b/AnkiDroid/src/main/res/drawable/deckpicker_load_bg.xml similarity index 100% rename from res/drawable/deckpicker_load_bg.xml rename to AnkiDroid/src/main/res/drawable/deckpicker_load_bg.xml diff --git a/res/drawable/deckpicker_load_bg_big.xml b/AnkiDroid/src/main/res/drawable/deckpicker_load_bg_big.xml similarity index 100% rename from res/drawable/deckpicker_load_bg_big.xml rename to AnkiDroid/src/main/res/drawable/deckpicker_load_bg_big.xml diff --git a/res/drawable/flat_background.xml b/AnkiDroid/src/main/res/drawable/flat_background.xml similarity index 100% rename from res/drawable/flat_background.xml rename to AnkiDroid/src/main/res/drawable/flat_background.xml diff --git a/res/drawable/ic_addtag.xml b/AnkiDroid/src/main/res/drawable/ic_addtag.xml similarity index 100% rename from res/drawable/ic_addtag.xml rename to AnkiDroid/src/main/res/drawable/ic_addtag.xml diff --git a/res/drawable/ic_lookup.xml b/AnkiDroid/src/main/res/drawable/ic_lookup.xml similarity index 100% rename from res/drawable/ic_lookup.xml rename to AnkiDroid/src/main/res/drawable/ic_lookup.xml diff --git a/res/drawable/progress_horizontal.xml b/AnkiDroid/src/main/res/drawable/progress_horizontal.xml similarity index 100% rename from res/drawable/progress_horizontal.xml rename to AnkiDroid/src/main/res/drawable/progress_horizontal.xml diff --git a/res/drawable/progress_widgetbig_horizontal.xml b/AnkiDroid/src/main/res/drawable/progress_widgetbig_horizontal.xml similarity index 100% rename from res/drawable/progress_widgetbig_horizontal.xml rename to AnkiDroid/src/main/res/drawable/progress_widgetbig_horizontal.xml diff --git a/res/drawable/white_bg_cardbrowser.xml b/AnkiDroid/src/main/res/drawable/white_bg_cardbrowser.xml similarity index 100% rename from res/drawable/white_bg_cardbrowser.xml rename to AnkiDroid/src/main/res/drawable/white_bg_cardbrowser.xml diff --git a/res/drawable/white_bg_cardbrowser_marked.xml b/AnkiDroid/src/main/res/drawable/white_bg_cardbrowser_marked.xml similarity index 100% rename from res/drawable/white_bg_cardbrowser_marked.xml rename to AnkiDroid/src/main/res/drawable/white_bg_cardbrowser_marked.xml diff --git a/res/drawable/white_bg_cardbrowser_marked_suspended.xml b/AnkiDroid/src/main/res/drawable/white_bg_cardbrowser_marked_suspended.xml similarity index 100% rename from res/drawable/white_bg_cardbrowser_marked_suspended.xml rename to AnkiDroid/src/main/res/drawable/white_bg_cardbrowser_marked_suspended.xml diff --git a/res/drawable/white_bg_cardbrowser_suspended.xml b/AnkiDroid/src/main/res/drawable/white_bg_cardbrowser_suspended.xml similarity index 100% rename from res/drawable/white_bg_cardbrowser_suspended.xml rename to AnkiDroid/src/main/res/drawable/white_bg_cardbrowser_suspended.xml diff --git a/res/drawable/white_btn_check.xml b/AnkiDroid/src/main/res/drawable/white_btn_check.xml similarity index 100% rename from res/drawable/white_btn_check.xml rename to AnkiDroid/src/main/res/drawable/white_btn_check.xml diff --git a/res/drawable/white_btn_default.xml b/AnkiDroid/src/main/res/drawable/white_btn_default.xml similarity index 100% rename from res/drawable/white_btn_default.xml rename to AnkiDroid/src/main/res/drawable/white_btn_default.xml diff --git a/res/drawable/white_btn_night.xml b/AnkiDroid/src/main/res/drawable/white_btn_night.xml similarity index 100% rename from res/drawable/white_btn_night.xml rename to AnkiDroid/src/main/res/drawable/white_btn_night.xml diff --git a/res/drawable/white_btn_radio.xml b/AnkiDroid/src/main/res/drawable/white_btn_radio.xml similarity index 100% rename from res/drawable/white_btn_radio.xml rename to AnkiDroid/src/main/res/drawable/white_btn_radio.xml diff --git a/res/drawable/white_btn_small.xml b/AnkiDroid/src/main/res/drawable/white_btn_small.xml similarity index 100% rename from res/drawable/white_btn_small.xml rename to AnkiDroid/src/main/res/drawable/white_btn_small.xml diff --git a/res/drawable/white_btn_toggle.xml b/AnkiDroid/src/main/res/drawable/white_btn_toggle.xml similarity index 100% rename from res/drawable/white_btn_toggle.xml rename to AnkiDroid/src/main/res/drawable/white_btn_toggle.xml diff --git a/res/drawable/white_btn_toggle_bg.xml b/AnkiDroid/src/main/res/drawable/white_btn_toggle_bg.xml similarity index 100% rename from res/drawable/white_btn_toggle_bg.xml rename to AnkiDroid/src/main/res/drawable/white_btn_toggle_bg.xml diff --git a/res/drawable/white_deckpicker_bottom.xml b/AnkiDroid/src/main/res/drawable/white_deckpicker_bottom.xml similarity index 100% rename from res/drawable/white_deckpicker_bottom.xml rename to AnkiDroid/src/main/res/drawable/white_deckpicker_bottom.xml diff --git a/res/drawable/white_deckpicker_center.xml b/AnkiDroid/src/main/res/drawable/white_deckpicker_center.xml similarity index 100% rename from res/drawable/white_deckpicker_center.xml rename to AnkiDroid/src/main/res/drawable/white_deckpicker_center.xml diff --git a/res/drawable/white_deckpicker_full.xml b/AnkiDroid/src/main/res/drawable/white_deckpicker_full.xml similarity index 100% rename from res/drawable/white_deckpicker_full.xml rename to AnkiDroid/src/main/res/drawable/white_deckpicker_full.xml diff --git a/res/drawable/white_deckpicker_list_selector.xml b/AnkiDroid/src/main/res/drawable/white_deckpicker_list_selector.xml similarity index 100% rename from res/drawable/white_deckpicker_list_selector.xml rename to AnkiDroid/src/main/res/drawable/white_deckpicker_list_selector.xml diff --git a/res/drawable/white_deckpicker_top.xml b/AnkiDroid/src/main/res/drawable/white_deckpicker_top.xml similarity index 100% rename from res/drawable/white_deckpicker_top.xml rename to AnkiDroid/src/main/res/drawable/white_deckpicker_top.xml diff --git a/res/drawable/white_edit_text.xml b/AnkiDroid/src/main/res/drawable/white_edit_text.xml similarity index 100% rename from res/drawable/white_edit_text.xml rename to AnkiDroid/src/main/res/drawable/white_edit_text.xml diff --git a/res/drawable/white_edit_text_dupe.xml b/AnkiDroid/src/main/res/drawable/white_edit_text_dupe.xml similarity index 100% rename from res/drawable/white_edit_text_dupe.xml rename to AnkiDroid/src/main/res/drawable/white_edit_text_dupe.xml diff --git a/res/drawable/white_list_selector_background.xml b/AnkiDroid/src/main/res/drawable/white_list_selector_background.xml similarity index 100% rename from res/drawable/white_list_selector_background.xml rename to AnkiDroid/src/main/res/drawable/white_list_selector_background.xml diff --git a/res/drawable/white_spinner.xml b/AnkiDroid/src/main/res/drawable/white_spinner.xml similarity index 100% rename from res/drawable/white_spinner.xml rename to AnkiDroid/src/main/res/drawable/white_spinner.xml diff --git a/res/drawable/white_white_spinner.xml b/AnkiDroid/src/main/res/drawable/white_white_spinner.xml similarity index 100% rename from res/drawable/white_white_spinner.xml rename to AnkiDroid/src/main/res/drawable/white_white_spinner.xml diff --git a/res/drawable/widget_big_button.xml b/AnkiDroid/src/main/res/drawable/widget_big_button.xml similarity index 100% rename from res/drawable/widget_big_button.xml rename to AnkiDroid/src/main/res/drawable/widget_big_button.xml diff --git a/res/drawable/widget_big_button_bottom_right.xml b/AnkiDroid/src/main/res/drawable/widget_big_button_bottom_right.xml similarity index 100% rename from res/drawable/widget_big_button_bottom_right.xml rename to AnkiDroid/src/main/res/drawable/widget_big_button_bottom_right.xml diff --git a/res/interpolator/accelerate_quad.xml b/AnkiDroid/src/main/res/interpolator/accelerate_quad.xml similarity index 100% rename from res/interpolator/accelerate_quad.xml rename to AnkiDroid/src/main/res/interpolator/accelerate_quad.xml diff --git a/res/interpolator/decelerate_cubic.xml b/AnkiDroid/src/main/res/interpolator/decelerate_cubic.xml similarity index 100% rename from res/interpolator/decelerate_cubic.xml rename to AnkiDroid/src/main/res/interpolator/decelerate_cubic.xml diff --git a/res/interpolator/decelerate_quad.xml b/AnkiDroid/src/main/res/interpolator/decelerate_quad.xml similarity index 100% rename from res/interpolator/decelerate_quad.xml rename to AnkiDroid/src/main/res/interpolator/decelerate_quad.xml diff --git a/res/interpolator/decelerate_quint.xml b/AnkiDroid/src/main/res/interpolator/decelerate_quint.xml similarity index 100% rename from res/interpolator/decelerate_quint.xml rename to AnkiDroid/src/main/res/interpolator/decelerate_quint.xml diff --git a/res/layout-land/widget_small.xml b/AnkiDroid/src/main/res/layout-land/widget_small.xml similarity index 100% rename from res/layout-land/widget_small.xml rename to AnkiDroid/src/main/res/layout-land/widget_small.xml diff --git a/res/layout-v14/my_account_register.xml b/AnkiDroid/src/main/res/layout-v14/my_account_register.xml similarity index 100% rename from res/layout-v14/my_account_register.xml rename to AnkiDroid/src/main/res/layout-v14/my_account_register.xml diff --git a/res/layout-v14/styled_dialog.xml b/AnkiDroid/src/main/res/layout-v14/styled_dialog.xml similarity index 100% rename from res/layout-v14/styled_dialog.xml rename to AnkiDroid/src/main/res/layout-v14/styled_dialog.xml diff --git a/res/layout-xlarge/bottom_button.xml b/AnkiDroid/src/main/res/layout-xlarge/bottom_button.xml similarity index 100% rename from res/layout-xlarge/bottom_button.xml rename to AnkiDroid/src/main/res/layout-xlarge/bottom_button.xml diff --git a/res/layout-xlarge/deck_picker.xml b/AnkiDroid/src/main/res/layout-xlarge/deck_picker.xml similarity index 100% rename from res/layout-xlarge/deck_picker.xml rename to AnkiDroid/src/main/res/layout-xlarge/deck_picker.xml diff --git a/res/layout-xlarge/studyoptions_fragment.xml b/AnkiDroid/src/main/res/layout-xlarge/studyoptions_fragment.xml similarity index 100% rename from res/layout-xlarge/studyoptions_fragment.xml rename to AnkiDroid/src/main/res/layout-xlarge/studyoptions_fragment.xml diff --git a/res/layout-xlarge/styled_open_collection_dialog.xml b/AnkiDroid/src/main/res/layout-xlarge/styled_open_collection_dialog.xml similarity index 100% rename from res/layout-xlarge/styled_open_collection_dialog.xml rename to AnkiDroid/src/main/res/layout-xlarge/styled_open_collection_dialog.xml diff --git a/res/layout/action_view_spinner.xml b/AnkiDroid/src/main/res/layout/action_view_spinner.xml similarity index 100% rename from res/layout/action_view_spinner.xml rename to AnkiDroid/src/main/res/layout/action_view_spinner.xml diff --git a/res/layout/activity_anki_stats.xml b/AnkiDroid/src/main/res/layout/activity_anki_stats.xml similarity index 100% rename from res/layout/activity_anki_stats.xml rename to AnkiDroid/src/main/res/layout/activity_anki_stats.xml diff --git a/res/layout/activity_edit_text.xml b/AnkiDroid/src/main/res/layout/activity_edit_text.xml similarity index 100% rename from res/layout/activity_edit_text.xml rename to AnkiDroid/src/main/res/layout/activity_edit_text.xml diff --git a/res/layout/activity_load_pronounciation.xml b/AnkiDroid/src/main/res/layout/activity_load_pronounciation.xml similarity index 100% rename from res/layout/activity_load_pronounciation.xml rename to AnkiDroid/src/main/res/layout/activity_load_pronounciation.xml diff --git a/res/layout/activity_multimedia_card_editor.xml b/AnkiDroid/src/main/res/layout/activity_multimedia_card_editor.xml similarity index 100% rename from res/layout/activity_multimedia_card_editor.xml rename to AnkiDroid/src/main/res/layout/activity_multimedia_card_editor.xml diff --git a/res/layout/activity_search_image.xml b/AnkiDroid/src/main/res/layout/activity_search_image.xml similarity index 100% rename from res/layout/activity_search_image.xml rename to AnkiDroid/src/main/res/layout/activity_search_image.xml diff --git a/res/layout/activity_translation.xml b/AnkiDroid/src/main/res/layout/activity_translation.xml similarity index 100% rename from res/layout/activity_translation.xml rename to AnkiDroid/src/main/res/layout/activity_translation.xml diff --git a/res/layout/add_intent_item.xml b/AnkiDroid/src/main/res/layout/add_intent_item.xml similarity index 100% rename from res/layout/add_intent_item.xml rename to AnkiDroid/src/main/res/layout/add_intent_item.xml diff --git a/res/layout/bottom_button.xml b/AnkiDroid/src/main/res/layout/bottom_button.xml similarity index 100% rename from res/layout/bottom_button.xml rename to AnkiDroid/src/main/res/layout/bottom_button.xml diff --git a/res/layout/card_browser.xml b/AnkiDroid/src/main/res/layout/card_browser.xml similarity index 100% rename from res/layout/card_browser.xml rename to AnkiDroid/src/main/res/layout/card_browser.xml diff --git a/res/layout/card_item_browser.xml b/AnkiDroid/src/main/res/layout/card_item_browser.xml similarity index 100% rename from res/layout/card_item_browser.xml rename to AnkiDroid/src/main/res/layout/card_item_browser.xml diff --git a/res/layout/card_multimedia_editline.xml b/AnkiDroid/src/main/res/layout/card_multimedia_editline.xml similarity index 100% rename from res/layout/card_multimedia_editline.xml rename to AnkiDroid/src/main/res/layout/card_multimedia_editline.xml diff --git a/res/layout/deck_item.xml b/AnkiDroid/src/main/res/layout/deck_item.xml similarity index 100% rename from res/layout/deck_item.xml rename to AnkiDroid/src/main/res/layout/deck_item.xml diff --git a/res/layout/deck_picker.xml b/AnkiDroid/src/main/res/layout/deck_picker.xml similarity index 100% rename from res/layout/deck_picker.xml rename to AnkiDroid/src/main/res/layout/deck_picker.xml diff --git a/res/layout/drawer_list_item.xml b/AnkiDroid/src/main/res/layout/drawer_list_item.xml similarity index 100% rename from res/layout/drawer_list_item.xml rename to AnkiDroid/src/main/res/layout/drawer_list_item.xml diff --git a/res/layout/drawer_submenu_list_item.xml b/AnkiDroid/src/main/res/layout/drawer_submenu_list_item.xml similarity index 100% rename from res/layout/drawer_submenu_list_item.xml rename to AnkiDroid/src/main/res/layout/drawer_submenu_list_item.xml diff --git a/res/layout/dropdown_deck_item.xml b/AnkiDroid/src/main/res/layout/dropdown_deck_item.xml similarity index 100% rename from res/layout/dropdown_deck_item.xml rename to AnkiDroid/src/main/res/layout/dropdown_deck_item.xml diff --git a/res/layout/dropdown_deck_selected_item.xml b/AnkiDroid/src/main/res/layout/dropdown_deck_selected_item.xml similarity index 100% rename from res/layout/dropdown_deck_selected_item.xml rename to AnkiDroid/src/main/res/layout/dropdown_deck_selected_item.xml diff --git a/res/layout/error_item.xml b/AnkiDroid/src/main/res/layout/error_item.xml similarity index 100% rename from res/layout/error_item.xml rename to AnkiDroid/src/main/res/layout/error_item.xml diff --git a/res/layout/feedback.xml b/AnkiDroid/src/main/res/layout/feedback.xml similarity index 100% rename from res/layout/feedback.xml rename to AnkiDroid/src/main/res/layout/feedback.xml diff --git a/res/layout/flashcard.xml b/AnkiDroid/src/main/res/layout/flashcard.xml similarity index 100% rename from res/layout/flashcard.xml rename to AnkiDroid/src/main/res/layout/flashcard.xml diff --git a/res/layout/fragment_anki_stats.xml b/AnkiDroid/src/main/res/layout/fragment_anki_stats.xml similarity index 100% rename from res/layout/fragment_anki_stats.xml rename to AnkiDroid/src/main/res/layout/fragment_anki_stats.xml diff --git a/res/layout/fragment_anki_stats_overview.xml b/AnkiDroid/src/main/res/layout/fragment_anki_stats_overview.xml similarity index 100% rename from res/layout/fragment_anki_stats_overview.xml rename to AnkiDroid/src/main/res/layout/fragment_anki_stats_overview.xml diff --git a/res/layout/info.xml b/AnkiDroid/src/main/res/layout/info.xml similarity index 100% rename from res/layout/info.xml rename to AnkiDroid/src/main/res/layout/info.xml diff --git a/res/layout/my_account.xml b/AnkiDroid/src/main/res/layout/my_account.xml similarity index 100% rename from res/layout/my_account.xml rename to AnkiDroid/src/main/res/layout/my_account.xml diff --git a/res/layout/my_account_logged_in.xml b/AnkiDroid/src/main/res/layout/my_account_logged_in.xml similarity index 100% rename from res/layout/my_account_logged_in.xml rename to AnkiDroid/src/main/res/layout/my_account_logged_in.xml diff --git a/res/layout/my_account_register.xml b/AnkiDroid/src/main/res/layout/my_account_register.xml similarity index 100% rename from res/layout/my_account_register.xml rename to AnkiDroid/src/main/res/layout/my_account_register.xml diff --git a/res/layout/navigation_drawer.xml b/AnkiDroid/src/main/res/layout/navigation_drawer.xml similarity index 100% rename from res/layout/navigation_drawer.xml rename to AnkiDroid/src/main/res/layout/navigation_drawer.xml diff --git a/res/layout/next_time_textview.xml b/AnkiDroid/src/main/res/layout/next_time_textview.xml similarity index 100% rename from res/layout/next_time_textview.xml rename to AnkiDroid/src/main/res/layout/next_time_textview.xml diff --git a/res/layout/note_editor.xml b/AnkiDroid/src/main/res/layout/note_editor.xml similarity index 100% rename from res/layout/note_editor.xml rename to AnkiDroid/src/main/res/layout/note_editor.xml diff --git a/res/layout/select_dialog_multichoice.xml b/AnkiDroid/src/main/res/layout/select_dialog_multichoice.xml similarity index 100% rename from res/layout/select_dialog_multichoice.xml rename to AnkiDroid/src/main/res/layout/select_dialog_multichoice.xml diff --git a/res/layout/select_dialog_nochoice.xml b/AnkiDroid/src/main/res/layout/select_dialog_nochoice.xml similarity index 100% rename from res/layout/select_dialog_nochoice.xml rename to AnkiDroid/src/main/res/layout/select_dialog_nochoice.xml diff --git a/res/layout/select_dialog_singlechoice.xml b/AnkiDroid/src/main/res/layout/select_dialog_singlechoice.xml similarity index 100% rename from res/layout/select_dialog_singlechoice.xml rename to AnkiDroid/src/main/res/layout/select_dialog_singlechoice.xml diff --git a/res/layout/statistics.xml b/AnkiDroid/src/main/res/layout/statistics.xml similarity index 100% rename from res/layout/statistics.xml rename to AnkiDroid/src/main/res/layout/statistics.xml diff --git a/res/layout/studyoptions.xml b/AnkiDroid/src/main/res/layout/studyoptions.xml similarity index 100% rename from res/layout/studyoptions.xml rename to AnkiDroid/src/main/res/layout/studyoptions.xml diff --git a/res/layout/studyoptions_fragment.xml b/AnkiDroid/src/main/res/layout/studyoptions_fragment.xml similarity index 100% rename from res/layout/studyoptions_fragment.xml rename to AnkiDroid/src/main/res/layout/studyoptions_fragment.xml diff --git a/res/layout/styled_custom_study_details_dialog.xml b/AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml similarity index 100% rename from res/layout/styled_custom_study_details_dialog.xml rename to AnkiDroid/src/main/res/layout/styled_custom_study_details_dialog.xml diff --git a/res/layout/styled_dialog.xml b/AnkiDroid/src/main/res/layout/styled_dialog.xml similarity index 100% rename from res/layout/styled_dialog.xml rename to AnkiDroid/src/main/res/layout/styled_dialog.xml diff --git a/res/layout/styled_open_collection_dialog.xml b/AnkiDroid/src/main/res/layout/styled_open_collection_dialog.xml similarity index 100% rename from res/layout/styled_open_collection_dialog.xml rename to AnkiDroid/src/main/res/layout/styled_open_collection_dialog.xml diff --git a/res/layout/styled_progress_dialog.xml b/AnkiDroid/src/main/res/layout/styled_progress_dialog.xml similarity index 100% rename from res/layout/styled_progress_dialog.xml rename to AnkiDroid/src/main/res/layout/styled_progress_dialog.xml diff --git a/res/layout/video_player.xml b/AnkiDroid/src/main/res/layout/video_player.xml similarity index 100% rename from res/layout/video_player.xml rename to AnkiDroid/src/main/res/layout/video_player.xml diff --git a/res/layout/widget.xml b/AnkiDroid/src/main/res/layout/widget.xml similarity index 100% rename from res/layout/widget.xml rename to AnkiDroid/src/main/res/layout/widget.xml diff --git a/res/layout/widget_big.xml b/AnkiDroid/src/main/res/layout/widget_big.xml similarity index 100% rename from res/layout/widget_big.xml rename to AnkiDroid/src/main/res/layout/widget_big.xml diff --git a/res/layout/widget_small.xml b/AnkiDroid/src/main/res/layout/widget_small.xml similarity index 100% rename from res/layout/widget_small.xml rename to AnkiDroid/src/main/res/layout/widget_small.xml diff --git a/res/menu/activity_edit_text.xml b/AnkiDroid/src/main/res/menu/activity_edit_text.xml similarity index 100% rename from res/menu/activity_edit_text.xml rename to AnkiDroid/src/main/res/menu/activity_edit_text.xml diff --git a/res/menu/activity_load_pronounciation.xml b/AnkiDroid/src/main/res/menu/activity_load_pronounciation.xml similarity index 100% rename from res/menu/activity_load_pronounciation.xml rename to AnkiDroid/src/main/res/menu/activity_load_pronounciation.xml diff --git a/res/menu/activity_multimedia_card_editor.xml b/AnkiDroid/src/main/res/menu/activity_multimedia_card_editor.xml similarity index 100% rename from res/menu/activity_multimedia_card_editor.xml rename to AnkiDroid/src/main/res/menu/activity_multimedia_card_editor.xml diff --git a/res/menu/activity_search_image.xml b/AnkiDroid/src/main/res/menu/activity_search_image.xml similarity index 100% rename from res/menu/activity_search_image.xml rename to AnkiDroid/src/main/res/menu/activity_search_image.xml diff --git a/res/menu/activity_translation.xml b/AnkiDroid/src/main/res/menu/activity_translation.xml similarity index 100% rename from res/menu/activity_translation.xml rename to AnkiDroid/src/main/res/menu/activity_translation.xml diff --git a/res/menu/anki_stats.xml b/AnkiDroid/src/main/res/menu/anki_stats.xml similarity index 100% rename from res/menu/anki_stats.xml rename to AnkiDroid/src/main/res/menu/anki_stats.xml diff --git a/res/menu/card_browser.xml b/AnkiDroid/src/main/res/menu/card_browser.xml similarity index 100% rename from res/menu/card_browser.xml rename to AnkiDroid/src/main/res/menu/card_browser.xml diff --git a/res/menu/card_editor.xml b/AnkiDroid/src/main/res/menu/card_editor.xml similarity index 100% rename from res/menu/card_editor.xml rename to AnkiDroid/src/main/res/menu/card_editor.xml diff --git a/res/menu/contextmenu_deckpicker.xml b/AnkiDroid/src/main/res/menu/contextmenu_deckpicker.xml similarity index 100% rename from res/menu/contextmenu_deckpicker.xml rename to AnkiDroid/src/main/res/menu/contextmenu_deckpicker.xml diff --git a/res/menu/deck_picker.xml b/AnkiDroid/src/main/res/menu/deck_picker.xml similarity index 100% rename from res/menu/deck_picker.xml rename to AnkiDroid/src/main/res/menu/deck_picker.xml diff --git a/res/menu/popupmenu_multimedia_options.xml b/AnkiDroid/src/main/res/menu/popupmenu_multimedia_options.xml similarity index 100% rename from res/menu/popupmenu_multimedia_options.xml rename to AnkiDroid/src/main/res/menu/popupmenu_multimedia_options.xml diff --git a/res/menu/reviewer.xml b/AnkiDroid/src/main/res/menu/reviewer.xml similarity index 100% rename from res/menu/reviewer.xml rename to AnkiDroid/src/main/res/menu/reviewer.xml diff --git a/res/menu/study_options_fragment.xml b/AnkiDroid/src/main/res/menu/study_options_fragment.xml similarity index 100% rename from res/menu/study_options_fragment.xml rename to AnkiDroid/src/main/res/menu/study_options_fragment.xml diff --git a/res/values-ar/01-core.xml b/AnkiDroid/src/main/res/values-ar/01-core.xml similarity index 100% rename from res/values-ar/01-core.xml rename to AnkiDroid/src/main/res/values-ar/01-core.xml diff --git a/res/values-ar/02-strings.xml b/AnkiDroid/src/main/res/values-ar/02-strings.xml similarity index 100% rename from res/values-ar/02-strings.xml rename to AnkiDroid/src/main/res/values-ar/02-strings.xml diff --git a/res/values-ar/03-dialogs.xml b/AnkiDroid/src/main/res/values-ar/03-dialogs.xml similarity index 100% rename from res/values-ar/03-dialogs.xml rename to AnkiDroid/src/main/res/values-ar/03-dialogs.xml diff --git a/res/values-ar/04-network.xml b/AnkiDroid/src/main/res/values-ar/04-network.xml similarity index 100% rename from res/values-ar/04-network.xml rename to AnkiDroid/src/main/res/values-ar/04-network.xml diff --git a/res/values-ar/05-feedback.xml b/AnkiDroid/src/main/res/values-ar/05-feedback.xml similarity index 100% rename from res/values-ar/05-feedback.xml rename to AnkiDroid/src/main/res/values-ar/05-feedback.xml diff --git a/res/values-ar/06-statistics.xml b/AnkiDroid/src/main/res/values-ar/06-statistics.xml similarity index 100% rename from res/values-ar/06-statistics.xml rename to AnkiDroid/src/main/res/values-ar/06-statistics.xml diff --git a/res/values-ar/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml similarity index 100% rename from res/values-ar/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-ar/07-cardbrowser.xml diff --git a/res/values-ar/08-widget.xml b/AnkiDroid/src/main/res/values-ar/08-widget.xml similarity index 100% rename from res/values-ar/08-widget.xml rename to AnkiDroid/src/main/res/values-ar/08-widget.xml diff --git a/res/values-ar/09-backup.xml b/AnkiDroid/src/main/res/values-ar/09-backup.xml similarity index 100% rename from res/values-ar/09-backup.xml rename to AnkiDroid/src/main/res/values-ar/09-backup.xml diff --git a/res/values-ar/10-preferences.xml b/AnkiDroid/src/main/res/values-ar/10-preferences.xml similarity index 100% rename from res/values-ar/10-preferences.xml rename to AnkiDroid/src/main/res/values-ar/10-preferences.xml diff --git a/res/values-ar/11-arrays.xml b/AnkiDroid/src/main/res/values-ar/11-arrays.xml similarity index 100% rename from res/values-ar/11-arrays.xml rename to AnkiDroid/src/main/res/values-ar/11-arrays.xml diff --git a/res/values-ar/13-newfeatures.xml b/AnkiDroid/src/main/res/values-ar/13-newfeatures.xml similarity index 100% rename from res/values-ar/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-ar/13-newfeatures.xml diff --git a/res/values-bg/01-core.xml b/AnkiDroid/src/main/res/values-bg/01-core.xml similarity index 100% rename from res/values-bg/01-core.xml rename to AnkiDroid/src/main/res/values-bg/01-core.xml diff --git a/res/values-bg/02-strings.xml b/AnkiDroid/src/main/res/values-bg/02-strings.xml similarity index 100% rename from res/values-bg/02-strings.xml rename to AnkiDroid/src/main/res/values-bg/02-strings.xml diff --git a/res/values-bg/03-dialogs.xml b/AnkiDroid/src/main/res/values-bg/03-dialogs.xml similarity index 100% rename from res/values-bg/03-dialogs.xml rename to AnkiDroid/src/main/res/values-bg/03-dialogs.xml diff --git a/res/values-bg/04-network.xml b/AnkiDroid/src/main/res/values-bg/04-network.xml similarity index 100% rename from res/values-bg/04-network.xml rename to AnkiDroid/src/main/res/values-bg/04-network.xml diff --git a/res/values-bg/05-feedback.xml b/AnkiDroid/src/main/res/values-bg/05-feedback.xml similarity index 100% rename from res/values-bg/05-feedback.xml rename to AnkiDroid/src/main/res/values-bg/05-feedback.xml diff --git a/res/values-bg/06-statistics.xml b/AnkiDroid/src/main/res/values-bg/06-statistics.xml similarity index 100% rename from res/values-bg/06-statistics.xml rename to AnkiDroid/src/main/res/values-bg/06-statistics.xml diff --git a/res/values-bg/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-bg/07-cardbrowser.xml similarity index 100% rename from res/values-bg/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-bg/07-cardbrowser.xml diff --git a/res/values-bg/08-widget.xml b/AnkiDroid/src/main/res/values-bg/08-widget.xml similarity index 100% rename from res/values-bg/08-widget.xml rename to AnkiDroid/src/main/res/values-bg/08-widget.xml diff --git a/res/values-bg/09-backup.xml b/AnkiDroid/src/main/res/values-bg/09-backup.xml similarity index 100% rename from res/values-bg/09-backup.xml rename to AnkiDroid/src/main/res/values-bg/09-backup.xml diff --git a/res/values-bg/10-preferences.xml b/AnkiDroid/src/main/res/values-bg/10-preferences.xml similarity index 100% rename from res/values-bg/10-preferences.xml rename to AnkiDroid/src/main/res/values-bg/10-preferences.xml diff --git a/res/values-bg/11-arrays.xml b/AnkiDroid/src/main/res/values-bg/11-arrays.xml similarity index 100% rename from res/values-bg/11-arrays.xml rename to AnkiDroid/src/main/res/values-bg/11-arrays.xml diff --git a/res/values-bg/13-newfeatures.xml b/AnkiDroid/src/main/res/values-bg/13-newfeatures.xml similarity index 100% rename from res/values-bg/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-bg/13-newfeatures.xml diff --git a/res/values-ca/01-core.xml b/AnkiDroid/src/main/res/values-ca/01-core.xml similarity index 100% rename from res/values-ca/01-core.xml rename to AnkiDroid/src/main/res/values-ca/01-core.xml diff --git a/res/values-ca/02-strings.xml b/AnkiDroid/src/main/res/values-ca/02-strings.xml similarity index 100% rename from res/values-ca/02-strings.xml rename to AnkiDroid/src/main/res/values-ca/02-strings.xml diff --git a/res/values-ca/03-dialogs.xml b/AnkiDroid/src/main/res/values-ca/03-dialogs.xml similarity index 100% rename from res/values-ca/03-dialogs.xml rename to AnkiDroid/src/main/res/values-ca/03-dialogs.xml diff --git a/res/values-ca/04-network.xml b/AnkiDroid/src/main/res/values-ca/04-network.xml similarity index 100% rename from res/values-ca/04-network.xml rename to AnkiDroid/src/main/res/values-ca/04-network.xml diff --git a/res/values-ca/05-feedback.xml b/AnkiDroid/src/main/res/values-ca/05-feedback.xml similarity index 100% rename from res/values-ca/05-feedback.xml rename to AnkiDroid/src/main/res/values-ca/05-feedback.xml diff --git a/res/values-ca/06-statistics.xml b/AnkiDroid/src/main/res/values-ca/06-statistics.xml similarity index 100% rename from res/values-ca/06-statistics.xml rename to AnkiDroid/src/main/res/values-ca/06-statistics.xml diff --git a/res/values-ca/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ca/07-cardbrowser.xml similarity index 100% rename from res/values-ca/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-ca/07-cardbrowser.xml diff --git a/res/values-ca/08-widget.xml b/AnkiDroid/src/main/res/values-ca/08-widget.xml similarity index 100% rename from res/values-ca/08-widget.xml rename to AnkiDroid/src/main/res/values-ca/08-widget.xml diff --git a/res/values-ca/09-backup.xml b/AnkiDroid/src/main/res/values-ca/09-backup.xml similarity index 100% rename from res/values-ca/09-backup.xml rename to AnkiDroid/src/main/res/values-ca/09-backup.xml diff --git a/res/values-ca/10-preferences.xml b/AnkiDroid/src/main/res/values-ca/10-preferences.xml similarity index 100% rename from res/values-ca/10-preferences.xml rename to AnkiDroid/src/main/res/values-ca/10-preferences.xml diff --git a/res/values-ca/11-arrays.xml b/AnkiDroid/src/main/res/values-ca/11-arrays.xml similarity index 100% rename from res/values-ca/11-arrays.xml rename to AnkiDroid/src/main/res/values-ca/11-arrays.xml diff --git a/res/values-ca/13-newfeatures.xml b/AnkiDroid/src/main/res/values-ca/13-newfeatures.xml similarity index 100% rename from res/values-ca/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-ca/13-newfeatures.xml diff --git a/res/values-cs/01-core.xml b/AnkiDroid/src/main/res/values-cs/01-core.xml similarity index 100% rename from res/values-cs/01-core.xml rename to AnkiDroid/src/main/res/values-cs/01-core.xml diff --git a/res/values-cs/02-strings.xml b/AnkiDroid/src/main/res/values-cs/02-strings.xml similarity index 100% rename from res/values-cs/02-strings.xml rename to AnkiDroid/src/main/res/values-cs/02-strings.xml diff --git a/res/values-cs/03-dialogs.xml b/AnkiDroid/src/main/res/values-cs/03-dialogs.xml similarity index 100% rename from res/values-cs/03-dialogs.xml rename to AnkiDroid/src/main/res/values-cs/03-dialogs.xml diff --git a/res/values-cs/04-network.xml b/AnkiDroid/src/main/res/values-cs/04-network.xml similarity index 100% rename from res/values-cs/04-network.xml rename to AnkiDroid/src/main/res/values-cs/04-network.xml diff --git a/res/values-cs/05-feedback.xml b/AnkiDroid/src/main/res/values-cs/05-feedback.xml similarity index 100% rename from res/values-cs/05-feedback.xml rename to AnkiDroid/src/main/res/values-cs/05-feedback.xml diff --git a/res/values-cs/06-statistics.xml b/AnkiDroid/src/main/res/values-cs/06-statistics.xml similarity index 100% rename from res/values-cs/06-statistics.xml rename to AnkiDroid/src/main/res/values-cs/06-statistics.xml diff --git a/res/values-cs/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml similarity index 100% rename from res/values-cs/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-cs/07-cardbrowser.xml diff --git a/res/values-cs/08-widget.xml b/AnkiDroid/src/main/res/values-cs/08-widget.xml similarity index 100% rename from res/values-cs/08-widget.xml rename to AnkiDroid/src/main/res/values-cs/08-widget.xml diff --git a/res/values-cs/09-backup.xml b/AnkiDroid/src/main/res/values-cs/09-backup.xml similarity index 100% rename from res/values-cs/09-backup.xml rename to AnkiDroid/src/main/res/values-cs/09-backup.xml diff --git a/res/values-cs/10-preferences.xml b/AnkiDroid/src/main/res/values-cs/10-preferences.xml similarity index 100% rename from res/values-cs/10-preferences.xml rename to AnkiDroid/src/main/res/values-cs/10-preferences.xml diff --git a/res/values-cs/11-arrays.xml b/AnkiDroid/src/main/res/values-cs/11-arrays.xml similarity index 100% rename from res/values-cs/11-arrays.xml rename to AnkiDroid/src/main/res/values-cs/11-arrays.xml diff --git a/res/values-cs/13-newfeatures.xml b/AnkiDroid/src/main/res/values-cs/13-newfeatures.xml similarity index 100% rename from res/values-cs/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-cs/13-newfeatures.xml diff --git a/res/values-de/01-core.xml b/AnkiDroid/src/main/res/values-de/01-core.xml similarity index 100% rename from res/values-de/01-core.xml rename to AnkiDroid/src/main/res/values-de/01-core.xml diff --git a/res/values-de/02-strings.xml b/AnkiDroid/src/main/res/values-de/02-strings.xml similarity index 100% rename from res/values-de/02-strings.xml rename to AnkiDroid/src/main/res/values-de/02-strings.xml diff --git a/res/values-de/03-dialogs.xml b/AnkiDroid/src/main/res/values-de/03-dialogs.xml similarity index 100% rename from res/values-de/03-dialogs.xml rename to AnkiDroid/src/main/res/values-de/03-dialogs.xml diff --git a/res/values-de/04-network.xml b/AnkiDroid/src/main/res/values-de/04-network.xml similarity index 100% rename from res/values-de/04-network.xml rename to AnkiDroid/src/main/res/values-de/04-network.xml diff --git a/res/values-de/05-feedback.xml b/AnkiDroid/src/main/res/values-de/05-feedback.xml similarity index 100% rename from res/values-de/05-feedback.xml rename to AnkiDroid/src/main/res/values-de/05-feedback.xml diff --git a/res/values-de/06-statistics.xml b/AnkiDroid/src/main/res/values-de/06-statistics.xml similarity index 100% rename from res/values-de/06-statistics.xml rename to AnkiDroid/src/main/res/values-de/06-statistics.xml diff --git a/res/values-de/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-de/07-cardbrowser.xml similarity index 100% rename from res/values-de/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-de/07-cardbrowser.xml diff --git a/res/values-de/08-widget.xml b/AnkiDroid/src/main/res/values-de/08-widget.xml similarity index 100% rename from res/values-de/08-widget.xml rename to AnkiDroid/src/main/res/values-de/08-widget.xml diff --git a/res/values-de/09-backup.xml b/AnkiDroid/src/main/res/values-de/09-backup.xml similarity index 100% rename from res/values-de/09-backup.xml rename to AnkiDroid/src/main/res/values-de/09-backup.xml diff --git a/res/values-de/10-preferences.xml b/AnkiDroid/src/main/res/values-de/10-preferences.xml similarity index 100% rename from res/values-de/10-preferences.xml rename to AnkiDroid/src/main/res/values-de/10-preferences.xml diff --git a/res/values-de/11-arrays.xml b/AnkiDroid/src/main/res/values-de/11-arrays.xml similarity index 100% rename from res/values-de/11-arrays.xml rename to AnkiDroid/src/main/res/values-de/11-arrays.xml diff --git a/res/values-de/13-newfeatures.xml b/AnkiDroid/src/main/res/values-de/13-newfeatures.xml similarity index 100% rename from res/values-de/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-de/13-newfeatures.xml diff --git a/res/values-el/01-core.xml b/AnkiDroid/src/main/res/values-el/01-core.xml similarity index 100% rename from res/values-el/01-core.xml rename to AnkiDroid/src/main/res/values-el/01-core.xml diff --git a/res/values-el/02-strings.xml b/AnkiDroid/src/main/res/values-el/02-strings.xml similarity index 100% rename from res/values-el/02-strings.xml rename to AnkiDroid/src/main/res/values-el/02-strings.xml diff --git a/res/values-el/03-dialogs.xml b/AnkiDroid/src/main/res/values-el/03-dialogs.xml similarity index 100% rename from res/values-el/03-dialogs.xml rename to AnkiDroid/src/main/res/values-el/03-dialogs.xml diff --git a/res/values-el/04-network.xml b/AnkiDroid/src/main/res/values-el/04-network.xml similarity index 100% rename from res/values-el/04-network.xml rename to AnkiDroid/src/main/res/values-el/04-network.xml diff --git a/res/values-el/05-feedback.xml b/AnkiDroid/src/main/res/values-el/05-feedback.xml similarity index 100% rename from res/values-el/05-feedback.xml rename to AnkiDroid/src/main/res/values-el/05-feedback.xml diff --git a/res/values-el/06-statistics.xml b/AnkiDroid/src/main/res/values-el/06-statistics.xml similarity index 100% rename from res/values-el/06-statistics.xml rename to AnkiDroid/src/main/res/values-el/06-statistics.xml diff --git a/res/values-el/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-el/07-cardbrowser.xml similarity index 100% rename from res/values-el/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-el/07-cardbrowser.xml diff --git a/res/values-el/08-widget.xml b/AnkiDroid/src/main/res/values-el/08-widget.xml similarity index 100% rename from res/values-el/08-widget.xml rename to AnkiDroid/src/main/res/values-el/08-widget.xml diff --git a/res/values-el/09-backup.xml b/AnkiDroid/src/main/res/values-el/09-backup.xml similarity index 100% rename from res/values-el/09-backup.xml rename to AnkiDroid/src/main/res/values-el/09-backup.xml diff --git a/res/values-el/10-preferences.xml b/AnkiDroid/src/main/res/values-el/10-preferences.xml similarity index 100% rename from res/values-el/10-preferences.xml rename to AnkiDroid/src/main/res/values-el/10-preferences.xml diff --git a/res/values-el/11-arrays.xml b/AnkiDroid/src/main/res/values-el/11-arrays.xml similarity index 100% rename from res/values-el/11-arrays.xml rename to AnkiDroid/src/main/res/values-el/11-arrays.xml diff --git a/res/values-el/13-newfeatures.xml b/AnkiDroid/src/main/res/values-el/13-newfeatures.xml similarity index 100% rename from res/values-el/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-el/13-newfeatures.xml diff --git a/res/values-es-rAR/01-core.xml b/AnkiDroid/src/main/res/values-es-rAR/01-core.xml similarity index 100% rename from res/values-es-rAR/01-core.xml rename to AnkiDroid/src/main/res/values-es-rAR/01-core.xml diff --git a/res/values-es-rAR/02-strings.xml b/AnkiDroid/src/main/res/values-es-rAR/02-strings.xml similarity index 100% rename from res/values-es-rAR/02-strings.xml rename to AnkiDroid/src/main/res/values-es-rAR/02-strings.xml diff --git a/res/values-es-rAR/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml similarity index 100% rename from res/values-es-rAR/03-dialogs.xml rename to AnkiDroid/src/main/res/values-es-rAR/03-dialogs.xml diff --git a/res/values-es-rAR/04-network.xml b/AnkiDroid/src/main/res/values-es-rAR/04-network.xml similarity index 100% rename from res/values-es-rAR/04-network.xml rename to AnkiDroid/src/main/res/values-es-rAR/04-network.xml diff --git a/res/values-es-rAR/05-feedback.xml b/AnkiDroid/src/main/res/values-es-rAR/05-feedback.xml similarity index 100% rename from res/values-es-rAR/05-feedback.xml rename to AnkiDroid/src/main/res/values-es-rAR/05-feedback.xml diff --git a/res/values-es-rAR/06-statistics.xml b/AnkiDroid/src/main/res/values-es-rAR/06-statistics.xml similarity index 100% rename from res/values-es-rAR/06-statistics.xml rename to AnkiDroid/src/main/res/values-es-rAR/06-statistics.xml diff --git a/res/values-es-rAR/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml similarity index 100% rename from res/values-es-rAR/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-es-rAR/07-cardbrowser.xml diff --git a/res/values-es-rAR/08-widget.xml b/AnkiDroid/src/main/res/values-es-rAR/08-widget.xml similarity index 100% rename from res/values-es-rAR/08-widget.xml rename to AnkiDroid/src/main/res/values-es-rAR/08-widget.xml diff --git a/res/values-es-rAR/09-backup.xml b/AnkiDroid/src/main/res/values-es-rAR/09-backup.xml similarity index 100% rename from res/values-es-rAR/09-backup.xml rename to AnkiDroid/src/main/res/values-es-rAR/09-backup.xml diff --git a/res/values-es-rAR/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml similarity index 100% rename from res/values-es-rAR/10-preferences.xml rename to AnkiDroid/src/main/res/values-es-rAR/10-preferences.xml diff --git a/res/values-es-rAR/11-arrays.xml b/AnkiDroid/src/main/res/values-es-rAR/11-arrays.xml similarity index 100% rename from res/values-es-rAR/11-arrays.xml rename to AnkiDroid/src/main/res/values-es-rAR/11-arrays.xml diff --git a/res/values-es-rAR/13-newfeatures.xml b/AnkiDroid/src/main/res/values-es-rAR/13-newfeatures.xml similarity index 100% rename from res/values-es-rAR/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-es-rAR/13-newfeatures.xml diff --git a/res/values-es-rES/01-core.xml b/AnkiDroid/src/main/res/values-es-rES/01-core.xml similarity index 100% rename from res/values-es-rES/01-core.xml rename to AnkiDroid/src/main/res/values-es-rES/01-core.xml diff --git a/res/values-es-rES/02-strings.xml b/AnkiDroid/src/main/res/values-es-rES/02-strings.xml similarity index 100% rename from res/values-es-rES/02-strings.xml rename to AnkiDroid/src/main/res/values-es-rES/02-strings.xml diff --git a/res/values-es-rES/03-dialogs.xml b/AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml similarity index 100% rename from res/values-es-rES/03-dialogs.xml rename to AnkiDroid/src/main/res/values-es-rES/03-dialogs.xml diff --git a/res/values-es-rES/04-network.xml b/AnkiDroid/src/main/res/values-es-rES/04-network.xml similarity index 100% rename from res/values-es-rES/04-network.xml rename to AnkiDroid/src/main/res/values-es-rES/04-network.xml diff --git a/res/values-es-rES/05-feedback.xml b/AnkiDroid/src/main/res/values-es-rES/05-feedback.xml similarity index 100% rename from res/values-es-rES/05-feedback.xml rename to AnkiDroid/src/main/res/values-es-rES/05-feedback.xml diff --git a/res/values-es-rES/06-statistics.xml b/AnkiDroid/src/main/res/values-es-rES/06-statistics.xml similarity index 100% rename from res/values-es-rES/06-statistics.xml rename to AnkiDroid/src/main/res/values-es-rES/06-statistics.xml diff --git a/res/values-es-rES/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml similarity index 100% rename from res/values-es-rES/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-es-rES/07-cardbrowser.xml diff --git a/res/values-es-rES/08-widget.xml b/AnkiDroid/src/main/res/values-es-rES/08-widget.xml similarity index 100% rename from res/values-es-rES/08-widget.xml rename to AnkiDroid/src/main/res/values-es-rES/08-widget.xml diff --git a/res/values-es-rES/09-backup.xml b/AnkiDroid/src/main/res/values-es-rES/09-backup.xml similarity index 100% rename from res/values-es-rES/09-backup.xml rename to AnkiDroid/src/main/res/values-es-rES/09-backup.xml diff --git a/res/values-es-rES/10-preferences.xml b/AnkiDroid/src/main/res/values-es-rES/10-preferences.xml similarity index 100% rename from res/values-es-rES/10-preferences.xml rename to AnkiDroid/src/main/res/values-es-rES/10-preferences.xml diff --git a/res/values-es-rES/11-arrays.xml b/AnkiDroid/src/main/res/values-es-rES/11-arrays.xml similarity index 100% rename from res/values-es-rES/11-arrays.xml rename to AnkiDroid/src/main/res/values-es-rES/11-arrays.xml diff --git a/res/values-es-rES/13-newfeatures.xml b/AnkiDroid/src/main/res/values-es-rES/13-newfeatures.xml similarity index 100% rename from res/values-es-rES/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-es-rES/13-newfeatures.xml diff --git a/res/values-et/01-core.xml b/AnkiDroid/src/main/res/values-et/01-core.xml similarity index 100% rename from res/values-et/01-core.xml rename to AnkiDroid/src/main/res/values-et/01-core.xml diff --git a/res/values-et/02-strings.xml b/AnkiDroid/src/main/res/values-et/02-strings.xml similarity index 100% rename from res/values-et/02-strings.xml rename to AnkiDroid/src/main/res/values-et/02-strings.xml diff --git a/res/values-et/03-dialogs.xml b/AnkiDroid/src/main/res/values-et/03-dialogs.xml similarity index 100% rename from res/values-et/03-dialogs.xml rename to AnkiDroid/src/main/res/values-et/03-dialogs.xml diff --git a/res/values-et/04-network.xml b/AnkiDroid/src/main/res/values-et/04-network.xml similarity index 100% rename from res/values-et/04-network.xml rename to AnkiDroid/src/main/res/values-et/04-network.xml diff --git a/res/values-et/05-feedback.xml b/AnkiDroid/src/main/res/values-et/05-feedback.xml similarity index 100% rename from res/values-et/05-feedback.xml rename to AnkiDroid/src/main/res/values-et/05-feedback.xml diff --git a/res/values-et/06-statistics.xml b/AnkiDroid/src/main/res/values-et/06-statistics.xml similarity index 100% rename from res/values-et/06-statistics.xml rename to AnkiDroid/src/main/res/values-et/06-statistics.xml diff --git a/res/values-et/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-et/07-cardbrowser.xml similarity index 100% rename from res/values-et/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-et/07-cardbrowser.xml diff --git a/res/values-et/08-widget.xml b/AnkiDroid/src/main/res/values-et/08-widget.xml similarity index 100% rename from res/values-et/08-widget.xml rename to AnkiDroid/src/main/res/values-et/08-widget.xml diff --git a/res/values-et/09-backup.xml b/AnkiDroid/src/main/res/values-et/09-backup.xml similarity index 100% rename from res/values-et/09-backup.xml rename to AnkiDroid/src/main/res/values-et/09-backup.xml diff --git a/res/values-et/10-preferences.xml b/AnkiDroid/src/main/res/values-et/10-preferences.xml similarity index 100% rename from res/values-et/10-preferences.xml rename to AnkiDroid/src/main/res/values-et/10-preferences.xml diff --git a/res/values-et/11-arrays.xml b/AnkiDroid/src/main/res/values-et/11-arrays.xml similarity index 100% rename from res/values-et/11-arrays.xml rename to AnkiDroid/src/main/res/values-et/11-arrays.xml diff --git a/res/values-et/13-newfeatures.xml b/AnkiDroid/src/main/res/values-et/13-newfeatures.xml similarity index 100% rename from res/values-et/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-et/13-newfeatures.xml diff --git a/res/values-fa/01-core.xml b/AnkiDroid/src/main/res/values-fa/01-core.xml similarity index 100% rename from res/values-fa/01-core.xml rename to AnkiDroid/src/main/res/values-fa/01-core.xml diff --git a/res/values-fa/02-strings.xml b/AnkiDroid/src/main/res/values-fa/02-strings.xml similarity index 100% rename from res/values-fa/02-strings.xml rename to AnkiDroid/src/main/res/values-fa/02-strings.xml diff --git a/res/values-fa/03-dialogs.xml b/AnkiDroid/src/main/res/values-fa/03-dialogs.xml similarity index 100% rename from res/values-fa/03-dialogs.xml rename to AnkiDroid/src/main/res/values-fa/03-dialogs.xml diff --git a/res/values-fa/04-network.xml b/AnkiDroid/src/main/res/values-fa/04-network.xml similarity index 100% rename from res/values-fa/04-network.xml rename to AnkiDroid/src/main/res/values-fa/04-network.xml diff --git a/res/values-fa/05-feedback.xml b/AnkiDroid/src/main/res/values-fa/05-feedback.xml similarity index 100% rename from res/values-fa/05-feedback.xml rename to AnkiDroid/src/main/res/values-fa/05-feedback.xml diff --git a/res/values-fa/06-statistics.xml b/AnkiDroid/src/main/res/values-fa/06-statistics.xml similarity index 100% rename from res/values-fa/06-statistics.xml rename to AnkiDroid/src/main/res/values-fa/06-statistics.xml diff --git a/res/values-fa/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fa/07-cardbrowser.xml similarity index 100% rename from res/values-fa/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-fa/07-cardbrowser.xml diff --git a/res/values-fa/08-widget.xml b/AnkiDroid/src/main/res/values-fa/08-widget.xml similarity index 100% rename from res/values-fa/08-widget.xml rename to AnkiDroid/src/main/res/values-fa/08-widget.xml diff --git a/res/values-fa/09-backup.xml b/AnkiDroid/src/main/res/values-fa/09-backup.xml similarity index 100% rename from res/values-fa/09-backup.xml rename to AnkiDroid/src/main/res/values-fa/09-backup.xml diff --git a/res/values-fa/10-preferences.xml b/AnkiDroid/src/main/res/values-fa/10-preferences.xml similarity index 100% rename from res/values-fa/10-preferences.xml rename to AnkiDroid/src/main/res/values-fa/10-preferences.xml diff --git a/res/values-fa/11-arrays.xml b/AnkiDroid/src/main/res/values-fa/11-arrays.xml similarity index 100% rename from res/values-fa/11-arrays.xml rename to AnkiDroid/src/main/res/values-fa/11-arrays.xml diff --git a/res/values-fa/13-newfeatures.xml b/AnkiDroid/src/main/res/values-fa/13-newfeatures.xml similarity index 100% rename from res/values-fa/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-fa/13-newfeatures.xml diff --git a/res/values-fi/01-core.xml b/AnkiDroid/src/main/res/values-fi/01-core.xml similarity index 100% rename from res/values-fi/01-core.xml rename to AnkiDroid/src/main/res/values-fi/01-core.xml diff --git a/res/values-fi/02-strings.xml b/AnkiDroid/src/main/res/values-fi/02-strings.xml similarity index 100% rename from res/values-fi/02-strings.xml rename to AnkiDroid/src/main/res/values-fi/02-strings.xml diff --git a/res/values-fi/03-dialogs.xml b/AnkiDroid/src/main/res/values-fi/03-dialogs.xml similarity index 100% rename from res/values-fi/03-dialogs.xml rename to AnkiDroid/src/main/res/values-fi/03-dialogs.xml diff --git a/res/values-fi/04-network.xml b/AnkiDroid/src/main/res/values-fi/04-network.xml similarity index 100% rename from res/values-fi/04-network.xml rename to AnkiDroid/src/main/res/values-fi/04-network.xml diff --git a/res/values-fi/05-feedback.xml b/AnkiDroid/src/main/res/values-fi/05-feedback.xml similarity index 100% rename from res/values-fi/05-feedback.xml rename to AnkiDroid/src/main/res/values-fi/05-feedback.xml diff --git a/res/values-fi/06-statistics.xml b/AnkiDroid/src/main/res/values-fi/06-statistics.xml similarity index 100% rename from res/values-fi/06-statistics.xml rename to AnkiDroid/src/main/res/values-fi/06-statistics.xml diff --git a/res/values-fi/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml similarity index 100% rename from res/values-fi/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-fi/07-cardbrowser.xml diff --git a/res/values-fi/08-widget.xml b/AnkiDroid/src/main/res/values-fi/08-widget.xml similarity index 100% rename from res/values-fi/08-widget.xml rename to AnkiDroid/src/main/res/values-fi/08-widget.xml diff --git a/res/values-fi/09-backup.xml b/AnkiDroid/src/main/res/values-fi/09-backup.xml similarity index 100% rename from res/values-fi/09-backup.xml rename to AnkiDroid/src/main/res/values-fi/09-backup.xml diff --git a/res/values-fi/10-preferences.xml b/AnkiDroid/src/main/res/values-fi/10-preferences.xml similarity index 100% rename from res/values-fi/10-preferences.xml rename to AnkiDroid/src/main/res/values-fi/10-preferences.xml diff --git a/res/values-fi/11-arrays.xml b/AnkiDroid/src/main/res/values-fi/11-arrays.xml similarity index 100% rename from res/values-fi/11-arrays.xml rename to AnkiDroid/src/main/res/values-fi/11-arrays.xml diff --git a/res/values-fi/13-newfeatures.xml b/AnkiDroid/src/main/res/values-fi/13-newfeatures.xml similarity index 100% rename from res/values-fi/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-fi/13-newfeatures.xml diff --git a/res/values-fr/01-core.xml b/AnkiDroid/src/main/res/values-fr/01-core.xml similarity index 100% rename from res/values-fr/01-core.xml rename to AnkiDroid/src/main/res/values-fr/01-core.xml diff --git a/res/values-fr/02-strings.xml b/AnkiDroid/src/main/res/values-fr/02-strings.xml similarity index 100% rename from res/values-fr/02-strings.xml rename to AnkiDroid/src/main/res/values-fr/02-strings.xml diff --git a/res/values-fr/03-dialogs.xml b/AnkiDroid/src/main/res/values-fr/03-dialogs.xml similarity index 100% rename from res/values-fr/03-dialogs.xml rename to AnkiDroid/src/main/res/values-fr/03-dialogs.xml diff --git a/res/values-fr/04-network.xml b/AnkiDroid/src/main/res/values-fr/04-network.xml similarity index 100% rename from res/values-fr/04-network.xml rename to AnkiDroid/src/main/res/values-fr/04-network.xml diff --git a/res/values-fr/05-feedback.xml b/AnkiDroid/src/main/res/values-fr/05-feedback.xml similarity index 100% rename from res/values-fr/05-feedback.xml rename to AnkiDroid/src/main/res/values-fr/05-feedback.xml diff --git a/res/values-fr/06-statistics.xml b/AnkiDroid/src/main/res/values-fr/06-statistics.xml similarity index 100% rename from res/values-fr/06-statistics.xml rename to AnkiDroid/src/main/res/values-fr/06-statistics.xml diff --git a/res/values-fr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml similarity index 100% rename from res/values-fr/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-fr/07-cardbrowser.xml diff --git a/res/values-fr/08-widget.xml b/AnkiDroid/src/main/res/values-fr/08-widget.xml similarity index 100% rename from res/values-fr/08-widget.xml rename to AnkiDroid/src/main/res/values-fr/08-widget.xml diff --git a/res/values-fr/09-backup.xml b/AnkiDroid/src/main/res/values-fr/09-backup.xml similarity index 100% rename from res/values-fr/09-backup.xml rename to AnkiDroid/src/main/res/values-fr/09-backup.xml diff --git a/res/values-fr/10-preferences.xml b/AnkiDroid/src/main/res/values-fr/10-preferences.xml similarity index 100% rename from res/values-fr/10-preferences.xml rename to AnkiDroid/src/main/res/values-fr/10-preferences.xml diff --git a/res/values-fr/11-arrays.xml b/AnkiDroid/src/main/res/values-fr/11-arrays.xml similarity index 100% rename from res/values-fr/11-arrays.xml rename to AnkiDroid/src/main/res/values-fr/11-arrays.xml diff --git a/res/values-fr/13-newfeatures.xml b/AnkiDroid/src/main/res/values-fr/13-newfeatures.xml similarity index 100% rename from res/values-fr/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-fr/13-newfeatures.xml diff --git a/res/values-gl/01-core.xml b/AnkiDroid/src/main/res/values-gl/01-core.xml similarity index 100% rename from res/values-gl/01-core.xml rename to AnkiDroid/src/main/res/values-gl/01-core.xml diff --git a/res/values-gl/02-strings.xml b/AnkiDroid/src/main/res/values-gl/02-strings.xml similarity index 100% rename from res/values-gl/02-strings.xml rename to AnkiDroid/src/main/res/values-gl/02-strings.xml diff --git a/res/values-gl/03-dialogs.xml b/AnkiDroid/src/main/res/values-gl/03-dialogs.xml similarity index 100% rename from res/values-gl/03-dialogs.xml rename to AnkiDroid/src/main/res/values-gl/03-dialogs.xml diff --git a/res/values-gl/04-network.xml b/AnkiDroid/src/main/res/values-gl/04-network.xml similarity index 100% rename from res/values-gl/04-network.xml rename to AnkiDroid/src/main/res/values-gl/04-network.xml diff --git a/res/values-gl/05-feedback.xml b/AnkiDroid/src/main/res/values-gl/05-feedback.xml similarity index 100% rename from res/values-gl/05-feedback.xml rename to AnkiDroid/src/main/res/values-gl/05-feedback.xml diff --git a/res/values-gl/06-statistics.xml b/AnkiDroid/src/main/res/values-gl/06-statistics.xml similarity index 100% rename from res/values-gl/06-statistics.xml rename to AnkiDroid/src/main/res/values-gl/06-statistics.xml diff --git a/res/values-gl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-gl/07-cardbrowser.xml similarity index 100% rename from res/values-gl/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-gl/07-cardbrowser.xml diff --git a/res/values-gl/08-widget.xml b/AnkiDroid/src/main/res/values-gl/08-widget.xml similarity index 100% rename from res/values-gl/08-widget.xml rename to AnkiDroid/src/main/res/values-gl/08-widget.xml diff --git a/res/values-gl/09-backup.xml b/AnkiDroid/src/main/res/values-gl/09-backup.xml similarity index 100% rename from res/values-gl/09-backup.xml rename to AnkiDroid/src/main/res/values-gl/09-backup.xml diff --git a/res/values-gl/10-preferences.xml b/AnkiDroid/src/main/res/values-gl/10-preferences.xml similarity index 100% rename from res/values-gl/10-preferences.xml rename to AnkiDroid/src/main/res/values-gl/10-preferences.xml diff --git a/res/values-gl/11-arrays.xml b/AnkiDroid/src/main/res/values-gl/11-arrays.xml similarity index 100% rename from res/values-gl/11-arrays.xml rename to AnkiDroid/src/main/res/values-gl/11-arrays.xml diff --git a/res/values-gl/13-newfeatures.xml b/AnkiDroid/src/main/res/values-gl/13-newfeatures.xml similarity index 100% rename from res/values-gl/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-gl/13-newfeatures.xml diff --git a/res/values-he/01-core.xml b/AnkiDroid/src/main/res/values-he/01-core.xml similarity index 100% rename from res/values-he/01-core.xml rename to AnkiDroid/src/main/res/values-he/01-core.xml diff --git a/res/values-he/02-strings.xml b/AnkiDroid/src/main/res/values-he/02-strings.xml similarity index 100% rename from res/values-he/02-strings.xml rename to AnkiDroid/src/main/res/values-he/02-strings.xml diff --git a/res/values-he/03-dialogs.xml b/AnkiDroid/src/main/res/values-he/03-dialogs.xml similarity index 100% rename from res/values-he/03-dialogs.xml rename to AnkiDroid/src/main/res/values-he/03-dialogs.xml diff --git a/res/values-he/04-network.xml b/AnkiDroid/src/main/res/values-he/04-network.xml similarity index 100% rename from res/values-he/04-network.xml rename to AnkiDroid/src/main/res/values-he/04-network.xml diff --git a/res/values-he/05-feedback.xml b/AnkiDroid/src/main/res/values-he/05-feedback.xml similarity index 100% rename from res/values-he/05-feedback.xml rename to AnkiDroid/src/main/res/values-he/05-feedback.xml diff --git a/res/values-he/06-statistics.xml b/AnkiDroid/src/main/res/values-he/06-statistics.xml similarity index 100% rename from res/values-he/06-statistics.xml rename to AnkiDroid/src/main/res/values-he/06-statistics.xml diff --git a/res/values-he/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-he/07-cardbrowser.xml similarity index 100% rename from res/values-he/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-he/07-cardbrowser.xml diff --git a/res/values-he/08-widget.xml b/AnkiDroid/src/main/res/values-he/08-widget.xml similarity index 100% rename from res/values-he/08-widget.xml rename to AnkiDroid/src/main/res/values-he/08-widget.xml diff --git a/res/values-he/09-backup.xml b/AnkiDroid/src/main/res/values-he/09-backup.xml similarity index 100% rename from res/values-he/09-backup.xml rename to AnkiDroid/src/main/res/values-he/09-backup.xml diff --git a/res/values-he/10-preferences.xml b/AnkiDroid/src/main/res/values-he/10-preferences.xml similarity index 100% rename from res/values-he/10-preferences.xml rename to AnkiDroid/src/main/res/values-he/10-preferences.xml diff --git a/res/values-he/11-arrays.xml b/AnkiDroid/src/main/res/values-he/11-arrays.xml similarity index 100% rename from res/values-he/11-arrays.xml rename to AnkiDroid/src/main/res/values-he/11-arrays.xml diff --git a/res/values-he/13-newfeatures.xml b/AnkiDroid/src/main/res/values-he/13-newfeatures.xml similarity index 100% rename from res/values-he/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-he/13-newfeatures.xml diff --git a/res/values-hi/01-core.xml b/AnkiDroid/src/main/res/values-hi/01-core.xml similarity index 100% rename from res/values-hi/01-core.xml rename to AnkiDroid/src/main/res/values-hi/01-core.xml diff --git a/res/values-hi/02-strings.xml b/AnkiDroid/src/main/res/values-hi/02-strings.xml similarity index 100% rename from res/values-hi/02-strings.xml rename to AnkiDroid/src/main/res/values-hi/02-strings.xml diff --git a/res/values-hi/03-dialogs.xml b/AnkiDroid/src/main/res/values-hi/03-dialogs.xml similarity index 100% rename from res/values-hi/03-dialogs.xml rename to AnkiDroid/src/main/res/values-hi/03-dialogs.xml diff --git a/res/values-hi/04-network.xml b/AnkiDroid/src/main/res/values-hi/04-network.xml similarity index 100% rename from res/values-hi/04-network.xml rename to AnkiDroid/src/main/res/values-hi/04-network.xml diff --git a/res/values-hi/05-feedback.xml b/AnkiDroid/src/main/res/values-hi/05-feedback.xml similarity index 100% rename from res/values-hi/05-feedback.xml rename to AnkiDroid/src/main/res/values-hi/05-feedback.xml diff --git a/res/values-hi/06-statistics.xml b/AnkiDroid/src/main/res/values-hi/06-statistics.xml similarity index 100% rename from res/values-hi/06-statistics.xml rename to AnkiDroid/src/main/res/values-hi/06-statistics.xml diff --git a/res/values-hi/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-hi/07-cardbrowser.xml similarity index 100% rename from res/values-hi/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-hi/07-cardbrowser.xml diff --git a/res/values-hi/08-widget.xml b/AnkiDroid/src/main/res/values-hi/08-widget.xml similarity index 100% rename from res/values-hi/08-widget.xml rename to AnkiDroid/src/main/res/values-hi/08-widget.xml diff --git a/res/values-hi/09-backup.xml b/AnkiDroid/src/main/res/values-hi/09-backup.xml similarity index 100% rename from res/values-hi/09-backup.xml rename to AnkiDroid/src/main/res/values-hi/09-backup.xml diff --git a/res/values-hi/10-preferences.xml b/AnkiDroid/src/main/res/values-hi/10-preferences.xml similarity index 100% rename from res/values-hi/10-preferences.xml rename to AnkiDroid/src/main/res/values-hi/10-preferences.xml diff --git a/res/values-hi/11-arrays.xml b/AnkiDroid/src/main/res/values-hi/11-arrays.xml similarity index 100% rename from res/values-hi/11-arrays.xml rename to AnkiDroid/src/main/res/values-hi/11-arrays.xml diff --git a/res/values-hi/13-newfeatures.xml b/AnkiDroid/src/main/res/values-hi/13-newfeatures.xml similarity index 100% rename from res/values-hi/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-hi/13-newfeatures.xml diff --git a/res/values-hu/01-core.xml b/AnkiDroid/src/main/res/values-hu/01-core.xml similarity index 100% rename from res/values-hu/01-core.xml rename to AnkiDroid/src/main/res/values-hu/01-core.xml diff --git a/res/values-hu/02-strings.xml b/AnkiDroid/src/main/res/values-hu/02-strings.xml similarity index 100% rename from res/values-hu/02-strings.xml rename to AnkiDroid/src/main/res/values-hu/02-strings.xml diff --git a/res/values-hu/03-dialogs.xml b/AnkiDroid/src/main/res/values-hu/03-dialogs.xml similarity index 100% rename from res/values-hu/03-dialogs.xml rename to AnkiDroid/src/main/res/values-hu/03-dialogs.xml diff --git a/res/values-hu/04-network.xml b/AnkiDroid/src/main/res/values-hu/04-network.xml similarity index 100% rename from res/values-hu/04-network.xml rename to AnkiDroid/src/main/res/values-hu/04-network.xml diff --git a/res/values-hu/05-feedback.xml b/AnkiDroid/src/main/res/values-hu/05-feedback.xml similarity index 100% rename from res/values-hu/05-feedback.xml rename to AnkiDroid/src/main/res/values-hu/05-feedback.xml diff --git a/res/values-hu/06-statistics.xml b/AnkiDroid/src/main/res/values-hu/06-statistics.xml similarity index 100% rename from res/values-hu/06-statistics.xml rename to AnkiDroid/src/main/res/values-hu/06-statistics.xml diff --git a/res/values-hu/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-hu/07-cardbrowser.xml similarity index 100% rename from res/values-hu/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-hu/07-cardbrowser.xml diff --git a/res/values-hu/08-widget.xml b/AnkiDroid/src/main/res/values-hu/08-widget.xml similarity index 100% rename from res/values-hu/08-widget.xml rename to AnkiDroid/src/main/res/values-hu/08-widget.xml diff --git a/res/values-hu/09-backup.xml b/AnkiDroid/src/main/res/values-hu/09-backup.xml similarity index 100% rename from res/values-hu/09-backup.xml rename to AnkiDroid/src/main/res/values-hu/09-backup.xml diff --git a/res/values-hu/10-preferences.xml b/AnkiDroid/src/main/res/values-hu/10-preferences.xml similarity index 100% rename from res/values-hu/10-preferences.xml rename to AnkiDroid/src/main/res/values-hu/10-preferences.xml diff --git a/res/values-hu/11-arrays.xml b/AnkiDroid/src/main/res/values-hu/11-arrays.xml similarity index 100% rename from res/values-hu/11-arrays.xml rename to AnkiDroid/src/main/res/values-hu/11-arrays.xml diff --git a/res/values-hu/13-newfeatures.xml b/AnkiDroid/src/main/res/values-hu/13-newfeatures.xml similarity index 100% rename from res/values-hu/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-hu/13-newfeatures.xml diff --git a/res/values-id/01-core.xml b/AnkiDroid/src/main/res/values-id/01-core.xml similarity index 100% rename from res/values-id/01-core.xml rename to AnkiDroid/src/main/res/values-id/01-core.xml diff --git a/res/values-id/02-strings.xml b/AnkiDroid/src/main/res/values-id/02-strings.xml similarity index 100% rename from res/values-id/02-strings.xml rename to AnkiDroid/src/main/res/values-id/02-strings.xml diff --git a/res/values-id/03-dialogs.xml b/AnkiDroid/src/main/res/values-id/03-dialogs.xml similarity index 100% rename from res/values-id/03-dialogs.xml rename to AnkiDroid/src/main/res/values-id/03-dialogs.xml diff --git a/res/values-id/04-network.xml b/AnkiDroid/src/main/res/values-id/04-network.xml similarity index 100% rename from res/values-id/04-network.xml rename to AnkiDroid/src/main/res/values-id/04-network.xml diff --git a/res/values-id/05-feedback.xml b/AnkiDroid/src/main/res/values-id/05-feedback.xml similarity index 100% rename from res/values-id/05-feedback.xml rename to AnkiDroid/src/main/res/values-id/05-feedback.xml diff --git a/res/values-id/06-statistics.xml b/AnkiDroid/src/main/res/values-id/06-statistics.xml similarity index 100% rename from res/values-id/06-statistics.xml rename to AnkiDroid/src/main/res/values-id/06-statistics.xml diff --git a/res/values-id/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-id/07-cardbrowser.xml similarity index 100% rename from res/values-id/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-id/07-cardbrowser.xml diff --git a/res/values-id/08-widget.xml b/AnkiDroid/src/main/res/values-id/08-widget.xml similarity index 100% rename from res/values-id/08-widget.xml rename to AnkiDroid/src/main/res/values-id/08-widget.xml diff --git a/res/values-id/09-backup.xml b/AnkiDroid/src/main/res/values-id/09-backup.xml similarity index 100% rename from res/values-id/09-backup.xml rename to AnkiDroid/src/main/res/values-id/09-backup.xml diff --git a/res/values-id/10-preferences.xml b/AnkiDroid/src/main/res/values-id/10-preferences.xml similarity index 100% rename from res/values-id/10-preferences.xml rename to AnkiDroid/src/main/res/values-id/10-preferences.xml diff --git a/res/values-id/11-arrays.xml b/AnkiDroid/src/main/res/values-id/11-arrays.xml similarity index 100% rename from res/values-id/11-arrays.xml rename to AnkiDroid/src/main/res/values-id/11-arrays.xml diff --git a/res/values-id/13-newfeatures.xml b/AnkiDroid/src/main/res/values-id/13-newfeatures.xml similarity index 100% rename from res/values-id/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-id/13-newfeatures.xml diff --git a/res/values-it/01-core.xml b/AnkiDroid/src/main/res/values-it/01-core.xml similarity index 100% rename from res/values-it/01-core.xml rename to AnkiDroid/src/main/res/values-it/01-core.xml diff --git a/res/values-it/02-strings.xml b/AnkiDroid/src/main/res/values-it/02-strings.xml similarity index 100% rename from res/values-it/02-strings.xml rename to AnkiDroid/src/main/res/values-it/02-strings.xml diff --git a/res/values-it/03-dialogs.xml b/AnkiDroid/src/main/res/values-it/03-dialogs.xml similarity index 100% rename from res/values-it/03-dialogs.xml rename to AnkiDroid/src/main/res/values-it/03-dialogs.xml diff --git a/res/values-it/04-network.xml b/AnkiDroid/src/main/res/values-it/04-network.xml similarity index 100% rename from res/values-it/04-network.xml rename to AnkiDroid/src/main/res/values-it/04-network.xml diff --git a/res/values-it/05-feedback.xml b/AnkiDroid/src/main/res/values-it/05-feedback.xml similarity index 100% rename from res/values-it/05-feedback.xml rename to AnkiDroid/src/main/res/values-it/05-feedback.xml diff --git a/res/values-it/06-statistics.xml b/AnkiDroid/src/main/res/values-it/06-statistics.xml similarity index 100% rename from res/values-it/06-statistics.xml rename to AnkiDroid/src/main/res/values-it/06-statistics.xml diff --git a/res/values-it/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-it/07-cardbrowser.xml similarity index 100% rename from res/values-it/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-it/07-cardbrowser.xml diff --git a/res/values-it/08-widget.xml b/AnkiDroid/src/main/res/values-it/08-widget.xml similarity index 100% rename from res/values-it/08-widget.xml rename to AnkiDroid/src/main/res/values-it/08-widget.xml diff --git a/res/values-it/09-backup.xml b/AnkiDroid/src/main/res/values-it/09-backup.xml similarity index 100% rename from res/values-it/09-backup.xml rename to AnkiDroid/src/main/res/values-it/09-backup.xml diff --git a/res/values-it/10-preferences.xml b/AnkiDroid/src/main/res/values-it/10-preferences.xml similarity index 100% rename from res/values-it/10-preferences.xml rename to AnkiDroid/src/main/res/values-it/10-preferences.xml diff --git a/res/values-it/11-arrays.xml b/AnkiDroid/src/main/res/values-it/11-arrays.xml similarity index 100% rename from res/values-it/11-arrays.xml rename to AnkiDroid/src/main/res/values-it/11-arrays.xml diff --git a/res/values-it/13-newfeatures.xml b/AnkiDroid/src/main/res/values-it/13-newfeatures.xml similarity index 100% rename from res/values-it/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-it/13-newfeatures.xml diff --git a/res/values-ja/01-core.xml b/AnkiDroid/src/main/res/values-ja/01-core.xml similarity index 100% rename from res/values-ja/01-core.xml rename to AnkiDroid/src/main/res/values-ja/01-core.xml diff --git a/res/values-ja/02-strings.xml b/AnkiDroid/src/main/res/values-ja/02-strings.xml similarity index 100% rename from res/values-ja/02-strings.xml rename to AnkiDroid/src/main/res/values-ja/02-strings.xml diff --git a/res/values-ja/03-dialogs.xml b/AnkiDroid/src/main/res/values-ja/03-dialogs.xml similarity index 100% rename from res/values-ja/03-dialogs.xml rename to AnkiDroid/src/main/res/values-ja/03-dialogs.xml diff --git a/res/values-ja/04-network.xml b/AnkiDroid/src/main/res/values-ja/04-network.xml similarity index 100% rename from res/values-ja/04-network.xml rename to AnkiDroid/src/main/res/values-ja/04-network.xml diff --git a/res/values-ja/05-feedback.xml b/AnkiDroid/src/main/res/values-ja/05-feedback.xml similarity index 100% rename from res/values-ja/05-feedback.xml rename to AnkiDroid/src/main/res/values-ja/05-feedback.xml diff --git a/res/values-ja/06-statistics.xml b/AnkiDroid/src/main/res/values-ja/06-statistics.xml similarity index 100% rename from res/values-ja/06-statistics.xml rename to AnkiDroid/src/main/res/values-ja/06-statistics.xml diff --git a/res/values-ja/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml similarity index 100% rename from res/values-ja/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-ja/07-cardbrowser.xml diff --git a/res/values-ja/08-widget.xml b/AnkiDroid/src/main/res/values-ja/08-widget.xml similarity index 100% rename from res/values-ja/08-widget.xml rename to AnkiDroid/src/main/res/values-ja/08-widget.xml diff --git a/res/values-ja/09-backup.xml b/AnkiDroid/src/main/res/values-ja/09-backup.xml similarity index 100% rename from res/values-ja/09-backup.xml rename to AnkiDroid/src/main/res/values-ja/09-backup.xml diff --git a/res/values-ja/10-preferences.xml b/AnkiDroid/src/main/res/values-ja/10-preferences.xml similarity index 100% rename from res/values-ja/10-preferences.xml rename to AnkiDroid/src/main/res/values-ja/10-preferences.xml diff --git a/res/values-ja/11-arrays.xml b/AnkiDroid/src/main/res/values-ja/11-arrays.xml similarity index 100% rename from res/values-ja/11-arrays.xml rename to AnkiDroid/src/main/res/values-ja/11-arrays.xml diff --git a/res/values-ja/13-newfeatures.xml b/AnkiDroid/src/main/res/values-ja/13-newfeatures.xml similarity index 100% rename from res/values-ja/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-ja/13-newfeatures.xml diff --git a/res/values-ko/01-core.xml b/AnkiDroid/src/main/res/values-ko/01-core.xml similarity index 100% rename from res/values-ko/01-core.xml rename to AnkiDroid/src/main/res/values-ko/01-core.xml diff --git a/res/values-ko/02-strings.xml b/AnkiDroid/src/main/res/values-ko/02-strings.xml similarity index 100% rename from res/values-ko/02-strings.xml rename to AnkiDroid/src/main/res/values-ko/02-strings.xml diff --git a/res/values-ko/03-dialogs.xml b/AnkiDroid/src/main/res/values-ko/03-dialogs.xml similarity index 100% rename from res/values-ko/03-dialogs.xml rename to AnkiDroid/src/main/res/values-ko/03-dialogs.xml diff --git a/res/values-ko/04-network.xml b/AnkiDroid/src/main/res/values-ko/04-network.xml similarity index 100% rename from res/values-ko/04-network.xml rename to AnkiDroid/src/main/res/values-ko/04-network.xml diff --git a/res/values-ko/05-feedback.xml b/AnkiDroid/src/main/res/values-ko/05-feedback.xml similarity index 100% rename from res/values-ko/05-feedback.xml rename to AnkiDroid/src/main/res/values-ko/05-feedback.xml diff --git a/res/values-ko/06-statistics.xml b/AnkiDroid/src/main/res/values-ko/06-statistics.xml similarity index 100% rename from res/values-ko/06-statistics.xml rename to AnkiDroid/src/main/res/values-ko/06-statistics.xml diff --git a/res/values-ko/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml similarity index 100% rename from res/values-ko/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-ko/07-cardbrowser.xml diff --git a/res/values-ko/08-widget.xml b/AnkiDroid/src/main/res/values-ko/08-widget.xml similarity index 100% rename from res/values-ko/08-widget.xml rename to AnkiDroid/src/main/res/values-ko/08-widget.xml diff --git a/res/values-ko/09-backup.xml b/AnkiDroid/src/main/res/values-ko/09-backup.xml similarity index 100% rename from res/values-ko/09-backup.xml rename to AnkiDroid/src/main/res/values-ko/09-backup.xml diff --git a/res/values-ko/10-preferences.xml b/AnkiDroid/src/main/res/values-ko/10-preferences.xml similarity index 100% rename from res/values-ko/10-preferences.xml rename to AnkiDroid/src/main/res/values-ko/10-preferences.xml diff --git a/res/values-ko/11-arrays.xml b/AnkiDroid/src/main/res/values-ko/11-arrays.xml similarity index 100% rename from res/values-ko/11-arrays.xml rename to AnkiDroid/src/main/res/values-ko/11-arrays.xml diff --git a/res/values-ko/13-newfeatures.xml b/AnkiDroid/src/main/res/values-ko/13-newfeatures.xml similarity index 100% rename from res/values-ko/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-ko/13-newfeatures.xml diff --git a/res/values-land/dimens.xml b/AnkiDroid/src/main/res/values-land/dimens.xml similarity index 100% rename from res/values-land/dimens.xml rename to AnkiDroid/src/main/res/values-land/dimens.xml diff --git a/res/values-lt/01-core.xml b/AnkiDroid/src/main/res/values-lt/01-core.xml similarity index 100% rename from res/values-lt/01-core.xml rename to AnkiDroid/src/main/res/values-lt/01-core.xml diff --git a/res/values-lt/02-strings.xml b/AnkiDroid/src/main/res/values-lt/02-strings.xml similarity index 100% rename from res/values-lt/02-strings.xml rename to AnkiDroid/src/main/res/values-lt/02-strings.xml diff --git a/res/values-lt/03-dialogs.xml b/AnkiDroid/src/main/res/values-lt/03-dialogs.xml similarity index 100% rename from res/values-lt/03-dialogs.xml rename to AnkiDroid/src/main/res/values-lt/03-dialogs.xml diff --git a/res/values-lt/04-network.xml b/AnkiDroid/src/main/res/values-lt/04-network.xml similarity index 100% rename from res/values-lt/04-network.xml rename to AnkiDroid/src/main/res/values-lt/04-network.xml diff --git a/res/values-lt/05-feedback.xml b/AnkiDroid/src/main/res/values-lt/05-feedback.xml similarity index 100% rename from res/values-lt/05-feedback.xml rename to AnkiDroid/src/main/res/values-lt/05-feedback.xml diff --git a/res/values-lt/06-statistics.xml b/AnkiDroid/src/main/res/values-lt/06-statistics.xml similarity index 100% rename from res/values-lt/06-statistics.xml rename to AnkiDroid/src/main/res/values-lt/06-statistics.xml diff --git a/res/values-lt/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-lt/07-cardbrowser.xml similarity index 100% rename from res/values-lt/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-lt/07-cardbrowser.xml diff --git a/res/values-lt/08-widget.xml b/AnkiDroid/src/main/res/values-lt/08-widget.xml similarity index 100% rename from res/values-lt/08-widget.xml rename to AnkiDroid/src/main/res/values-lt/08-widget.xml diff --git a/res/values-lt/09-backup.xml b/AnkiDroid/src/main/res/values-lt/09-backup.xml similarity index 100% rename from res/values-lt/09-backup.xml rename to AnkiDroid/src/main/res/values-lt/09-backup.xml diff --git a/res/values-lt/10-preferences.xml b/AnkiDroid/src/main/res/values-lt/10-preferences.xml similarity index 100% rename from res/values-lt/10-preferences.xml rename to AnkiDroid/src/main/res/values-lt/10-preferences.xml diff --git a/res/values-lt/11-arrays.xml b/AnkiDroid/src/main/res/values-lt/11-arrays.xml similarity index 100% rename from res/values-lt/11-arrays.xml rename to AnkiDroid/src/main/res/values-lt/11-arrays.xml diff --git a/res/values-lt/13-newfeatures.xml b/AnkiDroid/src/main/res/values-lt/13-newfeatures.xml similarity index 100% rename from res/values-lt/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-lt/13-newfeatures.xml diff --git a/res/values-lv/01-core.xml b/AnkiDroid/src/main/res/values-lv/01-core.xml similarity index 100% rename from res/values-lv/01-core.xml rename to AnkiDroid/src/main/res/values-lv/01-core.xml diff --git a/res/values-lv/02-strings.xml b/AnkiDroid/src/main/res/values-lv/02-strings.xml similarity index 100% rename from res/values-lv/02-strings.xml rename to AnkiDroid/src/main/res/values-lv/02-strings.xml diff --git a/res/values-lv/03-dialogs.xml b/AnkiDroid/src/main/res/values-lv/03-dialogs.xml similarity index 100% rename from res/values-lv/03-dialogs.xml rename to AnkiDroid/src/main/res/values-lv/03-dialogs.xml diff --git a/res/values-lv/04-network.xml b/AnkiDroid/src/main/res/values-lv/04-network.xml similarity index 100% rename from res/values-lv/04-network.xml rename to AnkiDroid/src/main/res/values-lv/04-network.xml diff --git a/res/values-lv/05-feedback.xml b/AnkiDroid/src/main/res/values-lv/05-feedback.xml similarity index 100% rename from res/values-lv/05-feedback.xml rename to AnkiDroid/src/main/res/values-lv/05-feedback.xml diff --git a/res/values-lv/06-statistics.xml b/AnkiDroid/src/main/res/values-lv/06-statistics.xml similarity index 100% rename from res/values-lv/06-statistics.xml rename to AnkiDroid/src/main/res/values-lv/06-statistics.xml diff --git a/res/values-lv/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-lv/07-cardbrowser.xml similarity index 100% rename from res/values-lv/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-lv/07-cardbrowser.xml diff --git a/res/values-lv/08-widget.xml b/AnkiDroid/src/main/res/values-lv/08-widget.xml similarity index 100% rename from res/values-lv/08-widget.xml rename to AnkiDroid/src/main/res/values-lv/08-widget.xml diff --git a/res/values-lv/09-backup.xml b/AnkiDroid/src/main/res/values-lv/09-backup.xml similarity index 100% rename from res/values-lv/09-backup.xml rename to AnkiDroid/src/main/res/values-lv/09-backup.xml diff --git a/res/values-lv/10-preferences.xml b/AnkiDroid/src/main/res/values-lv/10-preferences.xml similarity index 100% rename from res/values-lv/10-preferences.xml rename to AnkiDroid/src/main/res/values-lv/10-preferences.xml diff --git a/res/values-lv/11-arrays.xml b/AnkiDroid/src/main/res/values-lv/11-arrays.xml similarity index 100% rename from res/values-lv/11-arrays.xml rename to AnkiDroid/src/main/res/values-lv/11-arrays.xml diff --git a/res/values-lv/13-newfeatures.xml b/AnkiDroid/src/main/res/values-lv/13-newfeatures.xml similarity index 100% rename from res/values-lv/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-lv/13-newfeatures.xml diff --git a/res/values-nl/01-core.xml b/AnkiDroid/src/main/res/values-nl/01-core.xml similarity index 100% rename from res/values-nl/01-core.xml rename to AnkiDroid/src/main/res/values-nl/01-core.xml diff --git a/res/values-nl/02-strings.xml b/AnkiDroid/src/main/res/values-nl/02-strings.xml similarity index 100% rename from res/values-nl/02-strings.xml rename to AnkiDroid/src/main/res/values-nl/02-strings.xml diff --git a/res/values-nl/03-dialogs.xml b/AnkiDroid/src/main/res/values-nl/03-dialogs.xml similarity index 100% rename from res/values-nl/03-dialogs.xml rename to AnkiDroid/src/main/res/values-nl/03-dialogs.xml diff --git a/res/values-nl/04-network.xml b/AnkiDroid/src/main/res/values-nl/04-network.xml similarity index 100% rename from res/values-nl/04-network.xml rename to AnkiDroid/src/main/res/values-nl/04-network.xml diff --git a/res/values-nl/05-feedback.xml b/AnkiDroid/src/main/res/values-nl/05-feedback.xml similarity index 100% rename from res/values-nl/05-feedback.xml rename to AnkiDroid/src/main/res/values-nl/05-feedback.xml diff --git a/res/values-nl/06-statistics.xml b/AnkiDroid/src/main/res/values-nl/06-statistics.xml similarity index 100% rename from res/values-nl/06-statistics.xml rename to AnkiDroid/src/main/res/values-nl/06-statistics.xml diff --git a/res/values-nl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-nl/07-cardbrowser.xml similarity index 100% rename from res/values-nl/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-nl/07-cardbrowser.xml diff --git a/res/values-nl/08-widget.xml b/AnkiDroid/src/main/res/values-nl/08-widget.xml similarity index 100% rename from res/values-nl/08-widget.xml rename to AnkiDroid/src/main/res/values-nl/08-widget.xml diff --git a/res/values-nl/09-backup.xml b/AnkiDroid/src/main/res/values-nl/09-backup.xml similarity index 100% rename from res/values-nl/09-backup.xml rename to AnkiDroid/src/main/res/values-nl/09-backup.xml diff --git a/res/values-nl/10-preferences.xml b/AnkiDroid/src/main/res/values-nl/10-preferences.xml similarity index 100% rename from res/values-nl/10-preferences.xml rename to AnkiDroid/src/main/res/values-nl/10-preferences.xml diff --git a/res/values-nl/11-arrays.xml b/AnkiDroid/src/main/res/values-nl/11-arrays.xml similarity index 100% rename from res/values-nl/11-arrays.xml rename to AnkiDroid/src/main/res/values-nl/11-arrays.xml diff --git a/res/values-nl/13-newfeatures.xml b/AnkiDroid/src/main/res/values-nl/13-newfeatures.xml similarity index 100% rename from res/values-nl/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-nl/13-newfeatures.xml diff --git a/res/values-no/01-core.xml b/AnkiDroid/src/main/res/values-no/01-core.xml similarity index 100% rename from res/values-no/01-core.xml rename to AnkiDroid/src/main/res/values-no/01-core.xml diff --git a/res/values-no/02-strings.xml b/AnkiDroid/src/main/res/values-no/02-strings.xml similarity index 100% rename from res/values-no/02-strings.xml rename to AnkiDroid/src/main/res/values-no/02-strings.xml diff --git a/res/values-no/03-dialogs.xml b/AnkiDroid/src/main/res/values-no/03-dialogs.xml similarity index 100% rename from res/values-no/03-dialogs.xml rename to AnkiDroid/src/main/res/values-no/03-dialogs.xml diff --git a/res/values-no/04-network.xml b/AnkiDroid/src/main/res/values-no/04-network.xml similarity index 100% rename from res/values-no/04-network.xml rename to AnkiDroid/src/main/res/values-no/04-network.xml diff --git a/res/values-no/05-feedback.xml b/AnkiDroid/src/main/res/values-no/05-feedback.xml similarity index 100% rename from res/values-no/05-feedback.xml rename to AnkiDroid/src/main/res/values-no/05-feedback.xml diff --git a/res/values-no/06-statistics.xml b/AnkiDroid/src/main/res/values-no/06-statistics.xml similarity index 100% rename from res/values-no/06-statistics.xml rename to AnkiDroid/src/main/res/values-no/06-statistics.xml diff --git a/res/values-no/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-no/07-cardbrowser.xml similarity index 100% rename from res/values-no/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-no/07-cardbrowser.xml diff --git a/res/values-no/08-widget.xml b/AnkiDroid/src/main/res/values-no/08-widget.xml similarity index 100% rename from res/values-no/08-widget.xml rename to AnkiDroid/src/main/res/values-no/08-widget.xml diff --git a/res/values-no/09-backup.xml b/AnkiDroid/src/main/res/values-no/09-backup.xml similarity index 100% rename from res/values-no/09-backup.xml rename to AnkiDroid/src/main/res/values-no/09-backup.xml diff --git a/res/values-no/10-preferences.xml b/AnkiDroid/src/main/res/values-no/10-preferences.xml similarity index 100% rename from res/values-no/10-preferences.xml rename to AnkiDroid/src/main/res/values-no/10-preferences.xml diff --git a/res/values-no/11-arrays.xml b/AnkiDroid/src/main/res/values-no/11-arrays.xml similarity index 100% rename from res/values-no/11-arrays.xml rename to AnkiDroid/src/main/res/values-no/11-arrays.xml diff --git a/res/values-no/13-newfeatures.xml b/AnkiDroid/src/main/res/values-no/13-newfeatures.xml similarity index 100% rename from res/values-no/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-no/13-newfeatures.xml diff --git a/res/values-pl/01-core.xml b/AnkiDroid/src/main/res/values-pl/01-core.xml similarity index 100% rename from res/values-pl/01-core.xml rename to AnkiDroid/src/main/res/values-pl/01-core.xml diff --git a/res/values-pl/02-strings.xml b/AnkiDroid/src/main/res/values-pl/02-strings.xml similarity index 100% rename from res/values-pl/02-strings.xml rename to AnkiDroid/src/main/res/values-pl/02-strings.xml diff --git a/res/values-pl/03-dialogs.xml b/AnkiDroid/src/main/res/values-pl/03-dialogs.xml similarity index 100% rename from res/values-pl/03-dialogs.xml rename to AnkiDroid/src/main/res/values-pl/03-dialogs.xml diff --git a/res/values-pl/04-network.xml b/AnkiDroid/src/main/res/values-pl/04-network.xml similarity index 100% rename from res/values-pl/04-network.xml rename to AnkiDroid/src/main/res/values-pl/04-network.xml diff --git a/res/values-pl/05-feedback.xml b/AnkiDroid/src/main/res/values-pl/05-feedback.xml similarity index 100% rename from res/values-pl/05-feedback.xml rename to AnkiDroid/src/main/res/values-pl/05-feedback.xml diff --git a/res/values-pl/06-statistics.xml b/AnkiDroid/src/main/res/values-pl/06-statistics.xml similarity index 100% rename from res/values-pl/06-statistics.xml rename to AnkiDroid/src/main/res/values-pl/06-statistics.xml diff --git a/res/values-pl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml similarity index 100% rename from res/values-pl/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-pl/07-cardbrowser.xml diff --git a/res/values-pl/08-widget.xml b/AnkiDroid/src/main/res/values-pl/08-widget.xml similarity index 100% rename from res/values-pl/08-widget.xml rename to AnkiDroid/src/main/res/values-pl/08-widget.xml diff --git a/res/values-pl/09-backup.xml b/AnkiDroid/src/main/res/values-pl/09-backup.xml similarity index 100% rename from res/values-pl/09-backup.xml rename to AnkiDroid/src/main/res/values-pl/09-backup.xml diff --git a/res/values-pl/10-preferences.xml b/AnkiDroid/src/main/res/values-pl/10-preferences.xml similarity index 100% rename from res/values-pl/10-preferences.xml rename to AnkiDroid/src/main/res/values-pl/10-preferences.xml diff --git a/res/values-pl/11-arrays.xml b/AnkiDroid/src/main/res/values-pl/11-arrays.xml similarity index 100% rename from res/values-pl/11-arrays.xml rename to AnkiDroid/src/main/res/values-pl/11-arrays.xml diff --git a/res/values-pl/13-newfeatures.xml b/AnkiDroid/src/main/res/values-pl/13-newfeatures.xml similarity index 100% rename from res/values-pl/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-pl/13-newfeatures.xml diff --git a/res/values-pt-rBR/01-core.xml b/AnkiDroid/src/main/res/values-pt-rBR/01-core.xml similarity index 100% rename from res/values-pt-rBR/01-core.xml rename to AnkiDroid/src/main/res/values-pt-rBR/01-core.xml diff --git a/res/values-pt-rBR/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml similarity index 100% rename from res/values-pt-rBR/02-strings.xml rename to AnkiDroid/src/main/res/values-pt-rBR/02-strings.xml diff --git a/res/values-pt-rBR/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml similarity index 100% rename from res/values-pt-rBR/03-dialogs.xml rename to AnkiDroid/src/main/res/values-pt-rBR/03-dialogs.xml diff --git a/res/values-pt-rBR/04-network.xml b/AnkiDroid/src/main/res/values-pt-rBR/04-network.xml similarity index 100% rename from res/values-pt-rBR/04-network.xml rename to AnkiDroid/src/main/res/values-pt-rBR/04-network.xml diff --git a/res/values-pt-rBR/05-feedback.xml b/AnkiDroid/src/main/res/values-pt-rBR/05-feedback.xml similarity index 100% rename from res/values-pt-rBR/05-feedback.xml rename to AnkiDroid/src/main/res/values-pt-rBR/05-feedback.xml diff --git a/res/values-pt-rBR/06-statistics.xml b/AnkiDroid/src/main/res/values-pt-rBR/06-statistics.xml similarity index 100% rename from res/values-pt-rBR/06-statistics.xml rename to AnkiDroid/src/main/res/values-pt-rBR/06-statistics.xml diff --git a/res/values-pt-rBR/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml similarity index 100% rename from res/values-pt-rBR/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-pt-rBR/07-cardbrowser.xml diff --git a/res/values-pt-rBR/08-widget.xml b/AnkiDroid/src/main/res/values-pt-rBR/08-widget.xml similarity index 100% rename from res/values-pt-rBR/08-widget.xml rename to AnkiDroid/src/main/res/values-pt-rBR/08-widget.xml diff --git a/res/values-pt-rBR/09-backup.xml b/AnkiDroid/src/main/res/values-pt-rBR/09-backup.xml similarity index 100% rename from res/values-pt-rBR/09-backup.xml rename to AnkiDroid/src/main/res/values-pt-rBR/09-backup.xml diff --git a/res/values-pt-rBR/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml similarity index 100% rename from res/values-pt-rBR/10-preferences.xml rename to AnkiDroid/src/main/res/values-pt-rBR/10-preferences.xml diff --git a/res/values-pt-rBR/11-arrays.xml b/AnkiDroid/src/main/res/values-pt-rBR/11-arrays.xml similarity index 100% rename from res/values-pt-rBR/11-arrays.xml rename to AnkiDroid/src/main/res/values-pt-rBR/11-arrays.xml diff --git a/res/values-pt-rBR/13-newfeatures.xml b/AnkiDroid/src/main/res/values-pt-rBR/13-newfeatures.xml similarity index 100% rename from res/values-pt-rBR/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-pt-rBR/13-newfeatures.xml diff --git a/res/values-pt-rPT/01-core.xml b/AnkiDroid/src/main/res/values-pt-rPT/01-core.xml similarity index 100% rename from res/values-pt-rPT/01-core.xml rename to AnkiDroid/src/main/res/values-pt-rPT/01-core.xml diff --git a/res/values-pt-rPT/02-strings.xml b/AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml similarity index 100% rename from res/values-pt-rPT/02-strings.xml rename to AnkiDroid/src/main/res/values-pt-rPT/02-strings.xml diff --git a/res/values-pt-rPT/03-dialogs.xml b/AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml similarity index 100% rename from res/values-pt-rPT/03-dialogs.xml rename to AnkiDroid/src/main/res/values-pt-rPT/03-dialogs.xml diff --git a/res/values-pt-rPT/04-network.xml b/AnkiDroid/src/main/res/values-pt-rPT/04-network.xml similarity index 100% rename from res/values-pt-rPT/04-network.xml rename to AnkiDroid/src/main/res/values-pt-rPT/04-network.xml diff --git a/res/values-pt-rPT/05-feedback.xml b/AnkiDroid/src/main/res/values-pt-rPT/05-feedback.xml similarity index 100% rename from res/values-pt-rPT/05-feedback.xml rename to AnkiDroid/src/main/res/values-pt-rPT/05-feedback.xml diff --git a/res/values-pt-rPT/06-statistics.xml b/AnkiDroid/src/main/res/values-pt-rPT/06-statistics.xml similarity index 100% rename from res/values-pt-rPT/06-statistics.xml rename to AnkiDroid/src/main/res/values-pt-rPT/06-statistics.xml diff --git a/res/values-pt-rPT/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml similarity index 100% rename from res/values-pt-rPT/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-pt-rPT/07-cardbrowser.xml diff --git a/res/values-pt-rPT/08-widget.xml b/AnkiDroid/src/main/res/values-pt-rPT/08-widget.xml similarity index 100% rename from res/values-pt-rPT/08-widget.xml rename to AnkiDroid/src/main/res/values-pt-rPT/08-widget.xml diff --git a/res/values-pt-rPT/09-backup.xml b/AnkiDroid/src/main/res/values-pt-rPT/09-backup.xml similarity index 100% rename from res/values-pt-rPT/09-backup.xml rename to AnkiDroid/src/main/res/values-pt-rPT/09-backup.xml diff --git a/res/values-pt-rPT/10-preferences.xml b/AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml similarity index 100% rename from res/values-pt-rPT/10-preferences.xml rename to AnkiDroid/src/main/res/values-pt-rPT/10-preferences.xml diff --git a/res/values-pt-rPT/11-arrays.xml b/AnkiDroid/src/main/res/values-pt-rPT/11-arrays.xml similarity index 100% rename from res/values-pt-rPT/11-arrays.xml rename to AnkiDroid/src/main/res/values-pt-rPT/11-arrays.xml diff --git a/res/values-pt-rPT/13-newfeatures.xml b/AnkiDroid/src/main/res/values-pt-rPT/13-newfeatures.xml similarity index 100% rename from res/values-pt-rPT/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-pt-rPT/13-newfeatures.xml diff --git a/res/values-ro/01-core.xml b/AnkiDroid/src/main/res/values-ro/01-core.xml similarity index 100% rename from res/values-ro/01-core.xml rename to AnkiDroid/src/main/res/values-ro/01-core.xml diff --git a/res/values-ro/02-strings.xml b/AnkiDroid/src/main/res/values-ro/02-strings.xml similarity index 100% rename from res/values-ro/02-strings.xml rename to AnkiDroid/src/main/res/values-ro/02-strings.xml diff --git a/res/values-ro/03-dialogs.xml b/AnkiDroid/src/main/res/values-ro/03-dialogs.xml similarity index 100% rename from res/values-ro/03-dialogs.xml rename to AnkiDroid/src/main/res/values-ro/03-dialogs.xml diff --git a/res/values-ro/04-network.xml b/AnkiDroid/src/main/res/values-ro/04-network.xml similarity index 100% rename from res/values-ro/04-network.xml rename to AnkiDroid/src/main/res/values-ro/04-network.xml diff --git a/res/values-ro/05-feedback.xml b/AnkiDroid/src/main/res/values-ro/05-feedback.xml similarity index 100% rename from res/values-ro/05-feedback.xml rename to AnkiDroid/src/main/res/values-ro/05-feedback.xml diff --git a/res/values-ro/06-statistics.xml b/AnkiDroid/src/main/res/values-ro/06-statistics.xml similarity index 100% rename from res/values-ro/06-statistics.xml rename to AnkiDroid/src/main/res/values-ro/06-statistics.xml diff --git a/res/values-ro/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ro/07-cardbrowser.xml similarity index 100% rename from res/values-ro/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-ro/07-cardbrowser.xml diff --git a/res/values-ro/08-widget.xml b/AnkiDroid/src/main/res/values-ro/08-widget.xml similarity index 100% rename from res/values-ro/08-widget.xml rename to AnkiDroid/src/main/res/values-ro/08-widget.xml diff --git a/res/values-ro/09-backup.xml b/AnkiDroid/src/main/res/values-ro/09-backup.xml similarity index 100% rename from res/values-ro/09-backup.xml rename to AnkiDroid/src/main/res/values-ro/09-backup.xml diff --git a/res/values-ro/10-preferences.xml b/AnkiDroid/src/main/res/values-ro/10-preferences.xml similarity index 100% rename from res/values-ro/10-preferences.xml rename to AnkiDroid/src/main/res/values-ro/10-preferences.xml diff --git a/res/values-ro/11-arrays.xml b/AnkiDroid/src/main/res/values-ro/11-arrays.xml similarity index 100% rename from res/values-ro/11-arrays.xml rename to AnkiDroid/src/main/res/values-ro/11-arrays.xml diff --git a/res/values-ro/13-newfeatures.xml b/AnkiDroid/src/main/res/values-ro/13-newfeatures.xml similarity index 100% rename from res/values-ro/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-ro/13-newfeatures.xml diff --git a/res/values-ru/01-core.xml b/AnkiDroid/src/main/res/values-ru/01-core.xml similarity index 100% rename from res/values-ru/01-core.xml rename to AnkiDroid/src/main/res/values-ru/01-core.xml diff --git a/res/values-ru/02-strings.xml b/AnkiDroid/src/main/res/values-ru/02-strings.xml similarity index 100% rename from res/values-ru/02-strings.xml rename to AnkiDroid/src/main/res/values-ru/02-strings.xml diff --git a/res/values-ru/03-dialogs.xml b/AnkiDroid/src/main/res/values-ru/03-dialogs.xml similarity index 100% rename from res/values-ru/03-dialogs.xml rename to AnkiDroid/src/main/res/values-ru/03-dialogs.xml diff --git a/res/values-ru/04-network.xml b/AnkiDroid/src/main/res/values-ru/04-network.xml similarity index 100% rename from res/values-ru/04-network.xml rename to AnkiDroid/src/main/res/values-ru/04-network.xml diff --git a/res/values-ru/05-feedback.xml b/AnkiDroid/src/main/res/values-ru/05-feedback.xml similarity index 100% rename from res/values-ru/05-feedback.xml rename to AnkiDroid/src/main/res/values-ru/05-feedback.xml diff --git a/res/values-ru/06-statistics.xml b/AnkiDroid/src/main/res/values-ru/06-statistics.xml similarity index 100% rename from res/values-ru/06-statistics.xml rename to AnkiDroid/src/main/res/values-ru/06-statistics.xml diff --git a/res/values-ru/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml similarity index 100% rename from res/values-ru/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-ru/07-cardbrowser.xml diff --git a/res/values-ru/08-widget.xml b/AnkiDroid/src/main/res/values-ru/08-widget.xml similarity index 100% rename from res/values-ru/08-widget.xml rename to AnkiDroid/src/main/res/values-ru/08-widget.xml diff --git a/res/values-ru/09-backup.xml b/AnkiDroid/src/main/res/values-ru/09-backup.xml similarity index 100% rename from res/values-ru/09-backup.xml rename to AnkiDroid/src/main/res/values-ru/09-backup.xml diff --git a/res/values-ru/10-preferences.xml b/AnkiDroid/src/main/res/values-ru/10-preferences.xml similarity index 100% rename from res/values-ru/10-preferences.xml rename to AnkiDroid/src/main/res/values-ru/10-preferences.xml diff --git a/res/values-ru/11-arrays.xml b/AnkiDroid/src/main/res/values-ru/11-arrays.xml similarity index 100% rename from res/values-ru/11-arrays.xml rename to AnkiDroid/src/main/res/values-ru/11-arrays.xml diff --git a/res/values-ru/13-newfeatures.xml b/AnkiDroid/src/main/res/values-ru/13-newfeatures.xml similarity index 100% rename from res/values-ru/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-ru/13-newfeatures.xml diff --git a/res/values-sk/01-core.xml b/AnkiDroid/src/main/res/values-sk/01-core.xml similarity index 100% rename from res/values-sk/01-core.xml rename to AnkiDroid/src/main/res/values-sk/01-core.xml diff --git a/res/values-sk/02-strings.xml b/AnkiDroid/src/main/res/values-sk/02-strings.xml similarity index 100% rename from res/values-sk/02-strings.xml rename to AnkiDroid/src/main/res/values-sk/02-strings.xml diff --git a/res/values-sk/03-dialogs.xml b/AnkiDroid/src/main/res/values-sk/03-dialogs.xml similarity index 100% rename from res/values-sk/03-dialogs.xml rename to AnkiDroid/src/main/res/values-sk/03-dialogs.xml diff --git a/res/values-sk/04-network.xml b/AnkiDroid/src/main/res/values-sk/04-network.xml similarity index 100% rename from res/values-sk/04-network.xml rename to AnkiDroid/src/main/res/values-sk/04-network.xml diff --git a/res/values-sk/05-feedback.xml b/AnkiDroid/src/main/res/values-sk/05-feedback.xml similarity index 100% rename from res/values-sk/05-feedback.xml rename to AnkiDroid/src/main/res/values-sk/05-feedback.xml diff --git a/res/values-sk/06-statistics.xml b/AnkiDroid/src/main/res/values-sk/06-statistics.xml similarity index 100% rename from res/values-sk/06-statistics.xml rename to AnkiDroid/src/main/res/values-sk/06-statistics.xml diff --git a/res/values-sk/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sk/07-cardbrowser.xml similarity index 100% rename from res/values-sk/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-sk/07-cardbrowser.xml diff --git a/res/values-sk/08-widget.xml b/AnkiDroid/src/main/res/values-sk/08-widget.xml similarity index 100% rename from res/values-sk/08-widget.xml rename to AnkiDroid/src/main/res/values-sk/08-widget.xml diff --git a/res/values-sk/09-backup.xml b/AnkiDroid/src/main/res/values-sk/09-backup.xml similarity index 100% rename from res/values-sk/09-backup.xml rename to AnkiDroid/src/main/res/values-sk/09-backup.xml diff --git a/res/values-sk/10-preferences.xml b/AnkiDroid/src/main/res/values-sk/10-preferences.xml similarity index 100% rename from res/values-sk/10-preferences.xml rename to AnkiDroid/src/main/res/values-sk/10-preferences.xml diff --git a/res/values-sk/11-arrays.xml b/AnkiDroid/src/main/res/values-sk/11-arrays.xml similarity index 100% rename from res/values-sk/11-arrays.xml rename to AnkiDroid/src/main/res/values-sk/11-arrays.xml diff --git a/res/values-sk/13-newfeatures.xml b/AnkiDroid/src/main/res/values-sk/13-newfeatures.xml similarity index 100% rename from res/values-sk/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-sk/13-newfeatures.xml diff --git a/res/values-sl/01-core.xml b/AnkiDroid/src/main/res/values-sl/01-core.xml similarity index 100% rename from res/values-sl/01-core.xml rename to AnkiDroid/src/main/res/values-sl/01-core.xml diff --git a/res/values-sl/02-strings.xml b/AnkiDroid/src/main/res/values-sl/02-strings.xml similarity index 100% rename from res/values-sl/02-strings.xml rename to AnkiDroid/src/main/res/values-sl/02-strings.xml diff --git a/res/values-sl/03-dialogs.xml b/AnkiDroid/src/main/res/values-sl/03-dialogs.xml similarity index 100% rename from res/values-sl/03-dialogs.xml rename to AnkiDroid/src/main/res/values-sl/03-dialogs.xml diff --git a/res/values-sl/04-network.xml b/AnkiDroid/src/main/res/values-sl/04-network.xml similarity index 100% rename from res/values-sl/04-network.xml rename to AnkiDroid/src/main/res/values-sl/04-network.xml diff --git a/res/values-sl/05-feedback.xml b/AnkiDroid/src/main/res/values-sl/05-feedback.xml similarity index 100% rename from res/values-sl/05-feedback.xml rename to AnkiDroid/src/main/res/values-sl/05-feedback.xml diff --git a/res/values-sl/06-statistics.xml b/AnkiDroid/src/main/res/values-sl/06-statistics.xml similarity index 100% rename from res/values-sl/06-statistics.xml rename to AnkiDroid/src/main/res/values-sl/06-statistics.xml diff --git a/res/values-sl/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sl/07-cardbrowser.xml similarity index 100% rename from res/values-sl/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-sl/07-cardbrowser.xml diff --git a/res/values-sl/08-widget.xml b/AnkiDroid/src/main/res/values-sl/08-widget.xml similarity index 100% rename from res/values-sl/08-widget.xml rename to AnkiDroid/src/main/res/values-sl/08-widget.xml diff --git a/res/values-sl/09-backup.xml b/AnkiDroid/src/main/res/values-sl/09-backup.xml similarity index 100% rename from res/values-sl/09-backup.xml rename to AnkiDroid/src/main/res/values-sl/09-backup.xml diff --git a/res/values-sl/10-preferences.xml b/AnkiDroid/src/main/res/values-sl/10-preferences.xml similarity index 100% rename from res/values-sl/10-preferences.xml rename to AnkiDroid/src/main/res/values-sl/10-preferences.xml diff --git a/res/values-sl/11-arrays.xml b/AnkiDroid/src/main/res/values-sl/11-arrays.xml similarity index 100% rename from res/values-sl/11-arrays.xml rename to AnkiDroid/src/main/res/values-sl/11-arrays.xml diff --git a/res/values-sl/13-newfeatures.xml b/AnkiDroid/src/main/res/values-sl/13-newfeatures.xml similarity index 100% rename from res/values-sl/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-sl/13-newfeatures.xml diff --git a/res/values-sr/01-core.xml b/AnkiDroid/src/main/res/values-sr/01-core.xml similarity index 100% rename from res/values-sr/01-core.xml rename to AnkiDroid/src/main/res/values-sr/01-core.xml diff --git a/res/values-sr/02-strings.xml b/AnkiDroid/src/main/res/values-sr/02-strings.xml similarity index 100% rename from res/values-sr/02-strings.xml rename to AnkiDroid/src/main/res/values-sr/02-strings.xml diff --git a/res/values-sr/03-dialogs.xml b/AnkiDroid/src/main/res/values-sr/03-dialogs.xml similarity index 100% rename from res/values-sr/03-dialogs.xml rename to AnkiDroid/src/main/res/values-sr/03-dialogs.xml diff --git a/res/values-sr/04-network.xml b/AnkiDroid/src/main/res/values-sr/04-network.xml similarity index 100% rename from res/values-sr/04-network.xml rename to AnkiDroid/src/main/res/values-sr/04-network.xml diff --git a/res/values-sr/05-feedback.xml b/AnkiDroid/src/main/res/values-sr/05-feedback.xml similarity index 100% rename from res/values-sr/05-feedback.xml rename to AnkiDroid/src/main/res/values-sr/05-feedback.xml diff --git a/res/values-sr/06-statistics.xml b/AnkiDroid/src/main/res/values-sr/06-statistics.xml similarity index 100% rename from res/values-sr/06-statistics.xml rename to AnkiDroid/src/main/res/values-sr/06-statistics.xml diff --git a/res/values-sr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sr/07-cardbrowser.xml similarity index 100% rename from res/values-sr/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-sr/07-cardbrowser.xml diff --git a/res/values-sr/08-widget.xml b/AnkiDroid/src/main/res/values-sr/08-widget.xml similarity index 100% rename from res/values-sr/08-widget.xml rename to AnkiDroid/src/main/res/values-sr/08-widget.xml diff --git a/res/values-sr/09-backup.xml b/AnkiDroid/src/main/res/values-sr/09-backup.xml similarity index 100% rename from res/values-sr/09-backup.xml rename to AnkiDroid/src/main/res/values-sr/09-backup.xml diff --git a/res/values-sr/10-preferences.xml b/AnkiDroid/src/main/res/values-sr/10-preferences.xml similarity index 100% rename from res/values-sr/10-preferences.xml rename to AnkiDroid/src/main/res/values-sr/10-preferences.xml diff --git a/res/values-sr/11-arrays.xml b/AnkiDroid/src/main/res/values-sr/11-arrays.xml similarity index 100% rename from res/values-sr/11-arrays.xml rename to AnkiDroid/src/main/res/values-sr/11-arrays.xml diff --git a/res/values-sr/13-newfeatures.xml b/AnkiDroid/src/main/res/values-sr/13-newfeatures.xml similarity index 100% rename from res/values-sr/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-sr/13-newfeatures.xml diff --git a/res/values-sv/01-core.xml b/AnkiDroid/src/main/res/values-sv/01-core.xml similarity index 100% rename from res/values-sv/01-core.xml rename to AnkiDroid/src/main/res/values-sv/01-core.xml diff --git a/res/values-sv/02-strings.xml b/AnkiDroid/src/main/res/values-sv/02-strings.xml similarity index 100% rename from res/values-sv/02-strings.xml rename to AnkiDroid/src/main/res/values-sv/02-strings.xml diff --git a/res/values-sv/03-dialogs.xml b/AnkiDroid/src/main/res/values-sv/03-dialogs.xml similarity index 100% rename from res/values-sv/03-dialogs.xml rename to AnkiDroid/src/main/res/values-sv/03-dialogs.xml diff --git a/res/values-sv/04-network.xml b/AnkiDroid/src/main/res/values-sv/04-network.xml similarity index 100% rename from res/values-sv/04-network.xml rename to AnkiDroid/src/main/res/values-sv/04-network.xml diff --git a/res/values-sv/05-feedback.xml b/AnkiDroid/src/main/res/values-sv/05-feedback.xml similarity index 100% rename from res/values-sv/05-feedback.xml rename to AnkiDroid/src/main/res/values-sv/05-feedback.xml diff --git a/res/values-sv/06-statistics.xml b/AnkiDroid/src/main/res/values-sv/06-statistics.xml similarity index 100% rename from res/values-sv/06-statistics.xml rename to AnkiDroid/src/main/res/values-sv/06-statistics.xml diff --git a/res/values-sv/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-sv/07-cardbrowser.xml similarity index 100% rename from res/values-sv/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-sv/07-cardbrowser.xml diff --git a/res/values-sv/08-widget.xml b/AnkiDroid/src/main/res/values-sv/08-widget.xml similarity index 100% rename from res/values-sv/08-widget.xml rename to AnkiDroid/src/main/res/values-sv/08-widget.xml diff --git a/res/values-sv/09-backup.xml b/AnkiDroid/src/main/res/values-sv/09-backup.xml similarity index 100% rename from res/values-sv/09-backup.xml rename to AnkiDroid/src/main/res/values-sv/09-backup.xml diff --git a/res/values-sv/10-preferences.xml b/AnkiDroid/src/main/res/values-sv/10-preferences.xml similarity index 100% rename from res/values-sv/10-preferences.xml rename to AnkiDroid/src/main/res/values-sv/10-preferences.xml diff --git a/res/values-sv/11-arrays.xml b/AnkiDroid/src/main/res/values-sv/11-arrays.xml similarity index 100% rename from res/values-sv/11-arrays.xml rename to AnkiDroid/src/main/res/values-sv/11-arrays.xml diff --git a/res/values-sv/13-newfeatures.xml b/AnkiDroid/src/main/res/values-sv/13-newfeatures.xml similarity index 100% rename from res/values-sv/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-sv/13-newfeatures.xml diff --git a/res/values-th/01-core.xml b/AnkiDroid/src/main/res/values-th/01-core.xml similarity index 100% rename from res/values-th/01-core.xml rename to AnkiDroid/src/main/res/values-th/01-core.xml diff --git a/res/values-th/02-strings.xml b/AnkiDroid/src/main/res/values-th/02-strings.xml similarity index 100% rename from res/values-th/02-strings.xml rename to AnkiDroid/src/main/res/values-th/02-strings.xml diff --git a/res/values-th/03-dialogs.xml b/AnkiDroid/src/main/res/values-th/03-dialogs.xml similarity index 100% rename from res/values-th/03-dialogs.xml rename to AnkiDroid/src/main/res/values-th/03-dialogs.xml diff --git a/res/values-th/04-network.xml b/AnkiDroid/src/main/res/values-th/04-network.xml similarity index 100% rename from res/values-th/04-network.xml rename to AnkiDroid/src/main/res/values-th/04-network.xml diff --git a/res/values-th/05-feedback.xml b/AnkiDroid/src/main/res/values-th/05-feedback.xml similarity index 100% rename from res/values-th/05-feedback.xml rename to AnkiDroid/src/main/res/values-th/05-feedback.xml diff --git a/res/values-th/06-statistics.xml b/AnkiDroid/src/main/res/values-th/06-statistics.xml similarity index 100% rename from res/values-th/06-statistics.xml rename to AnkiDroid/src/main/res/values-th/06-statistics.xml diff --git a/res/values-th/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-th/07-cardbrowser.xml similarity index 100% rename from res/values-th/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-th/07-cardbrowser.xml diff --git a/res/values-th/08-widget.xml b/AnkiDroid/src/main/res/values-th/08-widget.xml similarity index 100% rename from res/values-th/08-widget.xml rename to AnkiDroid/src/main/res/values-th/08-widget.xml diff --git a/res/values-th/09-backup.xml b/AnkiDroid/src/main/res/values-th/09-backup.xml similarity index 100% rename from res/values-th/09-backup.xml rename to AnkiDroid/src/main/res/values-th/09-backup.xml diff --git a/res/values-th/10-preferences.xml b/AnkiDroid/src/main/res/values-th/10-preferences.xml similarity index 100% rename from res/values-th/10-preferences.xml rename to AnkiDroid/src/main/res/values-th/10-preferences.xml diff --git a/res/values-th/11-arrays.xml b/AnkiDroid/src/main/res/values-th/11-arrays.xml similarity index 100% rename from res/values-th/11-arrays.xml rename to AnkiDroid/src/main/res/values-th/11-arrays.xml diff --git a/res/values-th/13-newfeatures.xml b/AnkiDroid/src/main/res/values-th/13-newfeatures.xml similarity index 100% rename from res/values-th/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-th/13-newfeatures.xml diff --git a/res/values-tr/01-core.xml b/AnkiDroid/src/main/res/values-tr/01-core.xml similarity index 100% rename from res/values-tr/01-core.xml rename to AnkiDroid/src/main/res/values-tr/01-core.xml diff --git a/res/values-tr/02-strings.xml b/AnkiDroid/src/main/res/values-tr/02-strings.xml similarity index 100% rename from res/values-tr/02-strings.xml rename to AnkiDroid/src/main/res/values-tr/02-strings.xml diff --git a/res/values-tr/03-dialogs.xml b/AnkiDroid/src/main/res/values-tr/03-dialogs.xml similarity index 100% rename from res/values-tr/03-dialogs.xml rename to AnkiDroid/src/main/res/values-tr/03-dialogs.xml diff --git a/res/values-tr/04-network.xml b/AnkiDroid/src/main/res/values-tr/04-network.xml similarity index 100% rename from res/values-tr/04-network.xml rename to AnkiDroid/src/main/res/values-tr/04-network.xml diff --git a/res/values-tr/05-feedback.xml b/AnkiDroid/src/main/res/values-tr/05-feedback.xml similarity index 100% rename from res/values-tr/05-feedback.xml rename to AnkiDroid/src/main/res/values-tr/05-feedback.xml diff --git a/res/values-tr/06-statistics.xml b/AnkiDroid/src/main/res/values-tr/06-statistics.xml similarity index 100% rename from res/values-tr/06-statistics.xml rename to AnkiDroid/src/main/res/values-tr/06-statistics.xml diff --git a/res/values-tr/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml similarity index 100% rename from res/values-tr/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-tr/07-cardbrowser.xml diff --git a/res/values-tr/08-widget.xml b/AnkiDroid/src/main/res/values-tr/08-widget.xml similarity index 100% rename from res/values-tr/08-widget.xml rename to AnkiDroid/src/main/res/values-tr/08-widget.xml diff --git a/res/values-tr/09-backup.xml b/AnkiDroid/src/main/res/values-tr/09-backup.xml similarity index 100% rename from res/values-tr/09-backup.xml rename to AnkiDroid/src/main/res/values-tr/09-backup.xml diff --git a/res/values-tr/10-preferences.xml b/AnkiDroid/src/main/res/values-tr/10-preferences.xml similarity index 100% rename from res/values-tr/10-preferences.xml rename to AnkiDroid/src/main/res/values-tr/10-preferences.xml diff --git a/res/values-tr/11-arrays.xml b/AnkiDroid/src/main/res/values-tr/11-arrays.xml similarity index 100% rename from res/values-tr/11-arrays.xml rename to AnkiDroid/src/main/res/values-tr/11-arrays.xml diff --git a/res/values-tr/13-newfeatures.xml b/AnkiDroid/src/main/res/values-tr/13-newfeatures.xml similarity index 100% rename from res/values-tr/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-tr/13-newfeatures.xml diff --git a/res/values-uk/01-core.xml b/AnkiDroid/src/main/res/values-uk/01-core.xml similarity index 100% rename from res/values-uk/01-core.xml rename to AnkiDroid/src/main/res/values-uk/01-core.xml diff --git a/res/values-uk/02-strings.xml b/AnkiDroid/src/main/res/values-uk/02-strings.xml similarity index 100% rename from res/values-uk/02-strings.xml rename to AnkiDroid/src/main/res/values-uk/02-strings.xml diff --git a/res/values-uk/03-dialogs.xml b/AnkiDroid/src/main/res/values-uk/03-dialogs.xml similarity index 100% rename from res/values-uk/03-dialogs.xml rename to AnkiDroid/src/main/res/values-uk/03-dialogs.xml diff --git a/res/values-uk/04-network.xml b/AnkiDroid/src/main/res/values-uk/04-network.xml similarity index 100% rename from res/values-uk/04-network.xml rename to AnkiDroid/src/main/res/values-uk/04-network.xml diff --git a/res/values-uk/05-feedback.xml b/AnkiDroid/src/main/res/values-uk/05-feedback.xml similarity index 100% rename from res/values-uk/05-feedback.xml rename to AnkiDroid/src/main/res/values-uk/05-feedback.xml diff --git a/res/values-uk/06-statistics.xml b/AnkiDroid/src/main/res/values-uk/06-statistics.xml similarity index 100% rename from res/values-uk/06-statistics.xml rename to AnkiDroid/src/main/res/values-uk/06-statistics.xml diff --git a/res/values-uk/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml similarity index 100% rename from res/values-uk/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-uk/07-cardbrowser.xml diff --git a/res/values-uk/08-widget.xml b/AnkiDroid/src/main/res/values-uk/08-widget.xml similarity index 100% rename from res/values-uk/08-widget.xml rename to AnkiDroid/src/main/res/values-uk/08-widget.xml diff --git a/res/values-uk/09-backup.xml b/AnkiDroid/src/main/res/values-uk/09-backup.xml similarity index 100% rename from res/values-uk/09-backup.xml rename to AnkiDroid/src/main/res/values-uk/09-backup.xml diff --git a/res/values-uk/10-preferences.xml b/AnkiDroid/src/main/res/values-uk/10-preferences.xml similarity index 100% rename from res/values-uk/10-preferences.xml rename to AnkiDroid/src/main/res/values-uk/10-preferences.xml diff --git a/res/values-uk/11-arrays.xml b/AnkiDroid/src/main/res/values-uk/11-arrays.xml similarity index 100% rename from res/values-uk/11-arrays.xml rename to AnkiDroid/src/main/res/values-uk/11-arrays.xml diff --git a/res/values-uk/13-newfeatures.xml b/AnkiDroid/src/main/res/values-uk/13-newfeatures.xml similarity index 100% rename from res/values-uk/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-uk/13-newfeatures.xml diff --git a/res/values-vi/01-core.xml b/AnkiDroid/src/main/res/values-vi/01-core.xml similarity index 100% rename from res/values-vi/01-core.xml rename to AnkiDroid/src/main/res/values-vi/01-core.xml diff --git a/res/values-vi/02-strings.xml b/AnkiDroid/src/main/res/values-vi/02-strings.xml similarity index 100% rename from res/values-vi/02-strings.xml rename to AnkiDroid/src/main/res/values-vi/02-strings.xml diff --git a/res/values-vi/03-dialogs.xml b/AnkiDroid/src/main/res/values-vi/03-dialogs.xml similarity index 100% rename from res/values-vi/03-dialogs.xml rename to AnkiDroid/src/main/res/values-vi/03-dialogs.xml diff --git a/res/values-vi/04-network.xml b/AnkiDroid/src/main/res/values-vi/04-network.xml similarity index 100% rename from res/values-vi/04-network.xml rename to AnkiDroid/src/main/res/values-vi/04-network.xml diff --git a/res/values-vi/05-feedback.xml b/AnkiDroid/src/main/res/values-vi/05-feedback.xml similarity index 100% rename from res/values-vi/05-feedback.xml rename to AnkiDroid/src/main/res/values-vi/05-feedback.xml diff --git a/res/values-vi/06-statistics.xml b/AnkiDroid/src/main/res/values-vi/06-statistics.xml similarity index 100% rename from res/values-vi/06-statistics.xml rename to AnkiDroid/src/main/res/values-vi/06-statistics.xml diff --git a/res/values-vi/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml similarity index 100% rename from res/values-vi/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-vi/07-cardbrowser.xml diff --git a/res/values-vi/08-widget.xml b/AnkiDroid/src/main/res/values-vi/08-widget.xml similarity index 100% rename from res/values-vi/08-widget.xml rename to AnkiDroid/src/main/res/values-vi/08-widget.xml diff --git a/res/values-vi/09-backup.xml b/AnkiDroid/src/main/res/values-vi/09-backup.xml similarity index 100% rename from res/values-vi/09-backup.xml rename to AnkiDroid/src/main/res/values-vi/09-backup.xml diff --git a/res/values-vi/10-preferences.xml b/AnkiDroid/src/main/res/values-vi/10-preferences.xml similarity index 100% rename from res/values-vi/10-preferences.xml rename to AnkiDroid/src/main/res/values-vi/10-preferences.xml diff --git a/res/values-vi/11-arrays.xml b/AnkiDroid/src/main/res/values-vi/11-arrays.xml similarity index 100% rename from res/values-vi/11-arrays.xml rename to AnkiDroid/src/main/res/values-vi/11-arrays.xml diff --git a/res/values-vi/13-newfeatures.xml b/AnkiDroid/src/main/res/values-vi/13-newfeatures.xml similarity index 100% rename from res/values-vi/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-vi/13-newfeatures.xml diff --git a/res/values-zh-rCN/01-core.xml b/AnkiDroid/src/main/res/values-zh-rCN/01-core.xml similarity index 100% rename from res/values-zh-rCN/01-core.xml rename to AnkiDroid/src/main/res/values-zh-rCN/01-core.xml diff --git a/res/values-zh-rCN/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml similarity index 100% rename from res/values-zh-rCN/02-strings.xml rename to AnkiDroid/src/main/res/values-zh-rCN/02-strings.xml diff --git a/res/values-zh-rCN/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml similarity index 100% rename from res/values-zh-rCN/03-dialogs.xml rename to AnkiDroid/src/main/res/values-zh-rCN/03-dialogs.xml diff --git a/res/values-zh-rCN/04-network.xml b/AnkiDroid/src/main/res/values-zh-rCN/04-network.xml similarity index 100% rename from res/values-zh-rCN/04-network.xml rename to AnkiDroid/src/main/res/values-zh-rCN/04-network.xml diff --git a/res/values-zh-rCN/05-feedback.xml b/AnkiDroid/src/main/res/values-zh-rCN/05-feedback.xml similarity index 100% rename from res/values-zh-rCN/05-feedback.xml rename to AnkiDroid/src/main/res/values-zh-rCN/05-feedback.xml diff --git a/res/values-zh-rCN/06-statistics.xml b/AnkiDroid/src/main/res/values-zh-rCN/06-statistics.xml similarity index 100% rename from res/values-zh-rCN/06-statistics.xml rename to AnkiDroid/src/main/res/values-zh-rCN/06-statistics.xml diff --git a/res/values-zh-rCN/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml similarity index 100% rename from res/values-zh-rCN/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-zh-rCN/07-cardbrowser.xml diff --git a/res/values-zh-rCN/08-widget.xml b/AnkiDroid/src/main/res/values-zh-rCN/08-widget.xml similarity index 100% rename from res/values-zh-rCN/08-widget.xml rename to AnkiDroid/src/main/res/values-zh-rCN/08-widget.xml diff --git a/res/values-zh-rCN/09-backup.xml b/AnkiDroid/src/main/res/values-zh-rCN/09-backup.xml similarity index 100% rename from res/values-zh-rCN/09-backup.xml rename to AnkiDroid/src/main/res/values-zh-rCN/09-backup.xml diff --git a/res/values-zh-rCN/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml similarity index 100% rename from res/values-zh-rCN/10-preferences.xml rename to AnkiDroid/src/main/res/values-zh-rCN/10-preferences.xml diff --git a/res/values-zh-rCN/11-arrays.xml b/AnkiDroid/src/main/res/values-zh-rCN/11-arrays.xml similarity index 100% rename from res/values-zh-rCN/11-arrays.xml rename to AnkiDroid/src/main/res/values-zh-rCN/11-arrays.xml diff --git a/res/values-zh-rCN/13-newfeatures.xml b/AnkiDroid/src/main/res/values-zh-rCN/13-newfeatures.xml similarity index 100% rename from res/values-zh-rCN/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-zh-rCN/13-newfeatures.xml diff --git a/res/values-zh-rTW/01-core.xml b/AnkiDroid/src/main/res/values-zh-rTW/01-core.xml similarity index 100% rename from res/values-zh-rTW/01-core.xml rename to AnkiDroid/src/main/res/values-zh-rTW/01-core.xml diff --git a/res/values-zh-rTW/02-strings.xml b/AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml similarity index 100% rename from res/values-zh-rTW/02-strings.xml rename to AnkiDroid/src/main/res/values-zh-rTW/02-strings.xml diff --git a/res/values-zh-rTW/03-dialogs.xml b/AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml similarity index 100% rename from res/values-zh-rTW/03-dialogs.xml rename to AnkiDroid/src/main/res/values-zh-rTW/03-dialogs.xml diff --git a/res/values-zh-rTW/04-network.xml b/AnkiDroid/src/main/res/values-zh-rTW/04-network.xml similarity index 100% rename from res/values-zh-rTW/04-network.xml rename to AnkiDroid/src/main/res/values-zh-rTW/04-network.xml diff --git a/res/values-zh-rTW/05-feedback.xml b/AnkiDroid/src/main/res/values-zh-rTW/05-feedback.xml similarity index 100% rename from res/values-zh-rTW/05-feedback.xml rename to AnkiDroid/src/main/res/values-zh-rTW/05-feedback.xml diff --git a/res/values-zh-rTW/06-statistics.xml b/AnkiDroid/src/main/res/values-zh-rTW/06-statistics.xml similarity index 100% rename from res/values-zh-rTW/06-statistics.xml rename to AnkiDroid/src/main/res/values-zh-rTW/06-statistics.xml diff --git a/res/values-zh-rTW/07-cardbrowser.xml b/AnkiDroid/src/main/res/values-zh-rTW/07-cardbrowser.xml similarity index 100% rename from res/values-zh-rTW/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values-zh-rTW/07-cardbrowser.xml diff --git a/res/values-zh-rTW/08-widget.xml b/AnkiDroid/src/main/res/values-zh-rTW/08-widget.xml similarity index 100% rename from res/values-zh-rTW/08-widget.xml rename to AnkiDroid/src/main/res/values-zh-rTW/08-widget.xml diff --git a/res/values-zh-rTW/09-backup.xml b/AnkiDroid/src/main/res/values-zh-rTW/09-backup.xml similarity index 100% rename from res/values-zh-rTW/09-backup.xml rename to AnkiDroid/src/main/res/values-zh-rTW/09-backup.xml diff --git a/res/values-zh-rTW/10-preferences.xml b/AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml similarity index 100% rename from res/values-zh-rTW/10-preferences.xml rename to AnkiDroid/src/main/res/values-zh-rTW/10-preferences.xml diff --git a/res/values-zh-rTW/11-arrays.xml b/AnkiDroid/src/main/res/values-zh-rTW/11-arrays.xml similarity index 100% rename from res/values-zh-rTW/11-arrays.xml rename to AnkiDroid/src/main/res/values-zh-rTW/11-arrays.xml diff --git a/res/values-zh-rTW/13-newfeatures.xml b/AnkiDroid/src/main/res/values-zh-rTW/13-newfeatures.xml similarity index 100% rename from res/values-zh-rTW/13-newfeatures.xml rename to AnkiDroid/src/main/res/values-zh-rTW/13-newfeatures.xml diff --git a/res/values/01-core.xml b/AnkiDroid/src/main/res/values/01-core.xml similarity index 100% rename from res/values/01-core.xml rename to AnkiDroid/src/main/res/values/01-core.xml diff --git a/res/values/02-strings.xml b/AnkiDroid/src/main/res/values/02-strings.xml similarity index 100% rename from res/values/02-strings.xml rename to AnkiDroid/src/main/res/values/02-strings.xml diff --git a/res/values/03-dialogs.xml b/AnkiDroid/src/main/res/values/03-dialogs.xml similarity index 100% rename from res/values/03-dialogs.xml rename to AnkiDroid/src/main/res/values/03-dialogs.xml diff --git a/res/values/04-network.xml b/AnkiDroid/src/main/res/values/04-network.xml similarity index 100% rename from res/values/04-network.xml rename to AnkiDroid/src/main/res/values/04-network.xml diff --git a/res/values/05-feedback.xml b/AnkiDroid/src/main/res/values/05-feedback.xml similarity index 100% rename from res/values/05-feedback.xml rename to AnkiDroid/src/main/res/values/05-feedback.xml diff --git a/res/values/06-statistics.xml b/AnkiDroid/src/main/res/values/06-statistics.xml similarity index 100% rename from res/values/06-statistics.xml rename to AnkiDroid/src/main/res/values/06-statistics.xml diff --git a/res/values/07-cardbrowser.xml b/AnkiDroid/src/main/res/values/07-cardbrowser.xml similarity index 100% rename from res/values/07-cardbrowser.xml rename to AnkiDroid/src/main/res/values/07-cardbrowser.xml diff --git a/res/values/08-widget.xml b/AnkiDroid/src/main/res/values/08-widget.xml similarity index 100% rename from res/values/08-widget.xml rename to AnkiDroid/src/main/res/values/08-widget.xml diff --git a/res/values/09-backup.xml b/AnkiDroid/src/main/res/values/09-backup.xml similarity index 100% rename from res/values/09-backup.xml rename to AnkiDroid/src/main/res/values/09-backup.xml diff --git a/res/values/10-preferences.xml b/AnkiDroid/src/main/res/values/10-preferences.xml similarity index 100% rename from res/values/10-preferences.xml rename to AnkiDroid/src/main/res/values/10-preferences.xml diff --git a/res/values/11-arrays.xml b/AnkiDroid/src/main/res/values/11-arrays.xml similarity index 100% rename from res/values/11-arrays.xml rename to AnkiDroid/src/main/res/values/11-arrays.xml diff --git a/res/values/13-newfeatures.xml b/AnkiDroid/src/main/res/values/13-newfeatures.xml similarity index 100% rename from res/values/13-newfeatures.xml rename to AnkiDroid/src/main/res/values/13-newfeatures.xml diff --git a/res/values/16-multimedia-editor.xml b/AnkiDroid/src/main/res/values/16-multimedia-editor.xml similarity index 100% rename from res/values/16-multimedia-editor.xml rename to AnkiDroid/src/main/res/values/16-multimedia-editor.xml diff --git a/res/values/attrs.xml b/AnkiDroid/src/main/res/values/attrs.xml similarity index 100% rename from res/values/attrs.xml rename to AnkiDroid/src/main/res/values/attrs.xml diff --git a/res/values/colors.xml b/AnkiDroid/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to AnkiDroid/src/main/res/values/colors.xml diff --git a/res/values/constants.xml b/AnkiDroid/src/main/res/values/constants.xml similarity index 100% rename from res/values/constants.xml rename to AnkiDroid/src/main/res/values/constants.xml diff --git a/res/values/dimens.xml b/AnkiDroid/src/main/res/values/dimens.xml similarity index 100% rename from res/values/dimens.xml rename to AnkiDroid/src/main/res/values/dimens.xml diff --git a/res/values/strings.xml b/AnkiDroid/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to AnkiDroid/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/AnkiDroid/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to AnkiDroid/src/main/res/values/styles.xml diff --git a/res/values/themes.xml b/AnkiDroid/src/main/res/values/themes.xml similarity index 100% rename from res/values/themes.xml rename to AnkiDroid/src/main/res/values/themes.xml diff --git a/res/xml/cram_deck_options.xml b/AnkiDroid/src/main/res/xml/cram_deck_options.xml similarity index 100% rename from res/xml/cram_deck_options.xml rename to AnkiDroid/src/main/res/xml/cram_deck_options.xml diff --git a/res/xml/deck_options.xml b/AnkiDroid/src/main/res/xml/deck_options.xml similarity index 100% rename from res/xml/deck_options.xml rename to AnkiDroid/src/main/res/xml/deck_options.xml diff --git a/res/xml/preferences.xml b/AnkiDroid/src/main/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to AnkiDroid/src/main/res/xml/preferences.xml diff --git a/res/xml/widget_provider.xml b/AnkiDroid/src/main/res/xml/widget_provider.xml similarity index 100% rename from res/xml/widget_provider.xml rename to AnkiDroid/src/main/res/xml/widget_provider.xml diff --git a/res/xml/widget_provider_big.xml b/AnkiDroid/src/main/res/xml/widget_provider_big.xml similarity index 100% rename from res/xml/widget_provider_big.xml rename to AnkiDroid/src/main/res/xml/widget_provider_big.xml diff --git a/res/xml/widget_provider_small.xml b/AnkiDroid/src/main/res/xml/widget_provider_small.xml similarity index 100% rename from res/xml/widget_provider_small.xml rename to AnkiDroid/src/main/res/xml/widget_provider_small.xml diff --git a/tests/.classpath b/AnkiDroid/src/tests/.classpath similarity index 100% rename from tests/.classpath rename to AnkiDroid/src/tests/.classpath diff --git a/tests/.project b/AnkiDroid/src/tests/.project similarity index 100% rename from tests/.project rename to AnkiDroid/src/tests/.project diff --git a/AnkiDroid/src/tests/.settings/org.eclipse.jdt.core.prefs b/AnkiDroid/src/tests/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000000..b080d2ddc8 --- /dev/null +++ b/AnkiDroid/src/tests/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,4 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/tests/AndroidManifest.xml b/AnkiDroid/src/tests/AndroidManifest.xml similarity index 100% rename from tests/AndroidManifest.xml rename to AnkiDroid/src/tests/AndroidManifest.xml diff --git a/tests/README b/AnkiDroid/src/tests/README similarity index 100% rename from tests/README rename to AnkiDroid/src/tests/README diff --git a/tests/ant.properties b/AnkiDroid/src/tests/ant.properties similarity index 100% rename from tests/ant.properties rename to AnkiDroid/src/tests/ant.properties diff --git a/deps/appcompat/proguard-project.txt b/AnkiDroid/src/tests/proguard-project.txt similarity index 100% rename from deps/appcompat/proguard-project.txt rename to AnkiDroid/src/tests/proguard-project.txt diff --git a/tests/project.properties b/AnkiDroid/src/tests/project.properties similarity index 100% rename from tests/project.properties rename to AnkiDroid/src/tests/project.properties diff --git a/tests/res/.README b/AnkiDroid/src/tests/res/.README similarity index 100% rename from tests/res/.README rename to AnkiDroid/src/tests/res/.README diff --git a/tests/src/com/ichi2/utils/HtmlUtilTest.java b/AnkiDroid/src/tests/src/com/ichi2/utils/HtmlUtilTest.java similarity index 100% rename from tests/src/com/ichi2/utils/HtmlUtilTest.java rename to AnkiDroid/src/tests/src/com/ichi2/utils/HtmlUtilTest.java diff --git a/tests/src/com/ichi2/utils/MediaTest.java b/AnkiDroid/src/tests/src/com/ichi2/utils/MediaTest.java similarity index 100% rename from tests/src/com/ichi2/utils/MediaTest.java rename to AnkiDroid/src/tests/src/com/ichi2/utils/MediaTest.java diff --git a/tests/src/com/ichi2/utils/Shared.java b/AnkiDroid/src/tests/src/com/ichi2/utils/Shared.java similarity index 100% rename from tests/src/com/ichi2/utils/Shared.java rename to AnkiDroid/src/tests/src/com/ichi2/utils/Shared.java diff --git a/AnkiDroidProject.iml b/AnkiDroidProject.iml new file mode 100644 index 0000000000..0bb6048ae0 --- /dev/null +++ b/AnkiDroidProject.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + diff --git a/COPYING b/COPYING deleted file mode 100644 index 4432540474..0000000000 --- a/COPYING +++ /dev/null @@ -1,676 +0,0 @@ - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. - diff --git a/README b/README deleted file mode 100644 index ceedf49544..0000000000 --- a/README +++ /dev/null @@ -1,3 +0,0 @@ -AnkiDroid: Anki on Android - -How to compile: http://code.google.com/p/ankidroid/wiki/Contribution#Source_code diff --git a/ShowcaseView/.gitignore b/ShowcaseView/.gitignore new file mode 100644 index 0000000000..80c5d462ab --- /dev/null +++ b/ShowcaseView/.gitignore @@ -0,0 +1,44 @@ +# built application files +*.apk +*.ap_ + +# files for the dex VM +*.dex + +# Java class files +*.class + +# generated files +bin/ +gen/ +lib/ +target/ +out/ +sample/gen-external-apklibs + +# Local configuration file (sdk path, etc) +local.properties + +# Eclipse project files +.classpath +.project + +# Os specific files +.DS_Store + +# IntelliJ project files +*.iml +*.ipr +*.iws +.idea/i +.idea/ + +# Maven Files +pom.xml.* +settings.xml + +# Gradle +.gradle +build + +library/coverage-error.log diff --git a/ShowcaseView/README.md b/ShowcaseView/README.md new file mode 100644 index 0000000000..4e38a52ef2 --- /dev/null +++ b/ShowcaseView/README.md @@ -0,0 +1,105 @@ +ShowcaseView +==== + +The ShowcaseView (SCV) library is designed to highlight and showcase specific parts of apps to the user with a distinctive and attractive overlay. This library is great for pointing out points of interest for users, gestures, or obscure but useful items. + + + + +The library is based on the "Cling" view found in the Launcher on Ice-Cream Sandwich and Jelly Bean. + +Project set-up +==== + +**ShowcaseView currently supports API LEVEL 11+** + +If you're using a Gradle-based project, then you can add SCV as a dependency directly: + +~~~ +compile 'com.github.amlcurran.showcaseview:library:5.0.0' +~~~ + +If you're using Maven (but not Gradle), you can add the APKlib as a dependency: + +~~~ + + com.github.amlcurran.showcaseview + library + 5.0.0 + apklib + +~~~ + +If you're using a standard project without either Maven or Gradle, you'll have to download the project, and the add the library manually to your project. + + +Usage +==== + +To use ShowcaseView, use the Builder pattern. + +As an example: + +~~~ +new ShowcaseView.Builder(this) + .setTarget(new ActionViewTarget(this, ActionViewTarget.Type.HOME)) + .setContentTitle("ShowcaseView") + .setContentText("This is highlighting the Home button") + .hideOnTouchOutside() + .build(); +~~~ + +You can use styles to customise how a ShowcaseView looks. I'll write more documentation soon, but for now, check out the sample project's [styles](https://github.com/amlcurran/ShowcaseView/blob/master/sample/src/main/res/values/styles.xml). + +Sample Project +---- +There's a sample project available which you can find in the project, or as an app on the [Google Play Store](https://play.google.com/store/apps/details?id=com.espian.showcaseview.sample). + +What's the legacy branch? +---- +The [legacy branch](https://github.com/amlcurran/ShowcaseView/tree/legacy) is still available for people to use. This has more features than the master branch, but it more unwieldy to use and less stable. I don't support it at all - you'll have to build and compile it yourself. It isn't available on Maven Central either. + +Is it worth using? +---- +Perhaps. Why not ask +[Google](https://github.com/googlecast/CastVideos-android), +[HaxSync](https://play.google.com/store/apps/details?id=org.mots.haxsync), or [AllCast](https://play.google.com/store/apps/details?id=com.koushikdutta.cast), which each use the library? + +What's missing in v5 +--- + +- ShowcaseViews: the class which queues up ShowcaseViews in a tutorial-type method. I never +really liked this class (generally, you should use SCV sparingly); I'll add it back in based on +the Builder class when I can. +- Ghostly hand: this has gone for now until I can test-drive it back in. +- Scale multiplier: this has gone for simplicity - if people really loved it I'll add in back in + +FAQs +--- + +**Where has X feature gone?** + +Look one paragraph up! + +**Waaaah, but I really liked feature X!!!** + +Switch to the legacy branch and use that one then! All legacy features are in there. + +**What happened to all the other constructors?** + +Gone. You should be using the new Target API. + +**What if I want to add feature X?** + +At the moment, I'm not taking any feature requests. It's unlikely I'll take many anyway, +unless I feel they are both useful and well tested. If you have some cosmetic tweak then I don't +want that added into the library as *another* option. But, if you need to make a tweak to the +library to add such a tweak to your own, overridden ShowcaseView then that is totally great. + + +Copyright and Licensing +---- + +Copyright Alex Curran ([@amlcurran](https://twitter.com/amlcurran)) © 2012-2014. All rights reserved. + +This library is distributed under an Apache 2.0 License. diff --git a/ShowcaseView/build.gradle b/ShowcaseView/build.gradle new file mode 100644 index 0000000000..7a30121fed --- /dev/null +++ b/ShowcaseView/build.gradle @@ -0,0 +1,32 @@ +def isReleaseBuild() { + return version.contains("SNAPSHOT") == false +} + +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +allprojects { + group = GROUP + version = VERSION_CODE + + repositories { + mavenCentral() + } + + tasks.withType(JavaCompile) { + options.encoding = "UTF-8" + } +} diff --git a/ShowcaseView/example.png b/ShowcaseView/example.png new file mode 100644 index 0000000000..0a6a729bd6 Binary files /dev/null and b/ShowcaseView/example.png differ diff --git a/ShowcaseView/example2.png b/ShowcaseView/example2.png new file mode 100644 index 0000000000..fa87e74d3f Binary files /dev/null and b/ShowcaseView/example2.png differ diff --git a/ShowcaseView/example2@2x.png b/ShowcaseView/example2@2x.png new file mode 100644 index 0000000000..01acfbce15 Binary files /dev/null and b/ShowcaseView/example2@2x.png differ diff --git a/ShowcaseView/example@2x.png b/ShowcaseView/example@2x.png new file mode 100644 index 0000000000..5d2410b2ca Binary files /dev/null and b/ShowcaseView/example@2x.png differ diff --git a/ShowcaseView/gradle-mvn-push.gradle b/ShowcaseView/gradle-mvn-push.gradle new file mode 100644 index 0000000000..be1c8ba4f3 --- /dev/null +++ b/ShowcaseView/gradle-mvn-push.gradle @@ -0,0 +1,135 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +apply plugin: 'maven' +apply plugin: 'signing' + +def isReleaseBuild() { + return VERSION_NAME.contains("SNAPSHOT") == false +} + +def getReleaseRepositoryUrl() { + println 'Release build' + return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL + : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" +} + +def getSnapshotRepositoryUrl() { + println 'Snapshot build' + return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL + : "https://oss.sonatype.org/content/repositories/snapshots/" +} + +def getRepositoryUsername() { + return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" +} + +def getRepositoryPassword() { + return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" +} + +afterEvaluate { project -> + uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + pom.groupId = GROUP + pom.artifactId = POM_ARTIFACT_ID + pom.version = VERSION_NAME + + repository(url: getReleaseRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + snapshotRepository(url: getSnapshotRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + + pom.project { + name POM_NAME + packaging POM_PACKAGING + description POM_DESCRIPTION + url POM_URL + + scm { + url POM_SCM_URL + connection POM_SCM_CONNECTION + developerConnection POM_SCM_DEV_CONNECTION + } + + licenses { + license { + name POM_LICENCE_NAME + url POM_LICENCE_URL + distribution POM_LICENCE_DIST + } + } + + developers { + developer { + id POM_DEVELOPER_ID + name POM_DEVELOPER_NAME + } + } + } + } + } + } + + signing { + required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives + } + + task apklib(type: Zip) { + appendix = extension = 'apklib' + + from 'src/main/AndroidManifest.xml' + into('res') { + from 'src/main/res' + } + into('src') { + from 'src/main/java' + } + } + + task androidJavadocs(type: Javadoc) { + title = "ShowcaseView ${VERSION_NAME}" + ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" + source = android.sourceSets.main.java.getSrcDirs() + classpath = files(ext.androidJar) + options.links("http://docs.oracle.com/javase/7/docs/api/") + options.linksOffline("http://d.android.com/reference/", "/Applications/Android Studio.app/sdk/docs/reference/") + exclude '**/BuildConfig.java' + exclude '**/R.java' + } + + task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { + classifier = 'javadoc' + from androidJavadocs.destinationDir + } + + task androidSourcesJar(type: Jar) { + classifier = 'sources' + from android.sourceSets.main.java.getSrcDirs() + } + + artifacts { + archives androidSourcesJar + archives androidJavadocsJar + archives apklib + } +} diff --git a/ShowcaseView/gradle.properties b/ShowcaseView/gradle.properties new file mode 100644 index 0000000000..24ab7720e3 --- /dev/null +++ b/ShowcaseView/gradle.properties @@ -0,0 +1,35 @@ +# +# Copyright 2014 Alex Curran +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +VERSION_CODE=50101 +VERSION_NAME=5.1.0-SNAPSHOT +GROUP=com.github.amlcurran.showcaseview + +POM_DESCRIPTION=Highlight the best bits of your app to users quickly, simply, and cool...ly +POM_URL=https://github.com/amlcurran/ShowcaseView/tree/new-scv +POM_SCM_URL=https://github.com/amlcurran/ShowcaseView/tree/new-scv +POM_SCM_CONNECTION=scm:git@github.com:amlcurran/ShowcaseView.git +POM_SCM_DEV_CONNECTION=scm:git@github.com:amlcurran/ShowcaseView.git +POM_LICENCE_NAME=The Apache Software License, Version 2.0 +POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt +POM_LICENCE_DIST=repo +POM_DEVELOPER_ID=amlcurran +POM_DEVELOPER_NAME=Alex Curran + +BUILD_TOOLS_VERSION=19.1.0 +COMPILE_SDK=19 +MIN_SDK=7 +TARGET_SDK=19 \ No newline at end of file diff --git a/ShowcaseView/gradle/wrapper/gradle-wrapper.jar b/ShowcaseView/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..3d0dee6e8e Binary files /dev/null and b/ShowcaseView/gradle/wrapper/gradle-wrapper.jar differ diff --git a/ShowcaseView/gradle/wrapper/gradle-wrapper.properties b/ShowcaseView/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..b16ef8c810 --- /dev/null +++ b/ShowcaseView/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Thu Sep 25 11:43:27 CEST 2014 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-bin.zip diff --git a/ShowcaseView/gradlew b/ShowcaseView/gradlew new file mode 100644 index 0000000000..91a7e269e1 --- /dev/null +++ b/ShowcaseView/gradlew @@ -0,0 +1,164 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# For Cygwin, ensure paths are in UNIX format before anything is touched. +if $cygwin ; then + [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` +fi + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >&- +APP_HOME="`pwd -P`" +cd "$SAVED" >&- + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/ShowcaseView/gradlew.bat b/ShowcaseView/gradlew.bat new file mode 100644 index 0000000000..8a0b282aa6 --- /dev/null +++ b/ShowcaseView/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/ShowcaseView/library/build.gradle b/ShowcaseView/library/build.gradle new file mode 100644 index 0000000000..69cf11cbfe --- /dev/null +++ b/ShowcaseView/library/build.gradle @@ -0,0 +1,49 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.13.0' + } +} + +apply plugin: 'com.android.library' +apply plugin: 'maven' + +dependencies { + repositories { + mavenCentral() + } + compile 'com.nineoldandroids:library:2.4.0' +} + +android { + compileSdkVersion Integer.parseInt(COMPILE_SDK) + buildToolsVersion BUILD_TOOLS_VERSION + + defaultConfig { + versionName VERSION_NAME + versionCode Integer.parseInt(VERSION_CODE) + targetSdkVersion Integer.parseInt(TARGET_SDK) + minSdkVersion Integer.parseInt(MIN_SDK) + } +} + +apply from: 'gradle-mvn-push.gradle' diff --git a/ShowcaseView/library/gradle-mvn-push.gradle b/ShowcaseView/library/gradle-mvn-push.gradle new file mode 100644 index 0000000000..be1c8ba4f3 --- /dev/null +++ b/ShowcaseView/library/gradle-mvn-push.gradle @@ -0,0 +1,135 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +apply plugin: 'maven' +apply plugin: 'signing' + +def isReleaseBuild() { + return VERSION_NAME.contains("SNAPSHOT") == false +} + +def getReleaseRepositoryUrl() { + println 'Release build' + return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL + : "https://oss.sonatype.org/service/local/staging/deploy/maven2/" +} + +def getSnapshotRepositoryUrl() { + println 'Snapshot build' + return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL + : "https://oss.sonatype.org/content/repositories/snapshots/" +} + +def getRepositoryUsername() { + return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : "" +} + +def getRepositoryPassword() { + return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : "" +} + +afterEvaluate { project -> + uploadArchives { + repositories { + mavenDeployer { + beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) } + + pom.groupId = GROUP + pom.artifactId = POM_ARTIFACT_ID + pom.version = VERSION_NAME + + repository(url: getReleaseRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + snapshotRepository(url: getSnapshotRepositoryUrl()) { + authentication(userName: getRepositoryUsername(), password: getRepositoryPassword()) + } + + pom.project { + name POM_NAME + packaging POM_PACKAGING + description POM_DESCRIPTION + url POM_URL + + scm { + url POM_SCM_URL + connection POM_SCM_CONNECTION + developerConnection POM_SCM_DEV_CONNECTION + } + + licenses { + license { + name POM_LICENCE_NAME + url POM_LICENCE_URL + distribution POM_LICENCE_DIST + } + } + + developers { + developer { + id POM_DEVELOPER_ID + name POM_DEVELOPER_NAME + } + } + } + } + } + } + + signing { + required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") } + sign configurations.archives + } + + task apklib(type: Zip) { + appendix = extension = 'apklib' + + from 'src/main/AndroidManifest.xml' + into('res') { + from 'src/main/res' + } + into('src') { + from 'src/main/java' + } + } + + task androidJavadocs(type: Javadoc) { + title = "ShowcaseView ${VERSION_NAME}" + ext.androidJar = "${android.sdkDirectory}/platforms/${android.compileSdkVersion}/android.jar" + source = android.sourceSets.main.java.getSrcDirs() + classpath = files(ext.androidJar) + options.links("http://docs.oracle.com/javase/7/docs/api/") + options.linksOffline("http://d.android.com/reference/", "/Applications/Android Studio.app/sdk/docs/reference/") + exclude '**/BuildConfig.java' + exclude '**/R.java' + } + + task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) { + classifier = 'javadoc' + from androidJavadocs.destinationDir + } + + task androidSourcesJar(type: Jar) { + classifier = 'sources' + from android.sourceSets.main.java.getSrcDirs() + } + + artifacts { + archives androidSourcesJar + archives androidJavadocsJar + archives apklib + } +} diff --git a/ShowcaseView/library/gradle.properties b/ShowcaseView/library/gradle.properties new file mode 100644 index 0000000000..360c7abd3b --- /dev/null +++ b/ShowcaseView/library/gradle.properties @@ -0,0 +1,19 @@ +# +# Copyright 2014 Alex Curran +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +POM_NAME=ShowcaseView library +POM_ARTIFACT_ID=library +POM_PACKAGING=aar \ No newline at end of file diff --git a/deps/showcaseview/project.properties b/ShowcaseView/library/project.properties similarity index 100% rename from deps/showcaseview/project.properties rename to ShowcaseView/library/project.properties diff --git a/deps/showcaseview/AndroidManifest.xml b/ShowcaseView/library/src/main/AndroidManifest.xml similarity index 100% rename from deps/showcaseview/AndroidManifest.xml rename to ShowcaseView/library/src/main/AndroidManifest.xml diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/AnimationFactory.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/AnimationFactory.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/AnimationFactory.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/AnimationFactory.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/AnimatorAnimationFactory.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/AnimatorAnimationFactory.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/AnimatorAnimationFactory.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/AnimatorAnimationFactory.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/ApiUtils.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ApiUtils.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/ApiUtils.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ApiUtils.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/Calculator.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/Calculator.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/Calculator.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/Calculator.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/NewShowcaseDrawer.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/NewShowcaseDrawer.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/NewShowcaseDrawer.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/NewShowcaseDrawer.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/OnShowcaseEventListener.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/OnShowcaseEventListener.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/OnShowcaseEventListener.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/OnShowcaseEventListener.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/ShotStateStore.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShotStateStore.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/ShotStateStore.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShotStateStore.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/ShowcaseAreaCalculator.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseAreaCalculator.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/ShowcaseAreaCalculator.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseAreaCalculator.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/ShowcaseDrawer.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseDrawer.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/ShowcaseDrawer.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseDrawer.java diff --git a/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseView.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseView.java new file mode 100644 index 0000000000..dbe8698dc1 --- /dev/null +++ b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseView.java @@ -0,0 +1,646 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview; + +import android.app.Activity; +import android.content.Context; +import android.content.res.TypedArray; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Color; +import android.graphics.Point; +import android.graphics.PorterDuff; +import android.os.Build; +import android.text.TextUtils; +import android.util.AttributeSet; +import android.view.LayoutInflater; +import android.view.MotionEvent; +import android.view.View; +import android.view.ViewGroup; +import android.view.ViewTreeObserver; +import android.widget.Button; +import android.widget.RelativeLayout; + +import com.github.amlcurran.showcaseview.targets.Target; + +import static com.github.amlcurran.showcaseview.AnimationFactory.AnimationEndListener; +import static com.github.amlcurran.showcaseview.AnimationFactory.AnimationStartListener; + +/** + * A view which allows you to showcase areas of your app with an explanation. + */ +public class ShowcaseView extends RelativeLayout + implements View.OnTouchListener, ShowcaseViewApi { + + private static final int HOLO_BLUE = Color.parseColor("#33B5E5"); + + private final Button mEndButton; + private final TextDrawer textDrawer; + private final ShowcaseDrawer showcaseDrawer; + private final ShowcaseAreaCalculator showcaseAreaCalculator; + private final AnimationFactory animationFactory; + private final ShotStateStore shotStateStore; + + // Showcase metrics + private int showcaseX = -1; + private int showcaseY = -1; + private float scaleMultiplier = 1f; + + // Touch items + private boolean hasCustomClickListener = false; + private boolean blockTouches = true; + private boolean hideOnTouch = false; + private OnShowcaseEventListener mEventListener = OnShowcaseEventListener.NONE; + + private boolean hasAlteredText = false; + private boolean hasNoTarget = false; + private boolean shouldCentreText; + private Bitmap bitmapBuffer; + + // Animation items + private long fadeInMillis; + private long fadeOutMillis; + private boolean isShowing; + + protected ShowcaseView(Context context, boolean newStyle) { + this(context, null, R.styleable.CustomTheme_showcaseViewStyle, newStyle); + } + + protected ShowcaseView(Context context, AttributeSet attrs, int defStyle, boolean newStyle) { + super(context, attrs, defStyle); + + ApiUtils apiUtils = new ApiUtils(); + animationFactory = new AnimatorAnimationFactory(); + showcaseAreaCalculator = new ShowcaseAreaCalculator(); + shotStateStore = new ShotStateStore(context); + + apiUtils.setFitsSystemWindowsCompat(this); + getViewTreeObserver().addOnPreDrawListener(new CalculateTextOnPreDraw()); + getViewTreeObserver().addOnGlobalLayoutListener(new UpdateOnGlobalLayout()); + + // Get the attributes for the ShowcaseView + final TypedArray styled = context.getTheme() + .obtainStyledAttributes(attrs, R.styleable.ShowcaseView, R.attr.showcaseViewStyle, + R.style.ShowcaseView); + + // Set the default animation times + fadeInMillis = getResources().getInteger(android.R.integer.config_mediumAnimTime); + fadeOutMillis = getResources().getInteger(android.R.integer.config_mediumAnimTime); + + mEndButton = (Button) LayoutInflater.from(context).inflate(R.layout.showcase_button, null); + if (newStyle) { + showcaseDrawer = new NewShowcaseDrawer(getResources()); + } else { + showcaseDrawer = new StandardShowcaseDrawer(getResources()); + } + textDrawer = new TextDrawer(getResources(), showcaseAreaCalculator, getContext()); + + updateStyle(styled, false); + + init(); + } + + private void init() { + + setOnTouchListener(this); + + if (mEndButton.getParent() == null) { + int margin = (int) getResources().getDimension(R.dimen.button_margin); + RelativeLayout.LayoutParams lps = (LayoutParams) generateDefaultLayoutParams(); + lps.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); + lps.addRule(RelativeLayout.ALIGN_PARENT_RIGHT); + lps.setMargins(margin, margin, margin, margin); + mEndButton.setLayoutParams(lps); + mEndButton.setText(android.R.string.ok); + if (!hasCustomClickListener) { + mEndButton.setOnClickListener(hideOnClickListener); + } + addView(mEndButton); + } + + } + + private boolean hasShot() { + return shotStateStore.hasShot(); + } + + void setShowcasePosition(Point point) { + setShowcasePosition(point.x, point.y); + } + + void setShowcasePosition(int x, int y) { + if (shotStateStore.hasShot()) { + return; + } + showcaseX = x; + showcaseY = y; + //init(); + invalidate(); + } + + public void setTarget(final Target target) { + setShowcase(target, false); + } + + public void setShowcase(final Target target, final boolean animate) { + postDelayed(new Runnable() { + @Override + public void run() { + + if (!shotStateStore.hasShot()) { + + updateBitmap(); + Point targetPoint = target.getPoint(); + if (targetPoint != null) { + hasNoTarget = false; + if (animate) { + animationFactory.animateTargetToPoint(ShowcaseView.this, targetPoint); + } else { + setShowcasePosition(targetPoint); + } + } else { + hasNoTarget = true; + invalidate(); + } + + } + } + }, 100); + } + + private void updateBitmap() { + if (bitmapBuffer == null || haveBoundsChanged()) { + if(bitmapBuffer != null) + bitmapBuffer.recycle(); + bitmapBuffer = Bitmap.createBitmap(getMeasuredWidth(), getMeasuredHeight(), Bitmap.Config.ARGB_8888); + + } + } + + private boolean haveBoundsChanged() { + return getMeasuredWidth() != bitmapBuffer.getWidth() || + getMeasuredHeight() != bitmapBuffer.getHeight(); + } + + public boolean hasShowcaseView() { + return (showcaseX != 1000000 && showcaseY != 1000000) && !hasNoTarget; + } + + public void setShowcaseX(int x) { + setShowcasePosition(x, showcaseY); + } + + public void setShowcaseY(int y) { + setShowcasePosition(showcaseX, y); + } + + public int getShowcaseX() { + return showcaseX; + } + + public int getShowcaseY() { + return showcaseY; + } + + /** + * Override the standard button click event + * + * @param listener Listener to listen to on click events + */ + public void overrideButtonClick(OnClickListener listener) { + if (shotStateStore.hasShot()) { + return; + } + if (mEndButton != null) { + if (listener != null) { + mEndButton.setOnClickListener(listener); + } else { + mEndButton.setOnClickListener(hideOnClickListener); + } + } + hasCustomClickListener = true; + } + + public void setOnShowcaseEventListener(OnShowcaseEventListener listener) { + if (listener != null) { + mEventListener = listener; + } else { + mEventListener = OnShowcaseEventListener.NONE; + } + } + + public void setButtonText(CharSequence text) { + if (mEndButton != null) { + mEndButton.setText(text); + } + } + + private void recalculateText() { + boolean recalculatedCling = showcaseAreaCalculator.calculateShowcaseRect(showcaseX, showcaseY, showcaseDrawer); + boolean recalculateText = recalculatedCling || hasAlteredText; + if (recalculateText) { + textDrawer.calculateTextPosition(getMeasuredWidth(), getMeasuredHeight(), this, shouldCentreText); + } + hasAlteredText = false; + } + + @SuppressWarnings("NullableProblems") + @Override + protected void dispatchDraw(Canvas canvas) { + if (showcaseX < 0 || showcaseY < 0 || shotStateStore.hasShot() || bitmapBuffer == null) { + super.dispatchDraw(canvas); + return; + } + + //Draw background color + showcaseDrawer.erase(bitmapBuffer); + + // Draw the showcase drawable + if (!hasNoTarget) { + showcaseDrawer.drawShowcase(bitmapBuffer, showcaseX, showcaseY, scaleMultiplier); + showcaseDrawer.drawToCanvas(canvas, bitmapBuffer); + } + + // Draw the text on the screen, recalculating its position if necessary + textDrawer.draw(canvas); + + super.dispatchDraw(canvas); + + } + + @Override + public void hide() { + clearBitmap(); + // If the type is set to one-shot, store that it has shot + shotStateStore.storeShot(); + mEventListener.onShowcaseViewHide(this); + fadeOutShowcase(); + } + + private void clearBitmap() { + if (bitmapBuffer != null && !bitmapBuffer.isRecycled()) { + bitmapBuffer.recycle(); + bitmapBuffer = null; + } + } + + private void fadeOutShowcase() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + animationFactory.fadeOutView(this, fadeOutMillis, new AnimationEndListener() { + @Override + public void onAnimationEnd() { + setVisibility(View.GONE); + mEventListener.onShowcaseViewDidHide(ShowcaseView.this); + } + }); + } else { + setVisibility(View.GONE); + mEventListener.onShowcaseViewDidHide(ShowcaseView.this); + } + } + + @Override + public void show() { + isShowing = true; + mEventListener.onShowcaseViewShow(this); + fadeInShowcase(); + } + + private void fadeInShowcase() { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + animationFactory.fadeInView(this, fadeInMillis, + new AnimationStartListener() { + @Override + public void onAnimationStart() { + setVisibility(View.VISIBLE); + } + } + ); + } else { + setVisibility(View.VISIBLE); + } + } + + @Override + public boolean onTouch(View view, MotionEvent motionEvent) { + + float xDelta = Math.abs(motionEvent.getRawX() - showcaseX); + float yDelta = Math.abs(motionEvent.getRawY() - showcaseY); + double distanceFromFocus = Math.sqrt(Math.pow(xDelta, 2) + Math.pow(yDelta, 2)); + + if (MotionEvent.ACTION_UP == motionEvent.getAction() && + hideOnTouch && distanceFromFocus > showcaseDrawer.getBlockedRadius()) { + this.hide(); + return true; + } + + return blockTouches && distanceFromFocus > showcaseDrawer.getBlockedRadius(); + } + + private static void insertShowcaseView(ShowcaseView showcaseView, Activity activity) { + ((ViewGroup) activity.getWindow().getDecorView()).addView(showcaseView); + if (!showcaseView.hasShot()) { + showcaseView.show(); + } else { + showcaseView.hideImmediate(); + } + } + + private void hideImmediate() { + isShowing = false; + setVisibility(GONE); + } + + @Override + public void setContentTitle(CharSequence title) { + textDrawer.setContentTitle(title); + } + + @Override + public void setContentText(CharSequence text) { + textDrawer.setContentText(text); + } + + private void setScaleMultiplier(float scaleMultiplier) { + this.scaleMultiplier = scaleMultiplier; + } + + public void hideButton() { + mEndButton.setVisibility(GONE); + } + + public void showButton() { + mEndButton.setVisibility(VISIBLE); + } + + /** + * Builder class which allows easier creation of {@link ShowcaseView}s. + * It is recommended that you use this Builder class. + */ + public static class Builder { + + final ShowcaseView showcaseView; + private final Activity activity; + + public Builder(Activity activity) { + this(activity, false); + } + + public Builder(Activity activity, boolean useNewStyle) { + this.activity = activity; + this.showcaseView = new ShowcaseView(activity, useNewStyle); + this.showcaseView.setTarget(Target.NONE); + } + + /** + * Create the {@link com.github.amlcurran.showcaseview.ShowcaseView} and show it. + * + * @return the created ShowcaseView + */ + public ShowcaseView build() { + insertShowcaseView(showcaseView, activity); + return showcaseView; + } + + /** + * Set the title text shown on the ShowcaseView. + */ + public Builder setContentTitle(int resId) { + return setContentTitle(activity.getString(resId)); + } + + /** + * Set the title text shown on the ShowcaseView. + */ + public Builder setContentTitle(CharSequence title) { + showcaseView.setContentTitle(title); + return this; + } + + /** + * Set the descriptive text shown on the ShowcaseView. + */ + public Builder setContentText(int resId) { + return setContentText(activity.getString(resId)); + } + + /** + * Set the descriptive text shown on the ShowcaseView. + */ + public Builder setContentText(CharSequence text) { + showcaseView.setContentText(text); + return this; + } + + /** + * Set the target of the showcase. + * + * @param target a {@link com.github.amlcurran.showcaseview.targets.Target} representing + * the item to showcase (e.g., a button, or action item). + */ + public Builder setTarget(Target target) { + showcaseView.setTarget(target); + return this; + } + + /** + * Set the style of the ShowcaseView. See the sample app for example styles. + */ + public Builder setStyle(int theme) { + showcaseView.setStyle(theme); + return this; + } + + /** + * Set a listener which will override the button clicks. + *

+ * Note that you will have to manually hide the ShowcaseView + */ + public Builder setOnClickListener(OnClickListener onClickListener) { + showcaseView.overrideButtonClick(onClickListener); + return this; + } + + /** + * Don't make the ShowcaseView block touches on itself. This doesn't + * block touches in the showcased area. + *

+ * By default, the ShowcaseView does block touches + */ + public Builder doNotBlockTouches() { + showcaseView.setBlocksTouches(false); + return this; + } + + /** + * Make this ShowcaseView hide when the user touches outside the showcased area. + * This enables {@link #doNotBlockTouches()} as well. + *

+ * By default, the ShowcaseView doesn't hide on touch. + */ + public Builder hideOnTouchOutside() { + showcaseView.setBlocksTouches(true); + showcaseView.setHideOnTouchOutside(true); + return this; + } + + /** + * Set the ShowcaseView to only ever show once. + * + * @param shotId a unique identifier (across the app) to store + * whether this ShowcaseView has been shown. + */ + public Builder singleShot(long shotId) { + showcaseView.setSingleShot(shotId); + return this; + } + + public Builder setShowcaseEventListener(OnShowcaseEventListener showcaseEventListener) { + showcaseView.setOnShowcaseEventListener(showcaseEventListener); + return this; + } + } + + /** + * Set whether the text should be centred in the screen, or left-aligned (which is the default). + */ + public void setShouldCentreText(boolean shouldCentreText) { + this.shouldCentreText = shouldCentreText; + hasAlteredText = true; + invalidate(); + } + + /** + * @see com.github.amlcurran.showcaseview.ShowcaseView.Builder#setSingleShot(long) + */ + private void setSingleShot(long shotId) { + shotStateStore.setSingleShot(shotId); + } + + /** + * Change the position of the ShowcaseView's button from the default bottom-right position. + * + * @param layoutParams a {@link android.widget.RelativeLayout.LayoutParams} representing + * the new position of the button + */ + @Override + public void setButtonPosition(RelativeLayout.LayoutParams layoutParams) { + mEndButton.setLayoutParams(layoutParams); + } + + /** + * Set the duration of the fading in and fading out of the ShowcaseView + */ + private void setFadeDurations(long fadeInMillis, long fadeOutMillis) { + this.fadeInMillis = fadeInMillis; + this.fadeOutMillis = fadeOutMillis; + } + + /** + * @see com.github.amlcurran.showcaseview.ShowcaseView.Builder#hideOnTouchOutside() + */ + @Override + public void setHideOnTouchOutside(boolean hideOnTouch) { + this.hideOnTouch = hideOnTouch; + } + + /** + * @see com.github.amlcurran.showcaseview.ShowcaseView.Builder#doNotBlockTouches() + */ + @Override + public void setBlocksTouches(boolean blockTouches) { + this.blockTouches = blockTouches; + } + + /** + * @see com.github.amlcurran.showcaseview.ShowcaseView.Builder#setStyle(int) + */ + @Override + public void setStyle(int theme) { + TypedArray array = getContext().obtainStyledAttributes(theme, R.styleable.ShowcaseView); + updateStyle(array, true); + } + + @Override + public boolean isShowing() { + return isShowing; + } + + private void updateStyle(TypedArray styled, boolean invalidate) { + int backgroundColor = styled.getColor(R.styleable.ShowcaseView_sv_backgroundColor, Color.argb(128, 80, 80, 80)); + int showcaseColor = styled.getColor(R.styleable.ShowcaseView_sv_showcaseColor, HOLO_BLUE); + String buttonText = styled.getString(R.styleable.ShowcaseView_sv_buttonText); + if (TextUtils.isEmpty(buttonText)) { + buttonText = getResources().getString(android.R.string.ok); + } + boolean tintButton = styled.getBoolean(R.styleable.ShowcaseView_sv_tintButtonColor, true); + + int titleTextAppearance = styled.getResourceId(R.styleable.ShowcaseView_sv_titleTextAppearance, + R.style.TextAppearance_ShowcaseView_Title); + int detailTextAppearance = styled.getResourceId(R.styleable.ShowcaseView_sv_detailTextAppearance, + R.style.TextAppearance_ShowcaseView_Detail); + + styled.recycle(); + + showcaseDrawer.setShowcaseColour(showcaseColor); + showcaseDrawer.setBackgroundColour(backgroundColor); + tintButton(showcaseColor, tintButton); + mEndButton.setText(buttonText); + textDrawer.setTitleStyling(titleTextAppearance); + textDrawer.setDetailStyling(detailTextAppearance); + hasAlteredText = true; + + if (invalidate) { + invalidate(); + } + } + + private void tintButton(int showcaseColor, boolean tintButton) { + if (tintButton) { + mEndButton.getBackground().setColorFilter(showcaseColor, PorterDuff.Mode.MULTIPLY); + } else { + mEndButton.getBackground().setColorFilter(HOLO_BLUE, PorterDuff.Mode.MULTIPLY); + } + } + + private class UpdateOnGlobalLayout implements ViewTreeObserver.OnGlobalLayoutListener { + + @Override + public void onGlobalLayout() { + if (!shotStateStore.hasShot()) { + updateBitmap(); + } + } + } + + private class CalculateTextOnPreDraw implements ViewTreeObserver.OnPreDrawListener { + + @Override + public boolean onPreDraw() { + recalculateText(); + return true; + } + } + + private OnClickListener hideOnClickListener = new OnClickListener() { + @Override + public void onClick(View v) { + hide(); + } + }; + +} diff --git a/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseViewApi.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseViewApi.java new file mode 100644 index 0000000000..c1f7ba55f6 --- /dev/null +++ b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/ShowcaseViewApi.java @@ -0,0 +1,43 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview; + +import android.widget.RelativeLayout; + +/** + * A simple interface which makes it easy to keep track of what is in the public + * ShowcaseView API + */ +public interface ShowcaseViewApi { + void hide(); + + void show(); + + void setContentTitle(CharSequence title); + + void setContentText(CharSequence text); + + void setButtonPosition(RelativeLayout.LayoutParams layoutParams); + + void setHideOnTouchOutside(boolean hideOnTouch); + + void setBlocksTouches(boolean blockTouches); + + void setStyle(int theme); + + boolean isShowing(); +} diff --git a/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/StandardShowcaseDrawer.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/StandardShowcaseDrawer.java new file mode 100644 index 0000000000..213461ccea --- /dev/null +++ b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/StandardShowcaseDrawer.java @@ -0,0 +1,96 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview; + +import android.content.res.Resources; +import android.graphics.Bitmap; +import android.graphics.Canvas; +import android.graphics.Paint; +import android.graphics.PorterDuff; +import android.graphics.PorterDuffXfermode; +import android.graphics.drawable.Drawable; + +class StandardShowcaseDrawer implements ShowcaseDrawer { + + protected final Paint eraserPaint; + protected final Drawable showcaseDrawable; + private final Paint basicPaint; + private final float showcaseRadius; + protected int backgroundColour; + + public StandardShowcaseDrawer(Resources resources) { + PorterDuffXfermode xfermode = new PorterDuffXfermode(PorterDuff.Mode.MULTIPLY); + eraserPaint = new Paint(); + eraserPaint.setColor(0xFFFFFF); + eraserPaint.setAlpha(0); + eraserPaint.setXfermode(xfermode); + eraserPaint.setAntiAlias(true); + basicPaint = new Paint(); + showcaseRadius = resources.getDimension(R.dimen.showcase_radius); + showcaseDrawable = resources.getDrawable(R.drawable.cling_bleached); + } + + @Override + public void setShowcaseColour(int color) { + showcaseDrawable.setColorFilter(color, PorterDuff.Mode.MULTIPLY); + } + + @Override + public void drawShowcase(Bitmap buffer, float x, float y, float scaleMultiplier) { + Canvas bufferCanvas = new Canvas(buffer); + bufferCanvas.drawCircle(x, y, showcaseRadius, eraserPaint); + int halfW = getShowcaseWidth() / 2; + int halfH = getShowcaseHeight() / 2; + int left = (int) (x - halfW); + int top = (int) (y - halfH); + showcaseDrawable.setBounds(left, top, + left + getShowcaseWidth(), + top + getShowcaseHeight()); + showcaseDrawable.draw(bufferCanvas); + } + + @Override + public int getShowcaseWidth() { + return showcaseDrawable.getIntrinsicWidth(); + } + + @Override + public int getShowcaseHeight() { + return showcaseDrawable.getIntrinsicHeight(); + } + + @Override + public float getBlockedRadius() { + return showcaseRadius; + } + + @Override + public void setBackgroundColour(int backgroundColor) { + this.backgroundColour = backgroundColor; + } + + @Override + public void erase(Bitmap bitmapBuffer) { + bitmapBuffer.eraseColor(backgroundColour); + } + + @Override + public void drawToCanvas(Canvas canvas, Bitmap bitmapBuffer) { + canvas.drawBitmap(bitmapBuffer, 0, 0, basicPaint); + } + +} diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/TextDrawer.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/TextDrawer.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/TextDrawer.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/TextDrawer.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ActionBarReflector.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ActionBarReflector.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ActionBarReflector.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ActionBarReflector.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ActionBarViewWrapper.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ActionBarViewWrapper.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ActionBarViewWrapper.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ActionBarViewWrapper.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ActionItemTarget.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ActionItemTarget.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ActionItemTarget.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ActionItemTarget.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ActionViewTarget.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ActionViewTarget.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ActionViewTarget.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ActionViewTarget.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/AppCompatReflector.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/AppCompatReflector.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/AppCompatReflector.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/AppCompatReflector.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/PointTarget.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/PointTarget.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/PointTarget.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/PointTarget.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/Reflector.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/Reflector.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/Reflector.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/Reflector.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ReflectorFactory.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ReflectorFactory.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ReflectorFactory.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ReflectorFactory.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/SherlockReflector.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/SherlockReflector.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/SherlockReflector.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/SherlockReflector.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/Target.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/Target.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/Target.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/Target.java diff --git a/deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ViewTarget.java b/ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ViewTarget.java similarity index 100% rename from deps/showcaseview/src/com/github/amlcurran/showcaseview/targets/ViewTarget.java rename to ShowcaseView/library/src/main/java/com/github/amlcurran/showcaseview/targets/ViewTarget.java diff --git a/deps/showcaseview/res/drawable-hdpi/btn_cling_normal.9.png b/ShowcaseView/library/src/main/res/drawable-hdpi/btn_cling_normal.9.png similarity index 100% rename from deps/showcaseview/res/drawable-hdpi/btn_cling_normal.9.png rename to ShowcaseView/library/src/main/res/drawable-hdpi/btn_cling_normal.9.png diff --git a/deps/showcaseview/res/drawable-hdpi/btn_cling_pressed.9.png b/ShowcaseView/library/src/main/res/drawable-hdpi/btn_cling_pressed.9.png similarity index 100% rename from deps/showcaseview/res/drawable-hdpi/btn_cling_pressed.9.png rename to ShowcaseView/library/src/main/res/drawable-hdpi/btn_cling_pressed.9.png diff --git a/deps/showcaseview/res/drawable-hdpi/cling.png b/ShowcaseView/library/src/main/res/drawable-hdpi/cling.png similarity index 100% rename from deps/showcaseview/res/drawable-hdpi/cling.png rename to ShowcaseView/library/src/main/res/drawable-hdpi/cling.png diff --git a/deps/showcaseview/res/drawable-hdpi/hand.png b/ShowcaseView/library/src/main/res/drawable-hdpi/hand.png similarity index 100% rename from deps/showcaseview/res/drawable-hdpi/hand.png rename to ShowcaseView/library/src/main/res/drawable-hdpi/hand.png diff --git a/deps/showcaseview/res/drawable-mdpi/btn_cling_normal.9.png b/ShowcaseView/library/src/main/res/drawable-mdpi/btn_cling_normal.9.png similarity index 100% rename from deps/showcaseview/res/drawable-mdpi/btn_cling_normal.9.png rename to ShowcaseView/library/src/main/res/drawable-mdpi/btn_cling_normal.9.png diff --git a/deps/showcaseview/res/drawable-mdpi/btn_cling_pressed.9.png b/ShowcaseView/library/src/main/res/drawable-mdpi/btn_cling_pressed.9.png similarity index 100% rename from deps/showcaseview/res/drawable-mdpi/btn_cling_pressed.9.png rename to ShowcaseView/library/src/main/res/drawable-mdpi/btn_cling_pressed.9.png diff --git a/deps/showcaseview/res/drawable-mdpi/cling.png b/ShowcaseView/library/src/main/res/drawable-mdpi/cling.png similarity index 100% rename from deps/showcaseview/res/drawable-mdpi/cling.png rename to ShowcaseView/library/src/main/res/drawable-mdpi/cling.png diff --git a/deps/showcaseview/res/drawable-mdpi/hand.png b/ShowcaseView/library/src/main/res/drawable-mdpi/hand.png similarity index 100% rename from deps/showcaseview/res/drawable-mdpi/hand.png rename to ShowcaseView/library/src/main/res/drawable-mdpi/hand.png diff --git a/deps/showcaseview/res/drawable-xhdpi/btn_cling_normal.9.png b/ShowcaseView/library/src/main/res/drawable-xhdpi/btn_cling_normal.9.png similarity index 100% rename from deps/showcaseview/res/drawable-xhdpi/btn_cling_normal.9.png rename to ShowcaseView/library/src/main/res/drawable-xhdpi/btn_cling_normal.9.png diff --git a/deps/showcaseview/res/drawable-xhdpi/btn_cling_pressed.9.png b/ShowcaseView/library/src/main/res/drawable-xhdpi/btn_cling_pressed.9.png similarity index 100% rename from deps/showcaseview/res/drawable-xhdpi/btn_cling_pressed.9.png rename to ShowcaseView/library/src/main/res/drawable-xhdpi/btn_cling_pressed.9.png diff --git a/deps/showcaseview/res/drawable-xhdpi/cling.png b/ShowcaseView/library/src/main/res/drawable-xhdpi/cling.png similarity index 100% rename from deps/showcaseview/res/drawable-xhdpi/cling.png rename to ShowcaseView/library/src/main/res/drawable-xhdpi/cling.png diff --git a/deps/showcaseview/res/drawable-xhdpi/cling_bleached.png b/ShowcaseView/library/src/main/res/drawable-xhdpi/cling_bleached.png similarity index 100% rename from deps/showcaseview/res/drawable-xhdpi/cling_bleached.png rename to ShowcaseView/library/src/main/res/drawable-xhdpi/cling_bleached.png diff --git a/deps/showcaseview/res/drawable-xhdpi/hand.png b/ShowcaseView/library/src/main/res/drawable-xhdpi/hand.png similarity index 100% rename from deps/showcaseview/res/drawable-xhdpi/hand.png rename to ShowcaseView/library/src/main/res/drawable-xhdpi/hand.png diff --git a/deps/showcaseview/res/drawable/button.xml b/ShowcaseView/library/src/main/res/drawable/button.xml similarity index 100% rename from deps/showcaseview/res/drawable/button.xml rename to ShowcaseView/library/src/main/res/drawable/button.xml diff --git a/deps/showcaseview/res/drawable/button_normal.xml b/ShowcaseView/library/src/main/res/drawable/button_normal.xml similarity index 100% rename from deps/showcaseview/res/drawable/button_normal.xml rename to ShowcaseView/library/src/main/res/drawable/button_normal.xml diff --git a/deps/showcaseview/res/drawable/cling_button_bg.xml b/ShowcaseView/library/src/main/res/drawable/cling_button_bg.xml similarity index 100% rename from deps/showcaseview/res/drawable/cling_button_bg.xml rename to ShowcaseView/library/src/main/res/drawable/cling_button_bg.xml diff --git a/deps/showcaseview/res/layout/handy.xml b/ShowcaseView/library/src/main/res/layout/handy.xml similarity index 100% rename from deps/showcaseview/res/layout/handy.xml rename to ShowcaseView/library/src/main/res/layout/handy.xml diff --git a/deps/showcaseview/res/layout/showcase_button.xml b/ShowcaseView/library/src/main/res/layout/showcase_button.xml similarity index 100% rename from deps/showcaseview/res/layout/showcase_button.xml rename to ShowcaseView/library/src/main/res/layout/showcase_button.xml diff --git a/deps/showcaseview/res/values/attrs.xml b/ShowcaseView/library/src/main/res/values/attrs.xml similarity index 100% rename from deps/showcaseview/res/values/attrs.xml rename to ShowcaseView/library/src/main/res/values/attrs.xml diff --git a/deps/showcaseview/res/values/dimens.xml b/ShowcaseView/library/src/main/res/values/dimens.xml similarity index 100% rename from deps/showcaseview/res/values/dimens.xml rename to ShowcaseView/library/src/main/res/values/dimens.xml diff --git a/deps/showcaseview/res/values/ids.xml b/ShowcaseView/library/src/main/res/values/ids.xml similarity index 100% rename from deps/showcaseview/res/values/ids.xml rename to ShowcaseView/library/src/main/res/values/ids.xml diff --git a/deps/showcaseview/res/values/strings.xml b/ShowcaseView/library/src/main/res/values/strings.xml similarity index 100% rename from deps/showcaseview/res/values/strings.xml rename to ShowcaseView/library/src/main/res/values/strings.xml diff --git a/deps/showcaseview/res/values/styles.xml b/ShowcaseView/library/src/main/res/values/styles.xml similarity index 100% rename from deps/showcaseview/res/values/styles.xml rename to ShowcaseView/library/src/main/res/values/styles.xml diff --git a/ShowcaseView/project.properties b/ShowcaseView/project.properties new file mode 100644 index 0000000000..f2d48ad869 --- /dev/null +++ b/ShowcaseView/project.properties @@ -0,0 +1,31 @@ +# +# Copyright 2014 Alex Curran +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# 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 edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +android.library=true +# Project target. +target=android-19 diff --git a/ShowcaseView/sample/build.gradle b/ShowcaseView/sample/build.gradle new file mode 100644 index 0000000000..b9d123317c --- /dev/null +++ b/ShowcaseView/sample/build.gradle @@ -0,0 +1,58 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:0.13.+' + } +} + +repositories { + mavenCentral() + maven { + url 'https://oss.sonatype.org/content/repositories/snapshots' + } +} + +apply plugin: 'com.android.application' + +dependencies { + compile project(':library') + //compile 'com.github.amlcurran.showcaseview:library:5.0.0-SNAPSHOT' + compile 'com.android.support:support-v4:19.1.0' + compile 'com.nineoldandroids:library:2.4.0' + compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar' +} + +android { + compileSdkVersion Integer.parseInt(COMPILE_SDK) + buildToolsVersion BUILD_TOOLS_VERSION + + defaultConfig { + versionName VERSION_NAME + versionCode Integer.parseInt(VERSION_CODE) + targetSdkVersion Integer.parseInt(TARGET_SDK) + minSdkVersion Integer.parseInt(MIN_SDK) + } + + lintOptions { + abortOnError false + } +} diff --git a/ShowcaseView/sample/gradle.properties b/ShowcaseView/sample/gradle.properties new file mode 100644 index 0000000000..60cce86e43 --- /dev/null +++ b/ShowcaseView/sample/gradle.properties @@ -0,0 +1,19 @@ +# +# Copyright 2014 Alex Curran +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +POM_NAME=ShowcaseView sample app +POM_ARTIFACT_ID=sample +POM_PACKAGING=apk \ No newline at end of file diff --git a/ShowcaseView/sample/src/main/AndroidManifest.xml b/ShowcaseView/sample/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..56c2249c30 --- /dev/null +++ b/ShowcaseView/sample/src/main/AndroidManifest.xml @@ -0,0 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/MemoryManagementTesting.java b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/MemoryManagementTesting.java new file mode 100644 index 0000000000..3e73d87bbd --- /dev/null +++ b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/MemoryManagementTesting.java @@ -0,0 +1,39 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview.sample; + +import android.app.Activity; +import android.os.Bundle; + +public class MemoryManagementTesting extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.main); + +// ShowcaseViews showcaseViews = new ShowcaseViews(this); +// +// ShowcaseViews.ItemViewProperties properties = new ShowcaseViews.ItemViewProperties( +// R.id.buttonBlocked, R.string.showcase_like_title, R.string.showcase_like_message +// ); +// +// showcaseViews.addView(properties).addView(properties).addView(properties).addView(properties) +// .addView(properties).addView(properties).show(); + + } +} diff --git a/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/SampleActivity.java b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/SampleActivity.java new file mode 100644 index 0000000000..088c06eef6 --- /dev/null +++ b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/SampleActivity.java @@ -0,0 +1,181 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview.sample; + +import android.annotation.TargetApi; +import android.app.Activity; +import android.content.Context; +import android.content.Intent; +import android.os.Build; +import android.os.Bundle; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.AdapterView; +import android.widget.ArrayAdapter; +import android.widget.Button; +import android.widget.ListView; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import com.github.amlcurran.showcaseview.ApiUtils; +import com.github.amlcurran.showcaseview.OnShowcaseEventListener; +import com.github.amlcurran.showcaseview.ShowcaseView; +import com.github.amlcurran.showcaseview.sample.animations.AnimationSampleActivity; +import com.github.amlcurran.showcaseview.sample.v14.ActionItemsSampleActivity; +import com.github.amlcurran.showcaseview.targets.ViewTarget; + +public class SampleActivity extends Activity implements View.OnClickListener, + OnShowcaseEventListener, AdapterView.OnItemClickListener { + + private static final float ALPHA_DIM_VALUE = 0.1f; + + ShowcaseView sv; + Button buttonBlocked; + ListView listView; + + private final ApiUtils apiUtils = new ApiUtils(); + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.main); + + HardcodedListAdapter adapter = new HardcodedListAdapter(this); + listView = (ListView) findViewById(R.id.listView); + listView.setAdapter(adapter); + listView.setOnItemClickListener(this); + + buttonBlocked = (Button) findViewById(R.id.buttonBlocked); + buttonBlocked.setOnClickListener(this); + + RelativeLayout.LayoutParams lps = new RelativeLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT); + lps.addRule(RelativeLayout.ALIGN_PARENT_BOTTOM); + lps.addRule(RelativeLayout.ALIGN_PARENT_LEFT); + int margin = ((Number) (getResources().getDisplayMetrics().density * 12)).intValue(); + lps.setMargins(margin, margin, margin, margin); + + ViewTarget target = new ViewTarget(R.id.buttonBlocked, this); + sv = new ShowcaseView.Builder(this, true) + .setTarget(target) + .setContentTitle(R.string.showcase_main_title) + .setContentText(R.string.showcase_main_message) + .setStyle(R.style.CustomShowcaseTheme2) + .setShowcaseEventListener(this) + .build(); + sv.setButtonPosition(lps); + } + + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + private void dimView(View view) { + if (apiUtils.isCompatWithHoneycomb()) { + view.setAlpha(ALPHA_DIM_VALUE); + } + } + + @Override + public void onClick(View view) { + + int viewId = view.getId(); + switch (viewId) { + case R.id.buttonBlocked: + if (sv.isShown()) { + sv.setStyle(R.style.CustomShowcaseTheme); + } else { + sv.show(); + } + break; + } + } + + @Override + public void onShowcaseViewHide(ShowcaseView showcaseView) { + if (apiUtils.isCompatWithHoneycomb()) { + listView.setAlpha(1f); + } + buttonBlocked.setText(R.string.button_show); + //buttonBlocked.setEnabled(false); + } + + @Override + public void onShowcaseViewDidHide(ShowcaseView showcaseView) { + } + + @Override + public void onShowcaseViewShow(ShowcaseView showcaseView) { + dimView(listView); + buttonBlocked.setText(R.string.button_hide); + //buttonBlocked.setEnabled(true); + } + + @Override + public void onItemClick(AdapterView adapterView, View view, int position, long l) { + switch (position) { + + case 0: + startActivity(new Intent(this, ActionItemsSampleActivity.class)); + break; + + case 1: + startActivity(new Intent(this, AnimationSampleActivity.class)); + break; + + case 2: + startActivity(new Intent(this, SingleShotActivity.class)); + break; + + // Not currently used + case 3: + startActivity(new Intent(this, MemoryManagementTesting.class)); + } + } + + private static class HardcodedListAdapter extends ArrayAdapter { + + private static final int[] TITLE_RES_IDS = new int[] { + R.string.title_action_items, + R.string.title_animations, + R.string.title_single_shot//, R.string.title_memory + }; + + private static final int[] SUMMARY_RES_IDS = new int[] { + R.string.sum_action_items, + R.string.sum_animations, + R.string.sum_single_shot//, R.string.sum_memory + }; + + public HardcodedListAdapter(Context context) { + super(context, R.layout.item_next_thing); + } + + @Override + public int getCount() { + return TITLE_RES_IDS.length; + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + if (convertView == null) { + convertView = LayoutInflater.from(getContext()).inflate(R.layout.item_next_thing, parent, false); + } + ((TextView) convertView.findViewById(R.id.textView)).setText(TITLE_RES_IDS[position]); + ((TextView) convertView.findViewById(R.id.textView2)).setText(SUMMARY_RES_IDS[position]); + return convertView; + } + } + +} diff --git a/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/SingleShotActivity.java b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/SingleShotActivity.java new file mode 100644 index 0000000000..4ec2fe0acf --- /dev/null +++ b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/SingleShotActivity.java @@ -0,0 +1,41 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview.sample; + +import android.app.Activity; +import android.os.Bundle; + +import com.github.amlcurran.showcaseview.ShowcaseView; +import com.github.amlcurran.showcaseview.targets.Target; +import com.github.amlcurran.showcaseview.targets.ViewTarget; + +public class SingleShotActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_single_shot); + + Target viewTarget = new ViewTarget(R.id.button, this); + new ShowcaseView.Builder(this, true) + .setTarget(viewTarget) + .setContentTitle(R.string.title_single_shot) + .setContentText(R.string.R_string_desc_single_shot) + .singleShot(42) + .build(); + } +} diff --git a/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/animations/AnimationSampleActivity.java b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/animations/AnimationSampleActivity.java new file mode 100644 index 0000000000..7288aa7926 --- /dev/null +++ b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/animations/AnimationSampleActivity.java @@ -0,0 +1,93 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview.sample.animations; + +import android.app.Activity; +import android.os.Bundle; +import android.view.View; +import android.widget.TextView; + +import com.github.amlcurran.showcaseview.ApiUtils; +import com.github.amlcurran.showcaseview.ShowcaseView; +import com.github.amlcurran.showcaseview.sample.R; +import com.github.amlcurran.showcaseview.targets.Target; +import com.github.amlcurran.showcaseview.targets.ViewTarget; + +/** + * Created by Alex on 26/10/13. + */ +public class AnimationSampleActivity extends Activity implements View.OnClickListener { + + private ShowcaseView showcaseView; + private int counter = 0; + private TextView textView1; + private TextView textView2; + private TextView textView3; + private final ApiUtils apiUtils = new ApiUtils(); + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_animation); + + textView1 = (TextView) findViewById(R.id.textView); + textView2 = (TextView) findViewById(R.id.textView2); + textView3 = (TextView) findViewById(R.id.textView3); + + showcaseView = new ShowcaseView.Builder(this) + .setTarget(new ViewTarget(findViewById(R.id.textView))) + .setOnClickListener(this) + .build(); + showcaseView.setButtonText(getString(R.string.next)); + } + + + private void setAlpha(float alpha, View... views) { + if (apiUtils.isCompatWithHoneycomb()) { + for (View view : views) { + view.setAlpha(alpha); + } + } + } + + @Override + public void onClick(View v) { + switch (counter) { + case 0: + showcaseView.setShowcase(new ViewTarget(textView2), true); + break; + + case 1: + showcaseView.setShowcase(new ViewTarget(textView3), true); + break; + + case 2: + showcaseView.setTarget(Target.NONE); + showcaseView.setContentTitle("Check it out"); + showcaseView.setContentText("You don't always need a target to showcase"); + showcaseView.setButtonText(getString(R.string.close)); + setAlpha(0.4f, textView1, textView2, textView3); + break; + + case 3: + showcaseView.hide(); + setAlpha(1.0f, textView1, textView2, textView3); + break; + } + counter++; + } +} diff --git a/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/legacy/MultipleShowcaseSampleActivity.java b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/legacy/MultipleShowcaseSampleActivity.java new file mode 100644 index 0000000000..179eecc090 --- /dev/null +++ b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/legacy/MultipleShowcaseSampleActivity.java @@ -0,0 +1,83 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview.sample.legacy; + +import android.annotation.TargetApi; +import android.app.Activity; +import android.os.Build; +import android.os.Bundle; +import android.view.MenuItem; +import android.view.View; +import android.widget.Toast; + +import com.github.amlcurran.showcaseview.sample.R; + +public class MultipleShowcaseSampleActivity extends Activity { + + private static final float SHOWCASE_KITTEN_SCALE = 1.2f; + private static final float SHOWCASE_LIKE_SCALE = 0.5f; + //ShowcaseViews mViews; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_sample_legacy); + + findViewById(R.id.buttonLike).setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View view) { + Toast.makeText(getApplicationContext(), R.string.like_message, Toast.LENGTH_SHORT).show(); + } + }); + + //mOptions.block = false; +// mViews = new ShowcaseViews(this, +// new ShowcaseViews.OnShowcaseAcknowledged() { +// @Override +// public void onShowCaseAcknowledged(ShowcaseView showcaseView) { +// Toast.makeText(MultipleShowcaseSampleActivity.this, R.string.dismissed_message, Toast.LENGTH_SHORT).show(); +// } +// }); +// mViews.addView( new ShowcaseViews.ItemViewProperties(R.id.image, +// R.string.showcase_image_title, +// R.string.showcase_image_message, +// SHOWCASE_KITTEN_SCALE)); +// mViews.addView( new ShowcaseViews.ItemViewProperties(R.id.buttonLike, +// R.string.showcase_like_title, +// R.string.showcase_like_message, +// SHOWCASE_LIKE_SCALE)); +// mViews.show(); + + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + enableUp(); + } + } + + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + private void enableUp() { + getActionBar().setDisplayHomeAsUpEnabled(true); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + finish(); + } + return super.onOptionsItemSelected(item); + } +} diff --git a/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/v14/ActionItemsSampleActivity.java b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/v14/ActionItemsSampleActivity.java new file mode 100644 index 0000000000..4a9c5232f5 --- /dev/null +++ b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/v14/ActionItemsSampleActivity.java @@ -0,0 +1,73 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview.sample.v14; + +import android.os.Bundle; + +import com.actionbarsherlock.app.SherlockActivity; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuItem; +import com.github.amlcurran.showcaseview.ShowcaseView; +import com.github.amlcurran.showcaseview.sample.R; +import com.github.amlcurran.showcaseview.targets.ActionItemTarget; +import com.github.amlcurran.showcaseview.targets.ActionViewTarget; + +public class ActionItemsSampleActivity extends SherlockActivity { + + ShowcaseView sv; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_sample); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getSupportMenuInflater().inflate(R.menu.menu, menu); + + ActionViewTarget target = new ActionViewTarget(this, ActionViewTarget.Type.OVERFLOW); + sv = new ShowcaseView.Builder(this) + .setTarget(target) + .setContentTitle(R.string.showcase_simple_title) + .setContentText(R.string.showcase_simple_message) + .doNotBlockTouches() + .build(); + + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + int itemId = item.getItemId(); + if (itemId == android.R.id.home) { + ActionViewTarget target = new ActionViewTarget(this, ActionViewTarget.Type.HOME); + sv.setShowcase(target, true); + } + else if (itemId == R.id.menu_item1) { + ActionItemTarget target = new ActionItemTarget(this, R.id.menu_item1); + sv.setShowcase(target, true); + } + else if (itemId == R.id.menu_item2) { + ActionViewTarget target = new ActionViewTarget(this, ActionViewTarget.Type.TITLE); + sv.setShowcase(target, true); + } + return true; + } + +} diff --git a/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/v14/MultipleActionItemsSampleActivity.java b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/v14/MultipleActionItemsSampleActivity.java new file mode 100644 index 0000000000..00e33c34b5 --- /dev/null +++ b/ShowcaseView/sample/src/main/java/com/github/amlcurran/showcaseview/sample/v14/MultipleActionItemsSampleActivity.java @@ -0,0 +1,81 @@ +/* + * Copyright 2014 Alex Curran + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.amlcurran.showcaseview.sample.v14; + +import android.app.ActionBar; +import android.os.Bundle; +import android.widget.ArrayAdapter; + +import com.actionbarsherlock.app.SherlockActivity; +import com.actionbarsherlock.view.Menu; +import com.actionbarsherlock.view.MenuItem; +import com.github.amlcurran.showcaseview.sample.R; + +public class MultipleActionItemsSampleActivity extends SherlockActivity implements com.actionbarsherlock.app.ActionBar.OnNavigationListener { + + public static final float SHOWCASE_SPINNER_SCALE = 1f; + public static final float SHOWCASE_OVERFLOW_ITEM_SCALE = 0.5f; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_sample); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + getSupportActionBar().setNavigationMode(ActionBar.NAVIGATION_MODE_LIST); + getSupportActionBar().setListNavigationCallbacks(new ArrayAdapter(this, android.R.layout.simple_spinner_dropdown_item, new String[]{"Item1", "Item2", "Item3"}), this); + + } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + getSupportMenuInflater().inflate(R.menu.menu, menu); + + //mOptions.block = false; +// ShowcaseViews views = new ShowcaseViews(this, new ShowcaseViews.OnShowcaseAcknowledged() { +// @Override +// public void onShowCaseAcknowledged(ShowcaseView showcaseView) { +// Toast.makeText(getApplicationContext(), R.string.dismissed_message, Toast.LENGTH_SHORT).show(); +// } +// }); +// ShowcaseView.ConfigOptions options = new ShowcaseView.ConfigOptions(); +// options.shotType = ShowcaseView.TYPE_ONE_SHOT; +// options.showcaseId = 1234; +// views.addView(new ItemViewProperties(R.id.menu_item1, R.string.showcase_menu_item_one_shot_title, R.string.showcase_menu_item_one_shot_message, ShowcaseView.ITEM_SPINNER, SHOWCASE_SPINNER_SCALE, options)); +// ShowcaseView.ConfigOptions configOptions = new ShowcaseView.ConfigOptions(); +// configOptions.fadeInDuration = 700; +// configOptions.fadeOutDuration = 700; +// configOptions.block = true; +// views.addView(new ItemViewProperties(ItemViewProperties.ID_SPINNER, R.string.showcase_spinner_title, R.string.showcase_spinner_message, ShowcaseView.ITEM_SPINNER, SHOWCASE_SPINNER_SCALE, configOptions)); +// views.addView(new ItemViewProperties(ItemViewProperties.ID_OVERFLOW, R.string.showcase_overflow_title, R.string.showcase_overflow_message, ShowcaseView.ITEM_ACTION_OVERFLOW, SHOWCASE_OVERFLOW_ITEM_SCALE)); +// views.show(); + return super.onCreateOptionsMenu(menu); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + case android.R.id.home: + finish(); + } + return super.onOptionsItemSelected(item); + } + + @Override + public boolean onNavigationItemSelected(int i, long l) { + return false; + } +} diff --git a/ShowcaseView/sample/src/main/res/drawable-hdpi/ic_launcher.png b/ShowcaseView/sample/src/main/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000000..b467a3589f Binary files /dev/null and b/ShowcaseView/sample/src/main/res/drawable-hdpi/ic_launcher.png differ diff --git a/ShowcaseView/sample/src/main/res/drawable-mdpi/ic_launcher.png b/ShowcaseView/sample/src/main/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000000..f43f0035ac Binary files /dev/null and b/ShowcaseView/sample/src/main/res/drawable-mdpi/ic_launcher.png differ diff --git a/ShowcaseView/sample/src/main/res/drawable-xhdpi/bitmap.png b/ShowcaseView/sample/src/main/res/drawable-xhdpi/bitmap.png new file mode 100644 index 0000000000..413b97b882 Binary files /dev/null and b/ShowcaseView/sample/src/main/res/drawable-xhdpi/bitmap.png differ diff --git a/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_discard.png b/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_discard.png new file mode 100644 index 0000000000..412b333541 Binary files /dev/null and b/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_discard.png differ diff --git a/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_edit.png b/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_edit.png new file mode 100644 index 0000000000..4215579aed Binary files /dev/null and b/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_edit.png differ diff --git a/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_launcher.png b/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_launcher.png new file mode 100644 index 0000000000..d4e35583a4 Binary files /dev/null and b/ShowcaseView/sample/src/main/res/drawable-xhdpi/ic_launcher.png differ diff --git a/ShowcaseView/sample/src/main/res/drawable-xhdpi/kitten.png b/ShowcaseView/sample/src/main/res/drawable-xhdpi/kitten.png new file mode 100644 index 0000000000..14b31179b3 Binary files /dev/null and b/ShowcaseView/sample/src/main/res/drawable-xhdpi/kitten.png differ diff --git a/ShowcaseView/sample/src/main/res/drawable-xxhdpi/ic_logo.png b/ShowcaseView/sample/src/main/res/drawable-xxhdpi/ic_logo.png new file mode 100644 index 0000000000..4378593d07 Binary files /dev/null and b/ShowcaseView/sample/src/main/res/drawable-xxhdpi/ic_logo.png differ diff --git a/ShowcaseView/sample/src/main/res/layout/activity_animation.xml b/ShowcaseView/sample/src/main/res/layout/activity_animation.xml new file mode 100644 index 0000000000..f8bd37e27c --- /dev/null +++ b/ShowcaseView/sample/src/main/res/layout/activity_animation.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/ShowcaseView/sample/src/main/res/layout/activity_sample.xml b/ShowcaseView/sample/src/main/res/layout/activity_sample.xml new file mode 100644 index 0000000000..e0bd4b6d3c --- /dev/null +++ b/ShowcaseView/sample/src/main/res/layout/activity_sample.xml @@ -0,0 +1,20 @@ + + + + \ No newline at end of file diff --git a/ShowcaseView/sample/src/main/res/layout/activity_sample_legacy.xml b/ShowcaseView/sample/src/main/res/layout/activity_sample_legacy.xml new file mode 100644 index 0000000000..a4fb27e37b --- /dev/null +++ b/ShowcaseView/sample/src/main/res/layout/activity_sample_legacy.xml @@ -0,0 +1,40 @@ + + + + + + + +