diff --git a/FileManager/build.gradle b/FileManager/build.gradle index 4f67ff25..a230f3d5 100644 --- a/FileManager/build.gradle +++ b/FileManager/build.gradle @@ -2,15 +2,15 @@ apply plugin: 'com.android.application' dependencies { implementation 'com.github.openintents:distribution:3.0.2' - implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'androidx.appcompat:appcompat:1.1.0' - androidTestImplementation 'androidx.test:runner:1.1.1' - androidTestImplementation 'androidx.test:rules:1.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' - androidTestImplementation 'androidx.test.espresso:espresso-intents:3.1.1' + androidTestImplementation 'androidx.test:runner:1.2.0' + androidTestImplementation 'androidx.test:rules:1.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' + androidTestImplementation 'androidx.test.espresso:espresso-intents:3.2.0' androidTestImplementation 'androidx.test.uiautomator:uiautomator:2.2.0' - androidTestImplementation 'androidx.annotation:annotation:1.0.0' - implementation 'androidx.test.espresso:espresso-idling-resource:3.1.1' + androidTestImplementation 'androidx.annotation:annotation:1.1.0' + implementation 'androidx.test.espresso:espresso-idling-resource:3.2.0' } android { @@ -23,53 +23,32 @@ android { versionName version_name minSdkVersion min_sdk_version targetSdkVersion target_sdk_version + setProperty("archivesBaseName", "$applicationId-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - resources.srcDirs = ['src'] - aidl.srcDirs = ['src'] - renderscript.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - jni.srcDirs = ['jni'] + lintOptions { + abortOnError false + } + + flavorDimensions "market" + + productFlavors { + play { + } - // Move the tests to tests/java, tests/res, etc... - androidTest.setRoot('tests') - - // Move the build types to build-types/ - // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... - // This moves them out of them default location under src//... which would - // conflict with src/ being used by the main source set. - // Adding new build types or product flavors should be accompanied - // by a similar customization. - debug.setRoot('build-types/debug') - release.setRoot('build-types/release') - } - lintOptions { - abortOnError false + foss { + + } } buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - - applicationVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.apk')) { - def fileName = outputFile.name.replace('.apk', "-${versionName}.apk") - output.outputFileName = new File(output.outputFile.parent, fileName).getName() - } - } - } } } diff --git a/FileManager/libs/android-support-v4.jar b/FileManager/libs/android-support-v4.jar deleted file mode 100644 index 018c1272..00000000 Binary files a/FileManager/libs/android-support-v4.jar and /dev/null differ diff --git a/FileManager/libs/armeabi-v7a/libaccess.so b/FileManager/libs/armeabi-v7a/libaccess.so deleted file mode 100644 index fe6eaa6a..00000000 Binary files a/FileManager/libs/armeabi-v7a/libaccess.so and /dev/null differ diff --git a/FileManager/libs/armeabi/libaccess.so b/FileManager/libs/armeabi/libaccess.so deleted file mode 100755 index 7808d19b..00000000 Binary files a/FileManager/libs/armeabi/libaccess.so and /dev/null differ diff --git a/FileManager/libs/mips/libaccess.so b/FileManager/libs/mips/libaccess.so deleted file mode 100644 index c4cc8559..00000000 Binary files a/FileManager/libs/mips/libaccess.so and /dev/null differ diff --git a/FileManager/libs/x86/libaccess.so b/FileManager/libs/x86/libaccess.so deleted file mode 100644 index 9f820ec5..00000000 Binary files a/FileManager/libs/x86/libaccess.so and /dev/null differ diff --git a/FileManager/tests/AndroidManifest.xml b/FileManager/src/androidTest/AndroidManifest.xml similarity index 100% rename from FileManager/tests/AndroidManifest.xml rename to FileManager/src/androidTest/AndroidManifest.xml diff --git a/FileManager/tests/java/org/openintents/filemanager/test/ActivityResultTestRule.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/ActivityResultTestRule.java similarity index 93% rename from FileManager/tests/java/org/openintents/filemanager/test/ActivityResultTestRule.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/ActivityResultTestRule.java index f28599d5..e17c0439 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/ActivityResultTestRule.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/ActivityResultTestRule.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.annotation.TargetApi; import android.app.Activity; @@ -69,7 +69,7 @@ protected boolean matchesSafely(ActivityResult activityResult) { @TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1) public ActivityResult getActivityResult() { T activity = getActivity(); - assertThat("Activity did not finish (destroyed: " + activity.isDestroyed() + ")", activity.isFinishing(), is(true)); + MatcherAssert.assertThat("Activity did not finish (destroyed: " + activity.isDestroyed() + ")", activity.isFinishing(), Matchers.is(true)); try { diff --git a/FileManager/tests/java/org/openintents/filemanager/test/BaseTestFileManager.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/BaseTestFileManager.java similarity index 89% rename from FileManager/tests/java/org/openintents/filemanager/test/BaseTestFileManager.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/BaseTestFileManager.java index b3825d37..bd5b1956 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/BaseTestFileManager.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/BaseTestFileManager.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import androidx.test.espresso.ViewAssertion; import androidx.test.espresso.matcher.BoundedMatcher; @@ -62,7 +62,7 @@ protected static void createDirectory(String path) throws IOException { } public static Matcher withResourceName(String resourceName) { - return withResourceName(is(resourceName)); + return withResourceName(Matchers.is(resourceName)); } public static Matcher withResourceName(final Matcher resourceNameMatcher) { @@ -122,19 +122,19 @@ protected void clickOnTestDirectory() { } protected void clickOnFile(String filename) { - onData(allOf(instanceOf(FileHolder.class), hasName(filename))).perform(click(pressBack())); + Espresso.onData(Matchers.allOf(Matchers.instanceOf(FileHolder.class), hasName(filename))).perform(ViewActions.click(ViewActions.pressBack())); } protected void longClickOnFile(String filename) { - onData(allOf(instanceOf(FileHolder.class), hasName(filename))).perform(longClick()); + Espresso.onData(Matchers.allOf(Matchers.instanceOf(FileHolder.class), hasName(filename))).perform(ViewActions.longClick()); } protected void longClickOnBookmark(String filename) { - onData(allOf(instanceOf(BookmarkListAdapter.Bookmark.class), hasBookmarkName(filename))).perform(longClick()); + Espresso.onData(Matchers.allOf(Matchers.instanceOf(BookmarkListAdapter.Bookmark.class), hasBookmarkName(filename))).perform(ViewActions.longClick()); } protected void checkFile(String filename, ViewAssertion viewAssertion) { - onData(hasName(filename)).check(viewAssertion); + Espresso.onData(hasName(filename)).check(viewAssertion); } protected BoundedMatcher hasName(final String filename) { diff --git a/FileManager/tests/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java similarity index 95% rename from FileManager/tests/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java index 8e53c837..680a0ceb 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/DirectoryScannerIdlingResource.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import androidx.test.espresso.IdlingResource; diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestActivityTestRule.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestActivityTestRule.java similarity index 98% rename from FileManager/tests/java/org/openintents/filemanager/test/TestActivityTestRule.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/TestActivityTestRule.java index eae9c7fa..57329b49 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/TestActivityTestRule.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestActivityTestRule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.app.Activity; import android.app.Instrumentation; @@ -228,7 +228,7 @@ public T launchActivity(@Nullable Intent startIntent) { // Visible for testing void setInstrumentation(Instrumentation instrumentation) { - mInstrumentation = checkNotNull(instrumentation, "instrumentation cannot be null!"); + mInstrumentation = Checks.checkNotNull(instrumentation, "instrumentation cannot be null!"); } void finishActivity() { diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivity.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestFileManagerActivity.java similarity index 66% rename from FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivity.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/TestFileManagerActivity.java index 70cef9a2..f8ac180a 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivity.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestFileManagerActivity.java @@ -11,7 +11,7 @@ * */ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.content.Context; import android.content.SharedPreferences; @@ -154,20 +154,20 @@ public void testNavigation() throws IOException { createFile(sdcardPath + "oi-filemanager-tests/oi-test-dir/oi-fff.txt", ""); clickOnTestDirectory(); - onView(withText(TEST_DIRECTORY)).check(matches(isDisplayed())); + Espresso.onView(ViewMatchers.withText(TEST_DIRECTORY)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); clickOnFile("oi-test-dir"); - onView(withText("oi-fff.txt")).check(matches(isDisplayed())); + Espresso.onView(ViewMatchers.withText("oi-fff.txt")).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); - pressBack(); - pressBack(); + Espresso.pressBack(); + Espresso.pressBack(); clickOnTestDirectory(); - onData(hasName("oi-test.txt")).check(matches(isDisplayed())); + Espresso.onData(hasName("oi-test.txt")).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); clickOnFile("oi-test-dir"); - pressBack(); - onData(hasName("oi-test.txt")).check(matches(isDisplayed())); - pressBack(); + Espresso.pressBack(); + Espresso.onData(hasName("oi-test.txt")).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); + Espresso.pressBack(); } @Test @@ -175,22 +175,22 @@ public void testModification() throws IOException { clickOnTestDirectory(); longClickOnFile("oi-rem-test.txt"); - onView(withContentDescription(R.string.menu_delete)).perform(click()); - onView(withText(android.R.string.ok)).perform(click()); + Espresso.onView(ViewMatchers.withContentDescription(R.string.menu_delete)).perform(ViewActions.click()); + Espresso.onView(ViewMatchers.withText(android.R.string.ok)).perform(ViewActions.click()); - openActionBarOverflowOrOptionsMenu(rule.getActivity()); + Espresso.openActionBarOverflowOrOptionsMenu(rule.getActivity()); - onView(withText(R.string.menu_create_folder)).perform(click()); - onView(withId(R.id.foldername)).perform(replaceText("oi-created-folder")); - onView(withText(android.R.string.ok)).perform(click()); + Espresso.onView(ViewMatchers.withText(R.string.menu_create_folder)).perform(ViewActions.click()); + Espresso.onView(ViewMatchers.withId(R.id.foldername)).perform(ViewActions.replaceText("oi-created-folder")); + Espresso.onView(ViewMatchers.withText(android.R.string.ok)).perform(ViewActions.click()); - checkFile("oi-created-folder", matches(isDisplayed())); - pressBack(); + checkFile("oi-created-folder", ViewAssertions.matches(ViewMatchers.isDisplayed())); + Espresso.pressBack(); File createdFolder = new File(sdcardPath + "oi-filemanager-tests/oi-created-folder"); - assertThat(createdFolder.exists(), is(true)); - assertThat(createdFolder.isDirectory(), is(true)); - assertThat(new File(sdcardPath + "oi-filemanager-tests/oi-rem-test.txt").exists(), is(false)); + ViewMatchers.assertThat(createdFolder.exists(), Matchers.is(true)); + ViewMatchers.assertThat(createdFolder.isDirectory(), Matchers.is(true)); + ViewMatchers.assertThat(new File(sdcardPath + "oi-filemanager-tests/oi-rem-test.txt").exists(), Matchers.is(false)); } @Test @@ -204,33 +204,33 @@ public void testBookmarks() throws IOException { clickOnTestDirectory(); longClickOnFile(fn); - openContextualActionModeOverflowMenu(); - onView(withText(R.string.menu_bookmark)).perform(click()); + Espresso.openContextualActionModeOverflowMenu(); + Espresso.onView(ViewMatchers.withText(R.string.menu_bookmark)).perform(ViewActions.click()); clickOnFile(fn); - checkFile("oi-inside-book.txt", matches(isDisplayed())); + checkFile("oi-inside-book.txt", ViewAssertions.matches(ViewMatchers.isDisplayed())); // remove it - openActionBarOverflowOrOptionsMenu(rule.getActivity()); - onView(withText(R.string.menu_bookmarks)).perform(click()); + Espresso.openActionBarOverflowOrOptionsMenu(rule.getActivity()); + Espresso.onView(ViewMatchers.withText(R.string.menu_bookmarks)).perform(ViewActions.click()); longClickOnBookmark(fn); - onView(withContentDescription(R.string.menu_delete)).perform(click()); + Espresso.onView(ViewMatchers.withContentDescription(R.string.menu_delete)).perform(ViewActions.click()); - pressBack(); + Espresso.pressBack(); // make sure that it is deleted - openActionBarOverflowOrOptionsMenu(rule.getActivity()); - onView(withText(R.string.menu_bookmarks)).perform(click()); + Espresso.openActionBarOverflowOrOptionsMenu(rule.getActivity()); + Espresso.onView(ViewMatchers.withText(R.string.menu_bookmarks)).perform(ViewActions.click()); checkIsNotContainedInList(hasBookmarkName(fn)); - pressBack(); - pressBack(); + Espresso.pressBack(); + Espresso.pressBack(); } private void checkIsNotContainedInList(Matcher matches) { - onView(withId(android.R.id.list)) - .check(matches(not(withAdaptedData(matches)))); + Espresso.onView(ViewMatchers.withId(android.R.id.list)) + .check(ViewAssertions.matches(Matchers.not(withAdaptedData(matches)))); } @Test @@ -239,55 +239,55 @@ public void testActions() throws IOException { clickOnTestDirectory(); // copy longClickOnFile("oi-file-1.txt"); - openContextualActionModeOverflowMenu(); - onView(withText(R.string.menu_copy)).perform(click()); + Espresso.openContextualActionModeOverflowMenu(); + Espresso.onView(ViewMatchers.withText(R.string.menu_copy)).perform(ViewActions.click()); navigateToTargetAndPasteAndCheck("oi-move-target", "oi-file-1.txt", null); - checkFile("oi-file-1.txt", matches(isDisplayed())); + checkFile("oi-file-1.txt", ViewAssertions.matches(ViewMatchers.isDisplayed())); // move longClickOnFile("oi-file-2.txt"); - openContextualActionModeOverflowMenu(); - onView(withText(R.string.menu_move)).perform(click()); + Espresso.openContextualActionModeOverflowMenu(); + Espresso.onView(ViewMatchers.withText(R.string.menu_move)).perform(ViewActions.click()); navigateToTargetAndPasteAndCheck("oi-move-target", "oi-file-2.txt", null); checkIsNotContainedInList(hasName("oi-file-2.txt")); // multi select if (android.os.Build.VERSION.SDK_INT < 11) { - onView(withText(R.id.menu_multiselect)).perform(click()); + Espresso.onView(ViewMatchers.withText(R.id.menu_multiselect)).perform(ViewActions.click()); clickOnFile("oi-file-3.txt"); clickOnFile("oi-file-4.txt"); - onView(withId(R.id.menu_copy)); // TODO verify solo.clickOnImageButton(1); - pressBack(); + Espresso.onView(ViewMatchers.withId(R.id.menu_copy)); // TODO verify solo.clickOnImageButton(1); + Espresso.pressBack(); navigateToTargetAndPasteAndCheck("oi-move-target", "oi-file-3.txt", "oi-file-4.txt"); } // rename longClickOnFile("oi-file-5.txt"); - openContextualActionModeOverflowMenu(); - onView(withText(R.string.menu_rename)).perform(click()); - onView(withId(R.id.foldername)).perform(replaceText("oi-renamed-file.txt")); - onView(withText(android.R.string.ok)).perform(click()); - checkFile("oi-renamed-file.txt", matches(isDisplayed())); + Espresso.openContextualActionModeOverflowMenu(); + Espresso.onView(ViewMatchers.withText(R.string.menu_rename)).perform(ViewActions.click()); + Espresso.onView(ViewMatchers.withId(R.id.foldername)).perform(ViewActions.replaceText("oi-renamed-file.txt")); + Espresso.onView(ViewMatchers.withText(android.R.string.ok)).perform(ViewActions.click()); + checkFile("oi-renamed-file.txt", ViewAssertions.matches(ViewMatchers.isDisplayed())); - pressBack(); + Espresso.pressBack(); } private void navigateToTargetAndPasteAndCheck(String dirname, String name1, String name2) throws IOException { createDirectory(sdcardPath + "oi-filemanager-tests/"); clickOnFile(dirname); - openActionBarOverflowOrOptionsMenu(rule.getActivity()); - onView(withText(R.string.menu_paste)).perform(click()); + Espresso.openActionBarOverflowOrOptionsMenu(rule.getActivity()); + Espresso.onView(ViewMatchers.withText(R.string.menu_paste)).perform(ViewActions.click()); - checkFile(name1, matches(isDisplayed())); + checkFile(name1, ViewAssertions.matches(ViewMatchers.isDisplayed())); if (name2 != null) { - checkFile(name2, matches(isDisplayed())); + checkFile(name2, ViewAssertions.matches(ViewMatchers.isDisplayed())); } - pressBack(); + Espresso.pressBack(); } @Test @@ -299,12 +299,12 @@ public void testDetails() throws IOException { longClickOnFile("oi-detail.txt"); - openContextualActionModeOverflowMenu(); - onView(withText(R.string.menu_details)).perform(click()); + Espresso.openContextualActionModeOverflowMenu(); + Espresso.onView(ViewMatchers.withText(R.string.menu_details)).perform(ViewActions.click()); - onView(withText(R.string.details_type_file)).check(matches(isDisplayed())); + Espresso.onView(ViewMatchers.withText(R.string.details_type_file)).check(ViewAssertions.matches(ViewMatchers.isDisplayed())); - onView(withId(R.id.details_size_value)).check(matches(withText(Formatter.formatFileSize(rule.getActivity(), 7)))); + Espresso.onView(ViewMatchers.withId(R.id.details_size_value)).check(ViewAssertions.matches(ViewMatchers.withText(Formatter.formatFileSize(rule.getActivity(), 7)))); // not sure: @@ -312,8 +312,8 @@ public void testDetails() throws IOException { //String todayString = today.get(Calendar.DAY_OF_MONTH) + "/" + today.get(Calendar.MONTH) + "/" + today.get(Calendar.YEAR); //assertTrue(solo.searchText(todayString)); - pressBack(); - pressBack(); + Espresso.pressBack(); + Espresso.pressBack(); } @Test @@ -321,17 +321,17 @@ public void testHiddenFiles() throws IOException { clickOnTestDirectory(); PreferenceActivity.setDisplayHiddenFiles(rule.getActivity(), true); - checkFile(".oi-hidden.txt", matches(isDisplayed())); + checkFile(".oi-hidden.txt", ViewAssertions.matches(ViewMatchers.isDisplayed())); - openActionBarOverflowOrOptionsMenu(rule.getActivity()); - onView(withText(R.string.settings)).perform(click()); + Espresso.openActionBarOverflowOrOptionsMenu(rule.getActivity()); + Espresso.onView(ViewMatchers.withText(R.string.settings)).perform(ViewActions.click()); - onView(allOf(withText(R.string.preference_displayhiddenfiles_title), withResourceName("android:id/title"))).perform(click()); + Espresso.onView(Matchers.allOf(ViewMatchers.withText(R.string.preference_displayhiddenfiles_title), withResourceName("android:id/title"))).perform(ViewActions.click()); - pressBack(); + Espresso.pressBack(); checkIsNotContainedInList(hasName(".oi-hidden.txt")); - pressBack(); + Espresso.pressBack(); } @Test @@ -362,11 +362,11 @@ public void testOrder() throws IOException, InterruptedException { } private void setSortOrder(String name) { - openActionBarOverflowOrOptionsMenu(rule.getActivity()); - onView(withText(R.string.settings)).perform(click()); - onView(withText(R.string.preference_sortby)).perform(click()); - onView(withText(name)).perform(click()); - pressBack(); + Espresso.openActionBarOverflowOrOptionsMenu(rule.getActivity()); + Espresso.onView(ViewMatchers.withText(R.string.settings)).perform(ViewActions.click()); + Espresso.onView(ViewMatchers.withText(R.string.preference_sortby)).perform(ViewActions.click()); + Espresso.onView(ViewMatchers.withText(name)).perform(ViewActions.click()); + Espresso.pressBack(); } private void setAscending(boolean enabled) { @@ -382,16 +382,16 @@ public void testBrowseToOnPressEnter() throws IOException { /* * We start at the SD card. */ - onView(withText(Environment.getExternalStorageDirectory().getParentFile().getName())).perform(longClick()); - onView(withId(R.id.path_bar_path_edit_text)).perform(click()); // Let the editText have focus to be able to send the enter key. - onView(withId(R.id.path_bar_path_edit_text)).perform(replaceText(sdcardPath + TEST_DIRECTORY)); - onView(withId(R.id.path_bar_path_edit_text)).perform(pressKey(KeyEvent.KEYCODE_ENTER)); + Espresso.onView(ViewMatchers.withText(Environment.getExternalStorageDirectory().getParentFile().getName())).perform(ViewActions.longClick()); + Espresso.onView(ViewMatchers.withId(R.id.path_bar_path_edit_text)).perform(ViewActions.click()); // Let the editText have focus to be able to send the enter key. + Espresso.onView(ViewMatchers.withId(R.id.path_bar_path_edit_text)).perform(ViewActions.replaceText(sdcardPath + TEST_DIRECTORY)); + Espresso.onView(ViewMatchers.withId(R.id.path_bar_path_edit_text)).perform(ViewActions.pressKey(KeyEvent.KEYCODE_ENTER)); - checkFile(filenameIsInRightDirectory, matches(isDisplayed())); + checkFile(filenameIsInRightDirectory, ViewAssertions.matches(ViewMatchers.isDisplayed())); - pressBack(); - pressBack(); + Espresso.pressBack(); + Espresso.pressBack(); } // Current implementation directly opens the file and therefore can't be tested. diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java similarity index 92% rename from FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java index 7a36a0dd..5a2b7ca7 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestFileManagerActivityWithIntents.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.content.Intent; import android.net.Uri; @@ -45,7 +45,7 @@ public static void setup() throws IOException { @Test public void testIntentUrl() throws IOException { - checkFile("oi-intent", matches(isDisplayed())); + checkFile("oi-intent", ViewAssertions.matches(ViewMatchers.isDisplayed())); } diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java similarity index 91% rename from FileManager/tests/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java index 1e0b5b37..e7e1a9ca 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestIntentFilterActivityForPickFile.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.content.Intent; import android.net.Uri; @@ -42,6 +42,6 @@ public static void setup() throws IOException { @Test public void testIntentDataIsUsedAsInitialDirectory() throws IOException { - checkFile("oi-pick-file", matches(isDisplayed())); + checkFile("oi-pick-file", ViewAssertions.matches(ViewMatchers.isDisplayed())); } } diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestPickFilePathHistory.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestPickFilePathHistory.java similarity index 87% rename from FileManager/tests/java/org/openintents/filemanager/test/TestPickFilePathHistory.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/TestPickFilePathHistory.java index 96a2a04b..530abbdf 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/TestPickFilePathHistory.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestPickFilePathHistory.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.content.Intent; import android.net.Uri; @@ -94,24 +94,24 @@ private void testRememberPickFilePathWithAction(String action) throws IOExceptio clickOnTestDirectory(); if (isPickDirectory(action)) { //Pick directory - checkFile("oi-dir-to-pick", matches(isDisplayed())); + checkFile("oi-dir-to-pick", ViewAssertions.matches(ViewMatchers.isDisplayed())); clickOnFile("oi-dir-to-pick"); } else { - checkFile("oi-file-to-pick.txt", matches(isDisplayed())); + checkFile("oi-file-to-pick.txt", ViewAssertions.matches(ViewMatchers.isDisplayed())); clickOnFile("oi-file-to-pick.txt"); } if (isPickDirectory(action)) { - onView(withId(R.id.button)).perform(click()); + Espresso.onView(ViewMatchers.withId(R.id.button)).perform(ViewActions.click()); } else { - onView(withText(R.string.pick_button_default)).perform(click()); + Espresso.onView(ViewMatchers.withText(R.string.pick_button_default)).perform(ViewActions.click()); } // Check, if we are in the oi-filemanager-tests directory on restart Intent intentWithoutUrl = new Intent(action); intentWithoutUrl.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); IntentFilterActivity activity = startActivity(intentWithoutUrl); - onView(withId(R.id.pathbar)).check(matches(hasInitialDirectory(endsWith(TEST_DIRECTORY)))); + Espresso.onView(ViewMatchers.withId(R.id.pathbar)).check(ViewAssertions.matches(hasInitialDirectory(Matchers.endsWith(TEST_DIRECTORY)))); //Delete the oi-filemanager-tests directory, so that the default path is used deleteDirectory(sdcardPath + TEST_DIRECTORY); @@ -122,7 +122,7 @@ private void testRememberPickFilePathWithAction(String action) throws IOExceptio //Check, if the current directory is the default (sdcardPath) on restart startActivity(intentWithoutUrl); - checkFile(OI_TO_PICK_TEST_FOLDER_DELETED, matches(isDisplayed())); + checkFile(OI_TO_PICK_TEST_FOLDER_DELETED, ViewAssertions.matches(ViewMatchers.isDisplayed())); //Clean up new File(sdcardPath + OI_TO_PICK_TEST_FOLDER_DELETED).delete(); diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestPickFileResult.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestPickFileResult.java similarity index 66% rename from FileManager/tests/java/org/openintents/filemanager/test/TestPickFileResult.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/TestPickFileResult.java index 2c42c76c..6dd175de 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/TestPickFileResult.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestPickFileResult.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.app.Activity; import android.content.Intent; @@ -20,8 +20,8 @@ import static androidx.test.espresso.intent.matcher.IntentMatchers.hasData; import static androidx.test.espresso.matcher.ViewMatchers.withText; import static org.junit.Assert.assertThat; -import static org.openintents.filemanager.test.ActivityResultTestRule.hasResultCode; -import static org.openintents.filemanager.test.ActivityResultTestRule.hasResultData; +import static androidTest.java.org.openintents.filemanager.test.ActivityResultTestRule.hasResultCode; +import static androidTest.java.org.openintents.filemanager.test.ActivityResultTestRule.hasResultData; @RunWith(AndroidJUnit4.class) public class TestPickFileResult extends BaseTestFileManager { @@ -44,12 +44,12 @@ public void testPickFileResult() { rule.launchActivity(intent); clickOnFile("oi-test1.txt"); - onView(withText(org.openintents.filemanager.R.string.pick_button_default)).perform(click()); + Espresso.onView(ViewMatchers.withText(org.openintents.filemanager.R.string.pick_button_default)).perform(ViewActions.click()); - assertThat(rule.getActivityResult(), + Assert.assertThat(rule.getActivityResult(), hasResultCode(Activity.RESULT_OK)); - assertThat(rule.getActivityResult(), - hasResultData(hasData("file://" + sdcardPath + "oi-filemanager-tests/oi-test1.txt"))); + Assert.assertThat(rule.getActivityResult(), + hasResultData(IntentMatchers.hasData("file://" + sdcardPath + "oi-filemanager-tests/oi-test1.txt"))); } @Test @@ -59,11 +59,11 @@ public void testGetContentResult() { rule.launchActivity(intent); clickOnFile("oi-test2.txt"); - onView(withText(org.openintents.filemanager.R.string.pick_button_default)).perform(click()); + Espresso.onView(ViewMatchers.withText(org.openintents.filemanager.R.string.pick_button_default)).perform(ViewActions.click()); - assertThat(rule.getActivityResult(), + Assert.assertThat(rule.getActivityResult(), hasResultCode(Activity.RESULT_OK)); - assertThat(rule.getActivityResult(), - hasResultData(hasData("content://org.openintents.filemanager" + sdcardPath + "oi-filemanager-tests/oi-test2.txt"))); + Assert.assertThat(rule.getActivityResult(), + hasResultData(IntentMatchers.hasData("content://org.openintents.filemanager" + sdcardPath + "oi-filemanager-tests/oi-test2.txt"))); } } diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestSaveAsActivity.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestSaveAsActivity.java similarity index 87% rename from FileManager/tests/java/org/openintents/filemanager/test/TestSaveAsActivity.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/TestSaveAsActivity.java index b2dde90c..f4204039 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/TestSaveAsActivity.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestSaveAsActivity.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.content.ComponentName; import android.content.Intent; @@ -47,11 +47,11 @@ public static void setup() throws IOException { @Test public void testIntentSaveAs() { - onView(withHint(R.string.filename_hint)).perform(closeSoftKeyboard(), replaceText("oi-target.txt")); - onView(withHint(R.string.filename_hint)).perform(actionWithAssertions(new ViewAction() { + Espresso.onView(ViewMatchers.withHint(R.string.filename_hint)).perform(ViewActions.closeSoftKeyboard(), ViewActions.replaceText("oi-target.txt")); + Espresso.onView(ViewMatchers.withHint(R.string.filename_hint)).perform(ViewActions.actionWithAssertions(new ViewAction() { @Override public Matcher getConstraints() { - return isDisplayed(); + return ViewMatchers.isDisplayed(); } @Override @@ -86,7 +86,7 @@ private boolean sendKeyEvent(UiController controller) })); //onView(withId(R.id.pickbar_button)).perform(click()); - assertThat(new File(sdcardPath + "oi-filemanager-tests/oi-target.txt").exists(), is(true)); + Assert.assertThat(new File(sdcardPath + "oi-filemanager-tests/oi-target.txt").exists(), Matchers.is(true)); } private static class SaveAsActivityTestRule extends ActivityTestRule { diff --git a/FileManager/tests/java/org/openintents/filemanager/test/TestViewFolderIntent.java b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestViewFolderIntent.java similarity index 89% rename from FileManager/tests/java/org/openintents/filemanager/test/TestViewFolderIntent.java rename to FileManager/src/androidTest/java/org/openintents/filemanager/test/TestViewFolderIntent.java index 1f0fc4bd..9b129dd1 100644 --- a/FileManager/tests/java/org/openintents/filemanager/test/TestViewFolderIntent.java +++ b/FileManager/src/androidTest/java/org/openintents/filemanager/test/TestViewFolderIntent.java @@ -1,4 +1,4 @@ -package org.openintents.filemanager.test; +package androidTest.java.org.openintents.filemanager.test; import android.content.Intent; import android.net.Uri; @@ -35,7 +35,7 @@ public void testViewDownloadFolder() { intent.putExtra("org.openintents.extra.ABSOLUTE_PATH", path); rule.launchActivity(intent); - onView(withId(org.openintents.filemanager.R.id.pathbar)).check(matches(isShowingPath(path))); + Espresso.onView(ViewMatchers.withId(org.openintents.filemanager.R.id.pathbar)).check(ViewAssertions.matches(isShowingPath(path))); } @Test @@ -66,7 +66,7 @@ public void testFileUriPath() { intent.setData(Uri.parse(path)); rule.launchActivity(intent); - onView(withId(org.openintents.filemanager.R.id.pathbar)).check(matches(isShowingPath(path))); + Espresso.onView(ViewMatchers.withId(org.openintents.filemanager.R.id.pathbar)).check(ViewAssertions.matches(isShowingPath(path))); } private Matcher isShowingPath(final String path) { diff --git a/FileManager/src/foss/AndroidManifest.xml b/FileManager/src/foss/AndroidManifest.xml new file mode 100644 index 00000000..74face5d --- /dev/null +++ b/FileManager/src/foss/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/FileManager/AndroidManifest.xml b/FileManager/src/main/AndroidManifest.xml similarity index 100% rename from FileManager/AndroidManifest.xml rename to FileManager/src/main/AndroidManifest.xml diff --git a/FileManager/src/org/openintents/filemanager/DistributionLibraryFragmentActivity.java b/FileManager/src/main/java/org/openintents/filemanager/DistributionLibraryFragmentActivity.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/DistributionLibraryFragmentActivity.java rename to FileManager/src/main/java/org/openintents/filemanager/DistributionLibraryFragmentActivity.java diff --git a/FileManager/src/org/openintents/filemanager/FileHolderListAdapter.java b/FileManager/src/main/java/org/openintents/filemanager/FileHolderListAdapter.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/FileHolderListAdapter.java rename to FileManager/src/main/java/org/openintents/filemanager/FileHolderListAdapter.java diff --git a/FileManager/src/org/openintents/filemanager/FileManagerActivity.java b/FileManager/src/main/java/org/openintents/filemanager/FileManagerActivity.java similarity index 98% rename from FileManager/src/org/openintents/filemanager/FileManagerActivity.java rename to FileManager/src/main/java/org/openintents/filemanager/FileManagerActivity.java index 2a52a467..4ba7187a 100644 --- a/FileManager/src/org/openintents/filemanager/FileManagerActivity.java +++ b/FileManager/src/main/java/org/openintents/filemanager/FileManagerActivity.java @@ -51,6 +51,7 @@ public class FileManagerActivity extends DistributionLibraryFragmentActivity { @Override protected void onNewIntent(Intent intent) { + super.onNewIntent(intent); if (intent.getData() != null) mFragment.openInformingPathBar(new FileHolder(FileUtils.getFile(intent.getData()))); } @@ -143,6 +144,9 @@ public boolean onCreateOptionsMenu(Menu menu) { MenuInflater inflater = new MenuInflater(this); inflater.inflate(R.menu.main, menu); + if (FileManagerApplication.hideDonateMenu(this)) { + menu.findItem(R.id.menu_donate).setVisible(false); + } mDistribution.onCreateOptionsMenu(menu); return true; } diff --git a/FileManager/src/main/java/org/openintents/filemanager/FileManagerApplication.java b/FileManager/src/main/java/org/openintents/filemanager/FileManagerApplication.java new file mode 100644 index 00000000..a4614b71 --- /dev/null +++ b/FileManager/src/main/java/org/openintents/filemanager/FileManagerApplication.java @@ -0,0 +1,36 @@ +package org.openintents.filemanager; + +import android.app.Application; +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager; + +import org.openintents.filemanager.util.CopyHelper; +import org.openintents.filemanager.util.MimeTypes; + +public class FileManagerApplication extends Application { + private CopyHelper mCopyHelper; + + public static boolean hideDonateMenu(Context context) { + ApplicationInfo ai; + try { + ai = context.getPackageManager().getApplicationInfo(context.getPackageName(), PackageManager.GET_META_DATA); + return ai.metaData.getBoolean("hideDonate"); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return false; + } + + @Override + public void onCreate() { + super.onCreate(); + + mCopyHelper = new CopyHelper(this); + MimeTypes.initInstance(this); + } + + public CopyHelper getCopyHelper() { + return mCopyHelper; + } +} \ No newline at end of file diff --git a/FileManager/src/org/openintents/filemanager/FileManagerProvider.java b/FileManager/src/main/java/org/openintents/filemanager/FileManagerProvider.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/FileManagerProvider.java rename to FileManager/src/main/java/org/openintents/filemanager/FileManagerProvider.java diff --git a/FileManager/src/org/openintents/filemanager/IntentFilterActivity.java b/FileManager/src/main/java/org/openintents/filemanager/IntentFilterActivity.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/IntentFilterActivity.java rename to FileManager/src/main/java/org/openintents/filemanager/IntentFilterActivity.java diff --git a/FileManager/src/org/openintents/filemanager/MultiselectFileHolderListAdapter.java b/FileManager/src/main/java/org/openintents/filemanager/MultiselectFileHolderListAdapter.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/MultiselectFileHolderListAdapter.java rename to FileManager/src/main/java/org/openintents/filemanager/MultiselectFileHolderListAdapter.java diff --git a/FileManager/src/org/openintents/filemanager/PausableThreadPoolExecutor.java b/FileManager/src/main/java/org/openintents/filemanager/PausableThreadPoolExecutor.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/PausableThreadPoolExecutor.java rename to FileManager/src/main/java/org/openintents/filemanager/PausableThreadPoolExecutor.java diff --git a/FileManager/src/org/openintents/filemanager/PreferenceActivity.java b/FileManager/src/main/java/org/openintents/filemanager/PreferenceActivity.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/PreferenceActivity.java rename to FileManager/src/main/java/org/openintents/filemanager/PreferenceActivity.java diff --git a/FileManager/src/org/openintents/filemanager/SaveAsActivity.java b/FileManager/src/main/java/org/openintents/filemanager/SaveAsActivity.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/SaveAsActivity.java rename to FileManager/src/main/java/org/openintents/filemanager/SaveAsActivity.java diff --git a/FileManager/src/org/openintents/filemanager/ThumbnailLoader.java b/FileManager/src/main/java/org/openintents/filemanager/ThumbnailLoader.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/ThumbnailLoader.java rename to FileManager/src/main/java/org/openintents/filemanager/ThumbnailLoader.java diff --git a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListActivity.java b/FileManager/src/main/java/org/openintents/filemanager/bookmarks/BookmarkListActivity.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListActivity.java rename to FileManager/src/main/java/org/openintents/filemanager/bookmarks/BookmarkListActivity.java diff --git a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListAdapter.java b/FileManager/src/main/java/org/openintents/filemanager/bookmarks/BookmarkListAdapter.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListAdapter.java rename to FileManager/src/main/java/org/openintents/filemanager/bookmarks/BookmarkListAdapter.java diff --git a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListFragment.java b/FileManager/src/main/java/org/openintents/filemanager/bookmarks/BookmarkListFragment.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/bookmarks/BookmarkListFragment.java rename to FileManager/src/main/java/org/openintents/filemanager/bookmarks/BookmarkListFragment.java diff --git a/FileManager/src/org/openintents/filemanager/bookmarks/BookmarksProvider.java b/FileManager/src/main/java/org/openintents/filemanager/bookmarks/BookmarksProvider.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/bookmarks/BookmarksProvider.java rename to FileManager/src/main/java/org/openintents/filemanager/bookmarks/BookmarksProvider.java diff --git a/FileManager/src/org/openintents/filemanager/compatibility/BookmarkListActionHandler.java b/FileManager/src/main/java/org/openintents/filemanager/compatibility/BookmarkListActionHandler.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/compatibility/BookmarkListActionHandler.java rename to FileManager/src/main/java/org/openintents/filemanager/compatibility/BookmarkListActionHandler.java diff --git a/FileManager/src/org/openintents/filemanager/compatibility/BookmarkMultiChoiceModeHelper.java b/FileManager/src/main/java/org/openintents/filemanager/compatibility/BookmarkMultiChoiceModeHelper.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/compatibility/BookmarkMultiChoiceModeHelper.java rename to FileManager/src/main/java/org/openintents/filemanager/compatibility/BookmarkMultiChoiceModeHelper.java diff --git a/FileManager/src/org/openintents/filemanager/compatibility/FileMultiChoiceModeHelper.java b/FileManager/src/main/java/org/openintents/filemanager/compatibility/FileMultiChoiceModeHelper.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/compatibility/FileMultiChoiceModeHelper.java rename to FileManager/src/main/java/org/openintents/filemanager/compatibility/FileMultiChoiceModeHelper.java diff --git a/FileManager/src/org/openintents/filemanager/compatibility/HomeIconHelper.java b/FileManager/src/main/java/org/openintents/filemanager/compatibility/HomeIconHelper.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/compatibility/HomeIconHelper.java rename to FileManager/src/main/java/org/openintents/filemanager/compatibility/HomeIconHelper.java diff --git a/FileManager/src/org/openintents/filemanager/compatibility/ListViewMethodHelper.java b/FileManager/src/main/java/org/openintents/filemanager/compatibility/ListViewMethodHelper.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/compatibility/ListViewMethodHelper.java rename to FileManager/src/main/java/org/openintents/filemanager/compatibility/ListViewMethodHelper.java diff --git a/FileManager/src/org/openintents/filemanager/compatibility/SoftKeyboard.java b/FileManager/src/main/java/org/openintents/filemanager/compatibility/SoftKeyboard.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/compatibility/SoftKeyboard.java rename to FileManager/src/main/java/org/openintents/filemanager/compatibility/SoftKeyboard.java diff --git a/FileManager/src/org/openintents/filemanager/dialogs/CreateDirectoryDialog.java b/FileManager/src/main/java/org/openintents/filemanager/dialogs/CreateDirectoryDialog.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/dialogs/CreateDirectoryDialog.java rename to FileManager/src/main/java/org/openintents/filemanager/dialogs/CreateDirectoryDialog.java diff --git a/FileManager/src/org/openintents/filemanager/dialogs/DetailsDialog.java b/FileManager/src/main/java/org/openintents/filemanager/dialogs/DetailsDialog.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/dialogs/DetailsDialog.java rename to FileManager/src/main/java/org/openintents/filemanager/dialogs/DetailsDialog.java diff --git a/FileManager/src/org/openintents/filemanager/dialogs/MultiCompressDialog.java b/FileManager/src/main/java/org/openintents/filemanager/dialogs/MultiCompressDialog.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/dialogs/MultiCompressDialog.java rename to FileManager/src/main/java/org/openintents/filemanager/dialogs/MultiCompressDialog.java diff --git a/FileManager/src/org/openintents/filemanager/dialogs/MultiDeleteDialog.java b/FileManager/src/main/java/org/openintents/filemanager/dialogs/MultiDeleteDialog.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/dialogs/MultiDeleteDialog.java rename to FileManager/src/main/java/org/openintents/filemanager/dialogs/MultiDeleteDialog.java diff --git a/FileManager/src/org/openintents/filemanager/dialogs/OverwriteFileDialog.java b/FileManager/src/main/java/org/openintents/filemanager/dialogs/OverwriteFileDialog.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/dialogs/OverwriteFileDialog.java rename to FileManager/src/main/java/org/openintents/filemanager/dialogs/OverwriteFileDialog.java diff --git a/FileManager/src/org/openintents/filemanager/dialogs/RenameDialog.java b/FileManager/src/main/java/org/openintents/filemanager/dialogs/RenameDialog.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/dialogs/RenameDialog.java rename to FileManager/src/main/java/org/openintents/filemanager/dialogs/RenameDialog.java diff --git a/FileManager/src/org/openintents/filemanager/dialogs/SingleCompressDialog.java b/FileManager/src/main/java/org/openintents/filemanager/dialogs/SingleCompressDialog.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/dialogs/SingleCompressDialog.java rename to FileManager/src/main/java/org/openintents/filemanager/dialogs/SingleCompressDialog.java diff --git a/FileManager/src/org/openintents/filemanager/dialogs/SingleDeleteDialog.java b/FileManager/src/main/java/org/openintents/filemanager/dialogs/SingleDeleteDialog.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/dialogs/SingleDeleteDialog.java rename to FileManager/src/main/java/org/openintents/filemanager/dialogs/SingleDeleteDialog.java diff --git a/FileManager/src/org/openintents/filemanager/files/DirectoryContents.java b/FileManager/src/main/java/org/openintents/filemanager/files/DirectoryContents.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/files/DirectoryContents.java rename to FileManager/src/main/java/org/openintents/filemanager/files/DirectoryContents.java diff --git a/FileManager/src/org/openintents/filemanager/files/DirectoryScanner.java b/FileManager/src/main/java/org/openintents/filemanager/files/DirectoryScanner.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/files/DirectoryScanner.java rename to FileManager/src/main/java/org/openintents/filemanager/files/DirectoryScanner.java diff --git a/FileManager/src/org/openintents/filemanager/files/FileHolder.java b/FileManager/src/main/java/org/openintents/filemanager/files/FileHolder.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/files/FileHolder.java rename to FileManager/src/main/java/org/openintents/filemanager/files/FileHolder.java diff --git a/FileManager/src/org/openintents/filemanager/lists/FileListFragment.java b/FileManager/src/main/java/org/openintents/filemanager/lists/FileListFragment.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/lists/FileListFragment.java rename to FileManager/src/main/java/org/openintents/filemanager/lists/FileListFragment.java diff --git a/FileManager/src/org/openintents/filemanager/lists/MultiselectListFragment.java b/FileManager/src/main/java/org/openintents/filemanager/lists/MultiselectListFragment.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/lists/MultiselectListFragment.java rename to FileManager/src/main/java/org/openintents/filemanager/lists/MultiselectListFragment.java diff --git a/FileManager/src/org/openintents/filemanager/lists/PickFileListFragment.java b/FileManager/src/main/java/org/openintents/filemanager/lists/PickFileListFragment.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/lists/PickFileListFragment.java rename to FileManager/src/main/java/org/openintents/filemanager/lists/PickFileListFragment.java diff --git a/FileManager/src/org/openintents/filemanager/lists/SimpleFileListFragment.java b/FileManager/src/main/java/org/openintents/filemanager/lists/SimpleFileListFragment.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/lists/SimpleFileListFragment.java rename to FileManager/src/main/java/org/openintents/filemanager/lists/SimpleFileListFragment.java diff --git a/FileManager/src/org/openintents/filemanager/search/RecentsSuggestionsProvider.java b/FileManager/src/main/java/org/openintents/filemanager/search/RecentsSuggestionsProvider.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/search/RecentsSuggestionsProvider.java rename to FileManager/src/main/java/org/openintents/filemanager/search/RecentsSuggestionsProvider.java diff --git a/FileManager/src/org/openintents/filemanager/search/SearchCore.java b/FileManager/src/main/java/org/openintents/filemanager/search/SearchCore.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/search/SearchCore.java rename to FileManager/src/main/java/org/openintents/filemanager/search/SearchCore.java diff --git a/FileManager/src/org/openintents/filemanager/search/SearchListAdapter.java b/FileManager/src/main/java/org/openintents/filemanager/search/SearchListAdapter.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/search/SearchListAdapter.java rename to FileManager/src/main/java/org/openintents/filemanager/search/SearchListAdapter.java diff --git a/FileManager/src/org/openintents/filemanager/search/SearchResultsProvider.java b/FileManager/src/main/java/org/openintents/filemanager/search/SearchResultsProvider.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/search/SearchResultsProvider.java rename to FileManager/src/main/java/org/openintents/filemanager/search/SearchResultsProvider.java diff --git a/FileManager/src/org/openintents/filemanager/search/SearchService.java b/FileManager/src/main/java/org/openintents/filemanager/search/SearchService.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/search/SearchService.java rename to FileManager/src/main/java/org/openintents/filemanager/search/SearchService.java diff --git a/FileManager/src/org/openintents/filemanager/search/SearchSuggestionsProvider.java b/FileManager/src/main/java/org/openintents/filemanager/search/SearchSuggestionsProvider.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/search/SearchSuggestionsProvider.java rename to FileManager/src/main/java/org/openintents/filemanager/search/SearchSuggestionsProvider.java diff --git a/FileManager/src/org/openintents/filemanager/search/SearchableActivity.java b/FileManager/src/main/java/org/openintents/filemanager/search/SearchableActivity.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/search/SearchableActivity.java rename to FileManager/src/main/java/org/openintents/filemanager/search/SearchableActivity.java diff --git a/FileManager/src/org/openintents/filemanager/util/CompressManager.java b/FileManager/src/main/java/org/openintents/filemanager/util/CompressManager.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/CompressManager.java rename to FileManager/src/main/java/org/openintents/filemanager/util/CompressManager.java diff --git a/FileManager/src/org/openintents/filemanager/util/CopyHelper.java b/FileManager/src/main/java/org/openintents/filemanager/util/CopyHelper.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/CopyHelper.java rename to FileManager/src/main/java/org/openintents/filemanager/util/CopyHelper.java diff --git a/FileManager/src/org/openintents/filemanager/util/ExtractManager.java b/FileManager/src/main/java/org/openintents/filemanager/util/ExtractManager.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/ExtractManager.java rename to FileManager/src/main/java/org/openintents/filemanager/util/ExtractManager.java diff --git a/FileManager/src/org/openintents/filemanager/util/FileUtils.java b/FileManager/src/main/java/org/openintents/filemanager/util/FileUtils.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/FileUtils.java rename to FileManager/src/main/java/org/openintents/filemanager/util/FileUtils.java diff --git a/FileManager/src/org/openintents/filemanager/util/ImageUtils.java b/FileManager/src/main/java/org/openintents/filemanager/util/ImageUtils.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/ImageUtils.java rename to FileManager/src/main/java/org/openintents/filemanager/util/ImageUtils.java diff --git a/FileManager/src/org/openintents/filemanager/util/MediaScannerUtils.java b/FileManager/src/main/java/org/openintents/filemanager/util/MediaScannerUtils.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/MediaScannerUtils.java rename to FileManager/src/main/java/org/openintents/filemanager/util/MediaScannerUtils.java diff --git a/FileManager/src/org/openintents/filemanager/util/MenuUtils.java b/FileManager/src/main/java/org/openintents/filemanager/util/MenuUtils.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/MenuUtils.java rename to FileManager/src/main/java/org/openintents/filemanager/util/MenuUtils.java diff --git a/FileManager/src/org/openintents/filemanager/util/MimeTypeParser.java b/FileManager/src/main/java/org/openintents/filemanager/util/MimeTypeParser.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/MimeTypeParser.java rename to FileManager/src/main/java/org/openintents/filemanager/util/MimeTypeParser.java diff --git a/FileManager/src/org/openintents/filemanager/util/MimeTypes.java b/FileManager/src/main/java/org/openintents/filemanager/util/MimeTypes.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/MimeTypes.java rename to FileManager/src/main/java/org/openintents/filemanager/util/MimeTypes.java diff --git a/FileManager/src/org/openintents/filemanager/util/UIUtils.java b/FileManager/src/main/java/org/openintents/filemanager/util/UIUtils.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/util/UIUtils.java rename to FileManager/src/main/java/org/openintents/filemanager/util/UIUtils.java diff --git a/FileManager/src/org/openintents/filemanager/view/CheckableFileListItem.java b/FileManager/src/main/java/org/openintents/filemanager/view/CheckableFileListItem.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/view/CheckableFileListItem.java rename to FileManager/src/main/java/org/openintents/filemanager/view/CheckableFileListItem.java diff --git a/FileManager/src/org/openintents/filemanager/view/LegacyActionContainer.java b/FileManager/src/main/java/org/openintents/filemanager/view/LegacyActionContainer.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/view/LegacyActionContainer.java rename to FileManager/src/main/java/org/openintents/filemanager/view/LegacyActionContainer.java diff --git a/FileManager/src/org/openintents/filemanager/view/MenuBuilder.java b/FileManager/src/main/java/org/openintents/filemanager/view/MenuBuilder.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/view/MenuBuilder.java rename to FileManager/src/main/java/org/openintents/filemanager/view/MenuBuilder.java diff --git a/FileManager/src/org/openintents/filemanager/view/MenuItemImpl.java b/FileManager/src/main/java/org/openintents/filemanager/view/MenuItemImpl.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/view/MenuItemImpl.java rename to FileManager/src/main/java/org/openintents/filemanager/view/MenuItemImpl.java diff --git a/FileManager/src/org/openintents/filemanager/view/PathBar.java b/FileManager/src/main/java/org/openintents/filemanager/view/PathBar.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/view/PathBar.java rename to FileManager/src/main/java/org/openintents/filemanager/view/PathBar.java diff --git a/FileManager/src/org/openintents/filemanager/view/PathButtonLayout.java b/FileManager/src/main/java/org/openintents/filemanager/view/PathButtonLayout.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/view/PathButtonLayout.java rename to FileManager/src/main/java/org/openintents/filemanager/view/PathButtonLayout.java diff --git a/FileManager/src/org/openintents/filemanager/view/PickBar.java b/FileManager/src/main/java/org/openintents/filemanager/view/PickBar.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/view/PickBar.java rename to FileManager/src/main/java/org/openintents/filemanager/view/PickBar.java diff --git a/FileManager/src/org/openintents/filemanager/view/ViewHolder.java b/FileManager/src/main/java/org/openintents/filemanager/view/ViewHolder.java similarity index 100% rename from FileManager/src/org/openintents/filemanager/view/ViewHolder.java rename to FileManager/src/main/java/org/openintents/filemanager/view/ViewHolder.java diff --git a/FileManager/src/org/openintents/intents/FileManagerIntents.java b/FileManager/src/main/java/org/openintents/intents/FileManagerIntents.java similarity index 100% rename from FileManager/src/org/openintents/intents/FileManagerIntents.java rename to FileManager/src/main/java/org/openintents/intents/FileManagerIntents.java diff --git a/FileManager/src/org/openintents/util/MenuIntentOptionsWithIcons.java b/FileManager/src/main/java/org/openintents/util/MenuIntentOptionsWithIcons.java similarity index 100% rename from FileManager/src/org/openintents/util/MenuIntentOptionsWithIcons.java rename to FileManager/src/main/java/org/openintents/util/MenuIntentOptionsWithIcons.java diff --git a/FileManager/res/anim/accelerate_interpolator.xml b/FileManager/src/main/res/anim/accelerate_interpolator.xml similarity index 100% rename from FileManager/res/anim/accelerate_interpolator.xml rename to FileManager/src/main/res/anim/accelerate_interpolator.xml diff --git a/FileManager/res/anim/decelerate_interpolator.xml b/FileManager/src/main/res/anim/decelerate_interpolator.xml similarity index 100% rename from FileManager/res/anim/decelerate_interpolator.xml rename to FileManager/src/main/res/anim/decelerate_interpolator.xml diff --git a/FileManager/res/anim/fade_in.xml b/FileManager/src/main/res/anim/fade_in.xml similarity index 100% rename from FileManager/res/anim/fade_in.xml rename to FileManager/src/main/res/anim/fade_in.xml diff --git a/FileManager/res/anim/fade_out.xml b/FileManager/src/main/res/anim/fade_out.xml similarity index 100% rename from FileManager/res/anim/fade_out.xml rename to FileManager/src/main/res/anim/fade_out.xml diff --git a/FileManager/res/drawable-hdpi-v11/ic_action_about.png b/FileManager/src/main/res/drawable-hdpi-v11/ic_action_about.png similarity index 100% rename from FileManager/res/drawable-hdpi-v11/ic_action_about.png rename to FileManager/src/main/res/drawable-hdpi-v11/ic_action_about.png diff --git a/FileManager/res/drawable-hdpi-v11/ic_action_bookmarks.png b/FileManager/src/main/res/drawable-hdpi-v11/ic_action_bookmarks.png similarity index 100% rename from FileManager/res/drawable-hdpi-v11/ic_action_bookmarks.png rename to FileManager/src/main/res/drawable-hdpi-v11/ic_action_bookmarks.png diff --git a/FileManager/res/drawable-hdpi-v11/ic_action_create_folder.png b/FileManager/src/main/res/drawable-hdpi-v11/ic_action_create_folder.png similarity index 100% rename from FileManager/res/drawable-hdpi-v11/ic_action_create_folder.png rename to FileManager/src/main/res/drawable-hdpi-v11/ic_action_create_folder.png diff --git a/FileManager/res/drawable-hdpi-v11/ic_action_details.png b/FileManager/src/main/res/drawable-hdpi-v11/ic_action_details.png similarity index 100% rename from FileManager/res/drawable-hdpi-v11/ic_action_details.png rename to FileManager/src/main/res/drawable-hdpi-v11/ic_action_details.png diff --git a/FileManager/res/drawable-hdpi-v11/ic_action_paste.png b/FileManager/src/main/res/drawable-hdpi-v11/ic_action_paste.png similarity index 100% rename from FileManager/res/drawable-hdpi-v11/ic_action_paste.png rename to FileManager/src/main/res/drawable-hdpi-v11/ic_action_paste.png diff --git a/FileManager/res/drawable-hdpi-v11/ic_action_rename.png b/FileManager/src/main/res/drawable-hdpi-v11/ic_action_rename.png similarity index 100% rename from FileManager/res/drawable-hdpi-v11/ic_action_rename.png rename to FileManager/src/main/res/drawable-hdpi-v11/ic_action_rename.png diff --git a/FileManager/res/drawable-hdpi-v11/ic_action_search.png b/FileManager/src/main/res/drawable-hdpi-v11/ic_action_search.png similarity index 100% rename from FileManager/res/drawable-hdpi-v11/ic_action_search.png rename to FileManager/src/main/res/drawable-hdpi-v11/ic_action_search.png diff --git a/FileManager/res/drawable-hdpi-v11/ic_action_settings.png b/FileManager/src/main/res/drawable-hdpi-v11/ic_action_settings.png similarity index 100% rename from FileManager/res/drawable-hdpi-v11/ic_action_settings.png rename to FileManager/src/main/res/drawable-hdpi-v11/ic_action_settings.png diff --git a/FileManager/res/drawable-hdpi-v5/ic_launcher.png b/FileManager/src/main/res/drawable-hdpi-v5/ic_launcher.png similarity index 100% rename from FileManager/res/drawable-hdpi-v5/ic_launcher.png rename to FileManager/src/main/res/drawable-hdpi-v5/ic_launcher.png diff --git a/FileManager/res/drawable-hdpi-v5/ic_launcher_folder.png b/FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_folder.png similarity index 100% rename from FileManager/res/drawable-hdpi-v5/ic_launcher_folder.png rename to FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_folder.png diff --git a/FileManager/res/drawable-hdpi-v5/ic_launcher_home.png b/FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_home.png similarity index 100% rename from FileManager/res/drawable-hdpi-v5/ic_launcher_home.png rename to FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_home.png diff --git a/FileManager/res/drawable-hdpi-v5/ic_launcher_home_small.png b/FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_home_small.png similarity index 100% rename from FileManager/res/drawable-hdpi-v5/ic_launcher_home_small.png rename to FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_home_small.png diff --git a/FileManager/res/drawable-hdpi-v5/ic_launcher_sdcard.png b/FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_sdcard.png similarity index 100% rename from FileManager/res/drawable-hdpi-v5/ic_launcher_sdcard.png rename to FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_sdcard.png diff --git a/FileManager/res/drawable-hdpi-v5/ic_launcher_sdcard_small.png b/FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_sdcard_small.png similarity index 100% rename from FileManager/res/drawable-hdpi-v5/ic_launcher_sdcard_small.png rename to FileManager/src/main/res/drawable-hdpi-v5/ic_launcher_sdcard_small.png diff --git a/FileManager/res/drawable-hdpi/bg_textfield_light_activated.9.png b/FileManager/src/main/res/drawable-hdpi/bg_textfield_light_activated.9.png similarity index 100% rename from FileManager/res/drawable-hdpi/bg_textfield_light_activated.9.png rename to FileManager/src/main/res/drawable-hdpi/bg_textfield_light_activated.9.png diff --git a/FileManager/res/drawable-hdpi/bg_textfield_light_normal.9.png b/FileManager/src/main/res/drawable-hdpi/bg_textfield_light_normal.9.png similarity index 100% rename from FileManager/res/drawable-hdpi/bg_textfield_light_normal.9.png rename to FileManager/src/main/res/drawable-hdpi/bg_textfield_light_normal.9.png diff --git a/FileManager/res/drawable-hdpi/bg_top_bar_dark.9.png b/FileManager/src/main/res/drawable-hdpi/bg_top_bar_dark.9.png similarity index 100% rename from FileManager/res/drawable-hdpi/bg_top_bar_dark.9.png rename to FileManager/src/main/res/drawable-hdpi/bg_top_bar_dark.9.png diff --git a/FileManager/res/drawable-hdpi/ic_action_bookmarks.png b/FileManager/src/main/res/drawable-hdpi/ic_action_bookmarks.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_bookmarks.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_bookmarks.png diff --git a/FileManager/res/drawable-hdpi/ic_action_check_all.png b/FileManager/src/main/res/drawable-hdpi/ic_action_check_all.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_check_all.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_check_all.png diff --git a/FileManager/res/drawable-hdpi/ic_action_compress.png b/FileManager/src/main/res/drawable-hdpi/ic_action_compress.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_compress.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_compress.png diff --git a/FileManager/res/drawable-hdpi/ic_action_copy.png b/FileManager/src/main/res/drawable-hdpi/ic_action_copy.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_copy.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_copy.png diff --git a/FileManager/res/drawable-hdpi/ic_action_create_folder.png b/FileManager/src/main/res/drawable-hdpi/ic_action_create_folder.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_create_folder.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_create_folder.png diff --git a/FileManager/res/drawable-hdpi/ic_action_create_shortcut.png b/FileManager/src/main/res/drawable-hdpi/ic_action_create_shortcut.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_create_shortcut.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_create_shortcut.png diff --git a/FileManager/res/drawable-hdpi/ic_action_cut.png b/FileManager/src/main/res/drawable-hdpi/ic_action_cut.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_cut.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_cut.png diff --git a/FileManager/res/drawable-hdpi/ic_action_delete.png b/FileManager/src/main/res/drawable-hdpi/ic_action_delete.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_delete.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_delete.png diff --git a/FileManager/res/drawable-hdpi/ic_action_details.png b/FileManager/src/main/res/drawable-hdpi/ic_action_details.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_details.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_details.png diff --git a/FileManager/res/drawable-hdpi/ic_action_mark.png b/FileManager/src/main/res/drawable-hdpi/ic_action_mark.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_mark.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_mark.png diff --git a/FileManager/res/drawable-hdpi/ic_action_paste.png b/FileManager/src/main/res/drawable-hdpi/ic_action_paste.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_paste.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_paste.png diff --git a/FileManager/res/drawable-hdpi/ic_action_rename.png b/FileManager/src/main/res/drawable-hdpi/ic_action_rename.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_rename.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_rename.png diff --git a/FileManager/res/drawable-hdpi/ic_action_search.png b/FileManager/src/main/res/drawable-hdpi/ic_action_search.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_search.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_search.png diff --git a/FileManager/res/drawable-hdpi/ic_action_send.png b/FileManager/src/main/res/drawable-hdpi/ic_action_send.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_send.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_send.png diff --git a/FileManager/res/drawable-hdpi/ic_action_settings.png b/FileManager/src/main/res/drawable-hdpi/ic_action_settings.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_settings.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_settings.png diff --git a/FileManager/res/drawable-hdpi/ic_action_uncheck_all.png b/FileManager/src/main/res/drawable-hdpi/ic_action_uncheck_all.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_action_uncheck_all.png rename to FileManager/src/main/res/drawable-hdpi/ic_action_uncheck_all.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_android_package.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_android_package.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_android_package.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_android_package.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_archive.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_archive.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_archive.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_archive.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_audio.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_audio.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_audio.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_audio.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_file.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_file.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_file.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_file.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_image.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_image.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_image.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_image.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_shortcut.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_shortcut.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_shortcut.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_shortcut.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_text_csv.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_text_csv.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_text_csv.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_text_csv.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_text_html.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_text_html.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_text_html.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_text_html.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_text_plain.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_text_plain.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_text_plain.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_text_plain.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_text_xml.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_text_xml.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_text_xml.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_text_xml.png diff --git a/FileManager/res/drawable-hdpi/ic_launcher_video.png b/FileManager/src/main/res/drawable-hdpi/ic_launcher_video.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_launcher_video.png rename to FileManager/src/main/res/drawable-hdpi/ic_launcher_video.png diff --git a/FileManager/res/drawable-hdpi/ic_navbar_accept.png b/FileManager/src/main/res/drawable-hdpi/ic_navbar_accept.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_navbar_accept.png rename to FileManager/src/main/res/drawable-hdpi/ic_navbar_accept.png diff --git a/FileManager/res/drawable-hdpi/ic_navbar_edit.png b/FileManager/src/main/res/drawable-hdpi/ic_navbar_edit.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_navbar_edit.png rename to FileManager/src/main/res/drawable-hdpi/ic_navbar_edit.png diff --git a/FileManager/res/drawable-hdpi/ic_navbar_home.png b/FileManager/src/main/res/drawable-hdpi/ic_navbar_home.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_navbar_home.png rename to FileManager/src/main/res/drawable-hdpi/ic_navbar_home.png diff --git a/FileManager/res/drawable-hdpi/ic_navbar_sdcard.png b/FileManager/src/main/res/drawable-hdpi/ic_navbar_sdcard.png similarity index 100% rename from FileManager/res/drawable-hdpi/ic_navbar_sdcard.png rename to FileManager/src/main/res/drawable-hdpi/ic_navbar_sdcard.png diff --git a/FileManager/res/drawable-ldpi-v11/ic_action_about.png b/FileManager/src/main/res/drawable-ldpi-v11/ic_action_about.png similarity index 100% rename from FileManager/res/drawable-ldpi-v11/ic_action_about.png rename to FileManager/src/main/res/drawable-ldpi-v11/ic_action_about.png diff --git a/FileManager/res/drawable-ldpi-v11/ic_action_bookmarks.png b/FileManager/src/main/res/drawable-ldpi-v11/ic_action_bookmarks.png similarity index 100% rename from FileManager/res/drawable-ldpi-v11/ic_action_bookmarks.png rename to FileManager/src/main/res/drawable-ldpi-v11/ic_action_bookmarks.png diff --git a/FileManager/res/drawable-ldpi-v11/ic_action_create_folder.png b/FileManager/src/main/res/drawable-ldpi-v11/ic_action_create_folder.png similarity index 100% rename from FileManager/res/drawable-ldpi-v11/ic_action_create_folder.png rename to FileManager/src/main/res/drawable-ldpi-v11/ic_action_create_folder.png diff --git a/FileManager/res/drawable-ldpi-v11/ic_action_details.png b/FileManager/src/main/res/drawable-ldpi-v11/ic_action_details.png similarity index 100% rename from FileManager/res/drawable-ldpi-v11/ic_action_details.png rename to FileManager/src/main/res/drawable-ldpi-v11/ic_action_details.png diff --git a/FileManager/res/drawable-ldpi-v11/ic_action_paste.png b/FileManager/src/main/res/drawable-ldpi-v11/ic_action_paste.png similarity index 100% rename from FileManager/res/drawable-ldpi-v11/ic_action_paste.png rename to FileManager/src/main/res/drawable-ldpi-v11/ic_action_paste.png diff --git a/FileManager/res/drawable-ldpi-v11/ic_action_rename.png b/FileManager/src/main/res/drawable-ldpi-v11/ic_action_rename.png similarity index 100% rename from FileManager/res/drawable-ldpi-v11/ic_action_rename.png rename to FileManager/src/main/res/drawable-ldpi-v11/ic_action_rename.png diff --git a/FileManager/res/drawable-ldpi-v11/ic_action_search.png b/FileManager/src/main/res/drawable-ldpi-v11/ic_action_search.png similarity index 100% rename from FileManager/res/drawable-ldpi-v11/ic_action_search.png rename to FileManager/src/main/res/drawable-ldpi-v11/ic_action_search.png diff --git a/FileManager/res/drawable-ldpi-v11/ic_action_settings.png b/FileManager/src/main/res/drawable-ldpi-v11/ic_action_settings.png similarity index 100% rename from FileManager/res/drawable-ldpi-v11/ic_action_settings.png rename to FileManager/src/main/res/drawable-ldpi-v11/ic_action_settings.png diff --git a/FileManager/res/drawable-ldpi-v5/ic_launcher.png b/FileManager/src/main/res/drawable-ldpi-v5/ic_launcher.png similarity index 100% rename from FileManager/res/drawable-ldpi-v5/ic_launcher.png rename to FileManager/src/main/res/drawable-ldpi-v5/ic_launcher.png diff --git a/FileManager/res/drawable-ldpi-v5/ic_launcher_folder.png b/FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_folder.png similarity index 100% rename from FileManager/res/drawable-ldpi-v5/ic_launcher_folder.png rename to FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_folder.png diff --git a/FileManager/res/drawable-ldpi-v5/ic_launcher_home.png b/FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_home.png similarity index 100% rename from FileManager/res/drawable-ldpi-v5/ic_launcher_home.png rename to FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_home.png diff --git a/FileManager/res/drawable-ldpi-v5/ic_launcher_home_small.png b/FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_home_small.png similarity index 100% rename from FileManager/res/drawable-ldpi-v5/ic_launcher_home_small.png rename to FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_home_small.png diff --git a/FileManager/res/drawable-ldpi-v5/ic_launcher_sdcard.png b/FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_sdcard.png similarity index 100% rename from FileManager/res/drawable-ldpi-v5/ic_launcher_sdcard.png rename to FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_sdcard.png diff --git a/FileManager/res/drawable-ldpi-v5/ic_launcher_sdcard_small.png b/FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_sdcard_small.png similarity index 100% rename from FileManager/res/drawable-ldpi-v5/ic_launcher_sdcard_small.png rename to FileManager/src/main/res/drawable-ldpi-v5/ic_launcher_sdcard_small.png diff --git a/FileManager/res/drawable-ldpi/ic_action_bookmarks.png b/FileManager/src/main/res/drawable-ldpi/ic_action_bookmarks.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_bookmarks.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_bookmarks.png diff --git a/FileManager/res/drawable-ldpi/ic_action_check_all.png b/FileManager/src/main/res/drawable-ldpi/ic_action_check_all.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_check_all.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_check_all.png diff --git a/FileManager/res/drawable-ldpi/ic_action_compress.png b/FileManager/src/main/res/drawable-ldpi/ic_action_compress.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_compress.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_compress.png diff --git a/FileManager/res/drawable-ldpi/ic_action_copy.png b/FileManager/src/main/res/drawable-ldpi/ic_action_copy.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_copy.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_copy.png diff --git a/FileManager/res/drawable-ldpi/ic_action_create_folder.png b/FileManager/src/main/res/drawable-ldpi/ic_action_create_folder.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_create_folder.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_create_folder.png diff --git a/FileManager/res/drawable-ldpi/ic_action_create_shortcut.png b/FileManager/src/main/res/drawable-ldpi/ic_action_create_shortcut.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_create_shortcut.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_create_shortcut.png diff --git a/FileManager/res/drawable-ldpi/ic_action_cut.png b/FileManager/src/main/res/drawable-ldpi/ic_action_cut.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_cut.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_cut.png diff --git a/FileManager/res/drawable-ldpi/ic_action_delete.png b/FileManager/src/main/res/drawable-ldpi/ic_action_delete.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_delete.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_delete.png diff --git a/FileManager/res/drawable-ldpi/ic_action_details.png b/FileManager/src/main/res/drawable-ldpi/ic_action_details.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_details.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_details.png diff --git a/FileManager/res/drawable-ldpi/ic_action_mark.png b/FileManager/src/main/res/drawable-ldpi/ic_action_mark.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_mark.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_mark.png diff --git a/FileManager/res/drawable-ldpi/ic_action_paste.png b/FileManager/src/main/res/drawable-ldpi/ic_action_paste.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_paste.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_paste.png diff --git a/FileManager/res/drawable-ldpi/ic_action_rename.png b/FileManager/src/main/res/drawable-ldpi/ic_action_rename.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_rename.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_rename.png diff --git a/FileManager/res/drawable-ldpi/ic_action_search.png b/FileManager/src/main/res/drawable-ldpi/ic_action_search.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_search.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_search.png diff --git a/FileManager/res/drawable-ldpi/ic_action_send.png b/FileManager/src/main/res/drawable-ldpi/ic_action_send.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_send.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_send.png diff --git a/FileManager/res/drawable-ldpi/ic_action_settings.png b/FileManager/src/main/res/drawable-ldpi/ic_action_settings.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_settings.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_settings.png diff --git a/FileManager/res/drawable-ldpi/ic_action_uncheck_all.png b/FileManager/src/main/res/drawable-ldpi/ic_action_uncheck_all.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_action_uncheck_all.png rename to FileManager/src/main/res/drawable-ldpi/ic_action_uncheck_all.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_android_package.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_android_package.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_android_package.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_android_package.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_archive.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_archive.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_archive.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_archive.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_audio.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_audio.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_audio.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_audio.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_file.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_file.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_file.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_file.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_image.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_image.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_image.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_image.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_shortcut.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_shortcut.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_shortcut.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_shortcut.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_text_csv.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_text_csv.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_text_csv.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_text_csv.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_text_html.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_text_html.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_text_html.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_text_html.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_text_plain.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_text_plain.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_text_plain.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_text_plain.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_text_xml.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_text_xml.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_text_xml.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_text_xml.png diff --git a/FileManager/res/drawable-ldpi/ic_launcher_video.png b/FileManager/src/main/res/drawable-ldpi/ic_launcher_video.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_launcher_video.png rename to FileManager/src/main/res/drawable-ldpi/ic_launcher_video.png diff --git a/FileManager/res/drawable-ldpi/ic_navbar_accept.png b/FileManager/src/main/res/drawable-ldpi/ic_navbar_accept.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_navbar_accept.png rename to FileManager/src/main/res/drawable-ldpi/ic_navbar_accept.png diff --git a/FileManager/res/drawable-ldpi/ic_navbar_edit.png b/FileManager/src/main/res/drawable-ldpi/ic_navbar_edit.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_navbar_edit.png rename to FileManager/src/main/res/drawable-ldpi/ic_navbar_edit.png diff --git a/FileManager/res/drawable-ldpi/ic_navbar_home.png b/FileManager/src/main/res/drawable-ldpi/ic_navbar_home.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_navbar_home.png rename to FileManager/src/main/res/drawable-ldpi/ic_navbar_home.png diff --git a/FileManager/res/drawable-ldpi/ic_navbar_sdcard.png b/FileManager/src/main/res/drawable-ldpi/ic_navbar_sdcard.png similarity index 100% rename from FileManager/res/drawable-ldpi/ic_navbar_sdcard.png rename to FileManager/src/main/res/drawable-ldpi/ic_navbar_sdcard.png diff --git a/FileManager/res/drawable-mdpi-v11/ic_action_about.png b/FileManager/src/main/res/drawable-mdpi-v11/ic_action_about.png similarity index 100% rename from FileManager/res/drawable-mdpi-v11/ic_action_about.png rename to FileManager/src/main/res/drawable-mdpi-v11/ic_action_about.png diff --git a/FileManager/res/drawable-mdpi-v11/ic_action_bookmarks.png b/FileManager/src/main/res/drawable-mdpi-v11/ic_action_bookmarks.png similarity index 100% rename from FileManager/res/drawable-mdpi-v11/ic_action_bookmarks.png rename to FileManager/src/main/res/drawable-mdpi-v11/ic_action_bookmarks.png diff --git a/FileManager/res/drawable-mdpi-v11/ic_action_create_folder.png b/FileManager/src/main/res/drawable-mdpi-v11/ic_action_create_folder.png similarity index 100% rename from FileManager/res/drawable-mdpi-v11/ic_action_create_folder.png rename to FileManager/src/main/res/drawable-mdpi-v11/ic_action_create_folder.png diff --git a/FileManager/res/drawable-mdpi-v11/ic_action_details.png b/FileManager/src/main/res/drawable-mdpi-v11/ic_action_details.png similarity index 100% rename from FileManager/res/drawable-mdpi-v11/ic_action_details.png rename to FileManager/src/main/res/drawable-mdpi-v11/ic_action_details.png diff --git a/FileManager/res/drawable-mdpi-v11/ic_action_paste.png b/FileManager/src/main/res/drawable-mdpi-v11/ic_action_paste.png similarity index 100% rename from FileManager/res/drawable-mdpi-v11/ic_action_paste.png rename to FileManager/src/main/res/drawable-mdpi-v11/ic_action_paste.png diff --git a/FileManager/res/drawable-mdpi-v11/ic_action_rename.png b/FileManager/src/main/res/drawable-mdpi-v11/ic_action_rename.png similarity index 100% rename from FileManager/res/drawable-mdpi-v11/ic_action_rename.png rename to FileManager/src/main/res/drawable-mdpi-v11/ic_action_rename.png diff --git a/FileManager/res/drawable-mdpi-v11/ic_action_search.png b/FileManager/src/main/res/drawable-mdpi-v11/ic_action_search.png similarity index 100% rename from FileManager/res/drawable-mdpi-v11/ic_action_search.png rename to FileManager/src/main/res/drawable-mdpi-v11/ic_action_search.png diff --git a/FileManager/res/drawable-mdpi-v11/ic_action_settings.png b/FileManager/src/main/res/drawable-mdpi-v11/ic_action_settings.png similarity index 100% rename from FileManager/res/drawable-mdpi-v11/ic_action_settings.png rename to FileManager/src/main/res/drawable-mdpi-v11/ic_action_settings.png diff --git a/FileManager/res/drawable-mdpi-v5/ic_launcher.png b/FileManager/src/main/res/drawable-mdpi-v5/ic_launcher.png similarity index 100% rename from FileManager/res/drawable-mdpi-v5/ic_launcher.png rename to FileManager/src/main/res/drawable-mdpi-v5/ic_launcher.png diff --git a/FileManager/res/drawable-mdpi-v5/ic_launcher_folder.png b/FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_folder.png similarity index 100% rename from FileManager/res/drawable-mdpi-v5/ic_launcher_folder.png rename to FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_folder.png diff --git a/FileManager/res/drawable-mdpi-v5/ic_launcher_home.png b/FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_home.png similarity index 100% rename from FileManager/res/drawable-mdpi-v5/ic_launcher_home.png rename to FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_home.png diff --git a/FileManager/res/drawable-mdpi-v5/ic_launcher_home_small.png b/FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_home_small.png similarity index 100% rename from FileManager/res/drawable-mdpi-v5/ic_launcher_home_small.png rename to FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_home_small.png diff --git a/FileManager/res/drawable-mdpi-v5/ic_launcher_sdcard.png b/FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_sdcard.png similarity index 100% rename from FileManager/res/drawable-mdpi-v5/ic_launcher_sdcard.png rename to FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_sdcard.png diff --git a/FileManager/res/drawable-mdpi-v5/ic_launcher_sdcard_small.png b/FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_sdcard_small.png similarity index 100% rename from FileManager/res/drawable-mdpi-v5/ic_launcher_sdcard_small.png rename to FileManager/src/main/res/drawable-mdpi-v5/ic_launcher_sdcard_small.png diff --git a/FileManager/res/drawable-mdpi/ab_solid_dark_holo.9.png b/FileManager/src/main/res/drawable-mdpi/ab_solid_dark_holo.9.png similarity index 100% rename from FileManager/res/drawable-mdpi/ab_solid_dark_holo.9.png rename to FileManager/src/main/res/drawable-mdpi/ab_solid_dark_holo.9.png diff --git a/FileManager/res/drawable-mdpi/bg_pathbar_light.9.png b/FileManager/src/main/res/drawable-mdpi/bg_pathbar_light.9.png similarity index 100% rename from FileManager/res/drawable-mdpi/bg_pathbar_light.9.png rename to FileManager/src/main/res/drawable-mdpi/bg_pathbar_light.9.png diff --git a/FileManager/res/drawable-mdpi/bg_textfield_light_activated.9.png b/FileManager/src/main/res/drawable-mdpi/bg_textfield_light_activated.9.png similarity index 100% rename from FileManager/res/drawable-mdpi/bg_textfield_light_activated.9.png rename to FileManager/src/main/res/drawable-mdpi/bg_textfield_light_activated.9.png diff --git a/FileManager/res/drawable-mdpi/bg_textfield_light_normal.9.png b/FileManager/src/main/res/drawable-mdpi/bg_textfield_light_normal.9.png similarity index 100% rename from FileManager/res/drawable-mdpi/bg_textfield_light_normal.9.png rename to FileManager/src/main/res/drawable-mdpi/bg_textfield_light_normal.9.png diff --git a/FileManager/res/drawable-mdpi/bg_top_bar_dark.9.png b/FileManager/src/main/res/drawable-mdpi/bg_top_bar_dark.9.png similarity index 100% rename from FileManager/res/drawable-mdpi/bg_top_bar_dark.9.png rename to FileManager/src/main/res/drawable-mdpi/bg_top_bar_dark.9.png diff --git a/FileManager/res/drawable-mdpi/ic_action_bookmarks.png b/FileManager/src/main/res/drawable-mdpi/ic_action_bookmarks.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_bookmarks.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_bookmarks.png diff --git a/FileManager/res/drawable-mdpi/ic_action_check_all.png b/FileManager/src/main/res/drawable-mdpi/ic_action_check_all.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_check_all.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_check_all.png diff --git a/FileManager/res/drawable-mdpi/ic_action_compress.png b/FileManager/src/main/res/drawable-mdpi/ic_action_compress.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_compress.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_compress.png diff --git a/FileManager/res/drawable-mdpi/ic_action_copy.png b/FileManager/src/main/res/drawable-mdpi/ic_action_copy.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_copy.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_copy.png diff --git a/FileManager/res/drawable-mdpi/ic_action_create_folder.png b/FileManager/src/main/res/drawable-mdpi/ic_action_create_folder.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_create_folder.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_create_folder.png diff --git a/FileManager/res/drawable-mdpi/ic_action_create_shortcut.png b/FileManager/src/main/res/drawable-mdpi/ic_action_create_shortcut.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_create_shortcut.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_create_shortcut.png diff --git a/FileManager/res/drawable-mdpi/ic_action_cut.png b/FileManager/src/main/res/drawable-mdpi/ic_action_cut.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_cut.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_cut.png diff --git a/FileManager/res/drawable-mdpi/ic_action_delete.png b/FileManager/src/main/res/drawable-mdpi/ic_action_delete.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_delete.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_delete.png diff --git a/FileManager/res/drawable-mdpi/ic_action_details.png b/FileManager/src/main/res/drawable-mdpi/ic_action_details.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_details.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_details.png diff --git a/FileManager/res/drawable-mdpi/ic_action_mark.png b/FileManager/src/main/res/drawable-mdpi/ic_action_mark.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_mark.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_mark.png diff --git a/FileManager/res/drawable-mdpi/ic_action_paste.png b/FileManager/src/main/res/drawable-mdpi/ic_action_paste.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_paste.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_paste.png diff --git a/FileManager/res/drawable-mdpi/ic_action_rename.png b/FileManager/src/main/res/drawable-mdpi/ic_action_rename.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_rename.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_rename.png diff --git a/FileManager/res/drawable-mdpi/ic_action_search.png b/FileManager/src/main/res/drawable-mdpi/ic_action_search.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_search.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_search.png diff --git a/FileManager/res/drawable-mdpi/ic_action_send.png b/FileManager/src/main/res/drawable-mdpi/ic_action_send.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_send.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_send.png diff --git a/FileManager/res/drawable-mdpi/ic_action_settings.png b/FileManager/src/main/res/drawable-mdpi/ic_action_settings.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_settings.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_settings.png diff --git a/FileManager/res/drawable-mdpi/ic_action_uncheck_all.png b/FileManager/src/main/res/drawable-mdpi/ic_action_uncheck_all.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_action_uncheck_all.png rename to FileManager/src/main/res/drawable-mdpi/ic_action_uncheck_all.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_android_package.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_android_package.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_android_package.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_android_package.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_archive.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_archive.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_archive.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_archive.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_audio.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_audio.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_audio.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_audio.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_file.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_file.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_file.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_file.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_image.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_image.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_image.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_image.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_shortcut.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_shortcut.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_shortcut.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_shortcut.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_text_csv.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_text_csv.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_text_csv.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_text_csv.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_text_html.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_text_html.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_text_html.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_text_html.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_text_plain.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_text_plain.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_text_plain.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_text_plain.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_text_xml.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_text_xml.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_text_xml.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_text_xml.png diff --git a/FileManager/res/drawable-mdpi/ic_launcher_video.png b/FileManager/src/main/res/drawable-mdpi/ic_launcher_video.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_launcher_video.png rename to FileManager/src/main/res/drawable-mdpi/ic_launcher_video.png diff --git a/FileManager/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png b/FileManager/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png rename to FileManager/src/main/res/drawable-mdpi/ic_menu_moreoverflow_normal_holo_dark.png diff --git a/FileManager/res/drawable-mdpi/ic_navbar_accept.png b/FileManager/src/main/res/drawable-mdpi/ic_navbar_accept.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_navbar_accept.png rename to FileManager/src/main/res/drawable-mdpi/ic_navbar_accept.png diff --git a/FileManager/res/drawable-mdpi/ic_navbar_edit.png b/FileManager/src/main/res/drawable-mdpi/ic_navbar_edit.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_navbar_edit.png rename to FileManager/src/main/res/drawable-mdpi/ic_navbar_edit.png diff --git a/FileManager/res/drawable-mdpi/ic_navbar_home.png b/FileManager/src/main/res/drawable-mdpi/ic_navbar_home.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_navbar_home.png rename to FileManager/src/main/res/drawable-mdpi/ic_navbar_home.png diff --git a/FileManager/res/drawable-mdpi/ic_navbar_sdcard.png b/FileManager/src/main/res/drawable-mdpi/ic_navbar_sdcard.png similarity index 100% rename from FileManager/res/drawable-mdpi/ic_navbar_sdcard.png rename to FileManager/src/main/res/drawable-mdpi/ic_navbar_sdcard.png diff --git a/FileManager/res/drawable-v8/bg_pathbar_btn.xml b/FileManager/src/main/res/drawable-v8/bg_pathbar_btn.xml similarity index 100% rename from FileManager/res/drawable-v8/bg_pathbar_btn.xml rename to FileManager/src/main/res/drawable-v8/bg_pathbar_btn.xml diff --git a/FileManager/res/drawable-xhdpi-v11/ic_action_about.png b/FileManager/src/main/res/drawable-xhdpi-v11/ic_action_about.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v11/ic_action_about.png rename to FileManager/src/main/res/drawable-xhdpi-v11/ic_action_about.png diff --git a/FileManager/res/drawable-xhdpi-v11/ic_action_bookmarks.png b/FileManager/src/main/res/drawable-xhdpi-v11/ic_action_bookmarks.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v11/ic_action_bookmarks.png rename to FileManager/src/main/res/drawable-xhdpi-v11/ic_action_bookmarks.png diff --git a/FileManager/res/drawable-xhdpi-v11/ic_action_create_folder.png b/FileManager/src/main/res/drawable-xhdpi-v11/ic_action_create_folder.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v11/ic_action_create_folder.png rename to FileManager/src/main/res/drawable-xhdpi-v11/ic_action_create_folder.png diff --git a/FileManager/res/drawable-xhdpi-v11/ic_action_details.png b/FileManager/src/main/res/drawable-xhdpi-v11/ic_action_details.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v11/ic_action_details.png rename to FileManager/src/main/res/drawable-xhdpi-v11/ic_action_details.png diff --git a/FileManager/res/drawable-xhdpi-v11/ic_action_paste.png b/FileManager/src/main/res/drawable-xhdpi-v11/ic_action_paste.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v11/ic_action_paste.png rename to FileManager/src/main/res/drawable-xhdpi-v11/ic_action_paste.png diff --git a/FileManager/res/drawable-xhdpi-v11/ic_action_rename.png b/FileManager/src/main/res/drawable-xhdpi-v11/ic_action_rename.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v11/ic_action_rename.png rename to FileManager/src/main/res/drawable-xhdpi-v11/ic_action_rename.png diff --git a/FileManager/res/drawable-xhdpi-v11/ic_action_search.png b/FileManager/src/main/res/drawable-xhdpi-v11/ic_action_search.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v11/ic_action_search.png rename to FileManager/src/main/res/drawable-xhdpi-v11/ic_action_search.png diff --git a/FileManager/res/drawable-xhdpi-v11/ic_action_settings.png b/FileManager/src/main/res/drawable-xhdpi-v11/ic_action_settings.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v11/ic_action_settings.png rename to FileManager/src/main/res/drawable-xhdpi-v11/ic_action_settings.png diff --git a/FileManager/res/drawable-xhdpi-v5/ic_launcher.png b/FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v5/ic_launcher.png rename to FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher.png diff --git a/FileManager/res/drawable-xhdpi-v5/ic_launcher_folder.png b/FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_folder.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v5/ic_launcher_folder.png rename to FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_folder.png diff --git a/FileManager/res/drawable-xhdpi-v5/ic_launcher_home.png b/FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_home.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v5/ic_launcher_home.png rename to FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_home.png diff --git a/FileManager/res/drawable-xhdpi-v5/ic_launcher_home_small.png b/FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_home_small.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v5/ic_launcher_home_small.png rename to FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_home_small.png diff --git a/FileManager/res/drawable-xhdpi-v5/ic_launcher_sdcard.png b/FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_sdcard.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v5/ic_launcher_sdcard.png rename to FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_sdcard.png diff --git a/FileManager/res/drawable-xhdpi-v5/ic_launcher_sdcard_small.png b/FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_sdcard_small.png similarity index 100% rename from FileManager/res/drawable-xhdpi-v5/ic_launcher_sdcard_small.png rename to FileManager/src/main/res/drawable-xhdpi-v5/ic_launcher_sdcard_small.png diff --git a/FileManager/res/drawable-xhdpi/bg_textfield_light_activated.9.png b/FileManager/src/main/res/drawable-xhdpi/bg_textfield_light_activated.9.png similarity index 100% rename from FileManager/res/drawable-xhdpi/bg_textfield_light_activated.9.png rename to FileManager/src/main/res/drawable-xhdpi/bg_textfield_light_activated.9.png diff --git a/FileManager/res/drawable-xhdpi/bg_textfield_light_normal.9.png b/FileManager/src/main/res/drawable-xhdpi/bg_textfield_light_normal.9.png similarity index 100% rename from FileManager/res/drawable-xhdpi/bg_textfield_light_normal.9.png rename to FileManager/src/main/res/drawable-xhdpi/bg_textfield_light_normal.9.png diff --git a/FileManager/res/drawable-xhdpi/bg_top_bar_dark.9.png b/FileManager/src/main/res/drawable-xhdpi/bg_top_bar_dark.9.png similarity index 100% rename from FileManager/res/drawable-xhdpi/bg_top_bar_dark.9.png rename to FileManager/src/main/res/drawable-xhdpi/bg_top_bar_dark.9.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_check_all.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_check_all.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_check_all.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_check_all.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_compress.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_compress.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_compress.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_compress.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_copy.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_copy.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_copy.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_copy.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_create_shortcut.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_create_shortcut.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_create_shortcut.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_create_shortcut.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_cut.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_cut.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_cut.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_cut.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_delete.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_delete.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_delete.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_delete.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_paste.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_paste.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_paste.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_paste.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_send.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_send.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_send.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_send.png diff --git a/FileManager/res/drawable-xhdpi/ic_action_uncheck_all.png b/FileManager/src/main/res/drawable-xhdpi/ic_action_uncheck_all.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_action_uncheck_all.png rename to FileManager/src/main/res/drawable-xhdpi/ic_action_uncheck_all.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_android_package.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_android_package.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_android_package.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_android_package.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_archive.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_archive.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_archive.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_archive.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_audio.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_audio.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_audio.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_audio.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_file.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_file.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_file.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_file.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_image.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_image.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_image.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_image.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_shortcut.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_shortcut.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_shortcut.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_shortcut.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_text_csv.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_text_csv.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_text_csv.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_text_csv.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_text_html.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_text_html.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_text_html.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_text_html.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_text_plain.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_text_plain.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_text_plain.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_text_plain.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_text_xml.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_text_xml.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_text_xml.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_text_xml.png diff --git a/FileManager/res/drawable-xhdpi/ic_launcher_video.png b/FileManager/src/main/res/drawable-xhdpi/ic_launcher_video.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_launcher_video.png rename to FileManager/src/main/res/drawable-xhdpi/ic_launcher_video.png diff --git a/FileManager/res/drawable-xhdpi/ic_navbar_accept.png b/FileManager/src/main/res/drawable-xhdpi/ic_navbar_accept.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_navbar_accept.png rename to FileManager/src/main/res/drawable-xhdpi/ic_navbar_accept.png diff --git a/FileManager/res/drawable-xhdpi/ic_navbar_edit.png b/FileManager/src/main/res/drawable-xhdpi/ic_navbar_edit.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_navbar_edit.png rename to FileManager/src/main/res/drawable-xhdpi/ic_navbar_edit.png diff --git a/FileManager/res/drawable-xhdpi/ic_navbar_home.png b/FileManager/src/main/res/drawable-xhdpi/ic_navbar_home.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_navbar_home.png rename to FileManager/src/main/res/drawable-xhdpi/ic_navbar_home.png diff --git a/FileManager/res/drawable-xhdpi/ic_navbar_sdcard.png b/FileManager/src/main/res/drawable-xhdpi/ic_navbar_sdcard.png similarity index 100% rename from FileManager/res/drawable-xhdpi/ic_navbar_sdcard.png rename to FileManager/src/main/res/drawable-xhdpi/ic_navbar_sdcard.png diff --git a/FileManager/res/drawable-xxhdpi/ic_launcher.png b/FileManager/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from FileManager/res/drawable-xxhdpi/ic_launcher.png rename to FileManager/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/FileManager/res/drawable/bg_action_container_button.xml b/FileManager/src/main/res/drawable/bg_action_container_button.xml similarity index 100% rename from FileManager/res/drawable/bg_action_container_button.xml rename to FileManager/src/main/res/drawable/bg_action_container_button.xml diff --git a/FileManager/res/drawable/bg_pathbar_btn.xml b/FileManager/src/main/res/drawable/bg_pathbar_btn.xml similarity index 100% rename from FileManager/res/drawable/bg_pathbar_btn.xml rename to FileManager/src/main/res/drawable/bg_pathbar_btn.xml diff --git a/FileManager/res/drawable/bg_pathbar_btn_standard_focused.9.png b/FileManager/src/main/res/drawable/bg_pathbar_btn_standard_focused.9.png similarity index 100% rename from FileManager/res/drawable/bg_pathbar_btn_standard_focused.9.png rename to FileManager/src/main/res/drawable/bg_pathbar_btn_standard_focused.9.png diff --git a/FileManager/res/drawable/bg_pathbar_btn_standard_normal.9.png b/FileManager/src/main/res/drawable/bg_pathbar_btn_standard_normal.9.png similarity index 100% rename from FileManager/res/drawable/bg_pathbar_btn_standard_normal.9.png rename to FileManager/src/main/res/drawable/bg_pathbar_btn_standard_normal.9.png diff --git a/FileManager/res/drawable/bg_pathbar_btn_standard_pressed.9.png b/FileManager/src/main/res/drawable/bg_pathbar_btn_standard_pressed.9.png similarity index 100% rename from FileManager/res/drawable/bg_pathbar_btn_standard_pressed.9.png rename to FileManager/src/main/res/drawable/bg_pathbar_btn_standard_pressed.9.png diff --git a/FileManager/res/drawable/bg_textfield_light.xml b/FileManager/src/main/res/drawable/bg_textfield_light.xml similarity index 100% rename from FileManager/res/drawable/bg_textfield_light.xml rename to FileManager/src/main/res/drawable/bg_textfield_light.xml diff --git a/FileManager/res/drawable/bg_top_bar_light.9.png b/FileManager/src/main/res/drawable/bg_top_bar_light.9.png similarity index 100% rename from FileManager/res/drawable/bg_top_bar_light.9.png rename to FileManager/src/main/res/drawable/bg_top_bar_light.9.png diff --git a/FileManager/res/drawable/ic_button_checked.png b/FileManager/src/main/res/drawable/ic_button_checked.png similarity index 100% rename from FileManager/res/drawable/ic_button_checked.png rename to FileManager/src/main/res/drawable/ic_button_checked.png diff --git a/FileManager/res/drawable/ic_button_unchecked.png b/FileManager/src/main/res/drawable/ic_button_unchecked.png similarity index 100% rename from FileManager/res/drawable/ic_button_unchecked.png rename to FileManager/src/main/res/drawable/ic_button_unchecked.png diff --git a/FileManager/res/drawable/ic_launcher.png b/FileManager/src/main/res/drawable/ic_launcher.png similarity index 100% rename from FileManager/res/drawable/ic_launcher.png rename to FileManager/src/main/res/drawable/ic_launcher.png diff --git a/FileManager/res/drawable/ic_launcher_folder.png b/FileManager/src/main/res/drawable/ic_launcher_folder.png similarity index 100% rename from FileManager/res/drawable/ic_launcher_folder.png rename to FileManager/src/main/res/drawable/ic_launcher_folder.png diff --git a/FileManager/res/drawable/ic_launcher_folder_open.png b/FileManager/src/main/res/drawable/ic_launcher_folder_open.png similarity index 100% rename from FileManager/res/drawable/ic_launcher_folder_open.png rename to FileManager/src/main/res/drawable/ic_launcher_folder_open.png diff --git a/FileManager/res/drawable/ic_launcher_home.png b/FileManager/src/main/res/drawable/ic_launcher_home.png similarity index 100% rename from FileManager/res/drawable/ic_launcher_home.png rename to FileManager/src/main/res/drawable/ic_launcher_home.png diff --git a/FileManager/res/drawable/ic_launcher_home_small.png b/FileManager/src/main/res/drawable/ic_launcher_home_small.png similarity index 100% rename from FileManager/res/drawable/ic_launcher_home_small.png rename to FileManager/src/main/res/drawable/ic_launcher_home_small.png diff --git a/FileManager/res/drawable/ic_launcher_map.xml b/FileManager/src/main/res/drawable/ic_launcher_map.xml similarity index 100% rename from FileManager/res/drawable/ic_launcher_map.xml rename to FileManager/src/main/res/drawable/ic_launcher_map.xml diff --git a/FileManager/res/drawable/ic_launcher_sdcard.png b/FileManager/src/main/res/drawable/ic_launcher_sdcard.png similarity index 100% rename from FileManager/res/drawable/ic_launcher_sdcard.png rename to FileManager/src/main/res/drawable/ic_launcher_sdcard.png diff --git a/FileManager/res/drawable/ic_launcher_sdcard_small.png b/FileManager/src/main/res/drawable/ic_launcher_sdcard_small.png similarity index 100% rename from FileManager/res/drawable/ic_launcher_sdcard_small.png rename to FileManager/src/main/res/drawable/ic_launcher_sdcard_small.png diff --git a/FileManager/res/drawable/list_background_dark_actual.9.png b/FileManager/src/main/res/drawable/list_background_dark_actual.9.png similarity index 100% rename from FileManager/res/drawable/list_background_dark_actual.9.png rename to FileManager/src/main/res/drawable/list_background_dark_actual.9.png diff --git a/FileManager/res/drawable/list_background_light_actual.9.png b/FileManager/src/main/res/drawable/list_background_light_actual.9.png similarity index 100% rename from FileManager/res/drawable/list_background_light_actual.9.png rename to FileManager/src/main/res/drawable/list_background_light_actual.9.png diff --git a/FileManager/res/drawable/select_all.xml b/FileManager/src/main/res/drawable/select_all.xml similarity index 100% rename from FileManager/res/drawable/select_all.xml rename to FileManager/src/main/res/drawable/select_all.xml diff --git a/FileManager/res/layout/dialog_details.xml b/FileManager/src/main/res/layout/dialog_details.xml similarity index 100% rename from FileManager/res/layout/dialog_details.xml rename to FileManager/src/main/res/layout/dialog_details.xml diff --git a/FileManager/res/layout/dialog_text_input.xml b/FileManager/src/main/res/layout/dialog_text_input.xml similarity index 100% rename from FileManager/res/layout/dialog_text_input.xml rename to FileManager/src/main/res/layout/dialog_text_input.xml diff --git a/FileManager/res/layout/dialog_warning.xml b/FileManager/src/main/res/layout/dialog_warning.xml similarity index 100% rename from FileManager/res/layout/dialog_warning.xml rename to FileManager/src/main/res/layout/dialog_warning.xml diff --git a/FileManager/res/layout/filelist.xml b/FileManager/src/main/res/layout/filelist.xml similarity index 100% rename from FileManager/res/layout/filelist.xml rename to FileManager/src/main/res/layout/filelist.xml diff --git a/FileManager/res/layout/filelist_browse.xml b/FileManager/src/main/res/layout/filelist_browse.xml similarity index 100% rename from FileManager/res/layout/filelist_browse.xml rename to FileManager/src/main/res/layout/filelist_browse.xml diff --git a/FileManager/res/layout/filelist_legacy_multiselect.xml b/FileManager/src/main/res/layout/filelist_legacy_multiselect.xml similarity index 100% rename from FileManager/res/layout/filelist_legacy_multiselect.xml rename to FileManager/src/main/res/layout/filelist_legacy_multiselect.xml diff --git a/FileManager/res/layout/filelist_pick.xml b/FileManager/src/main/res/layout/filelist_pick.xml similarity index 100% rename from FileManager/res/layout/filelist_pick.xml rename to FileManager/src/main/res/layout/filelist_pick.xml diff --git a/FileManager/res/layout/item_filelist.xml b/FileManager/src/main/res/layout/item_filelist.xml similarity index 100% rename from FileManager/res/layout/item_filelist.xml rename to FileManager/src/main/res/layout/item_filelist.xml diff --git a/FileManager/res/layout/item_filelist_multiselect.xml b/FileManager/src/main/res/layout/item_filelist_multiselect.xml similarity index 100% rename from FileManager/res/layout/item_filelist_multiselect.xml rename to FileManager/src/main/res/layout/item_filelist_multiselect.xml diff --git a/FileManager/res/menu/bookmarks.xml b/FileManager/src/main/res/menu/bookmarks.xml similarity index 100% rename from FileManager/res/menu/bookmarks.xml rename to FileManager/src/main/res/menu/bookmarks.xml diff --git a/FileManager/res/menu/context.xml b/FileManager/src/main/res/menu/context.xml similarity index 100% rename from FileManager/res/menu/context.xml rename to FileManager/src/main/res/menu/context.xml diff --git a/FileManager/res/menu/context_pick.xml b/FileManager/src/main/res/menu/context_pick.xml similarity index 100% rename from FileManager/res/menu/context_pick.xml rename to FileManager/src/main/res/menu/context_pick.xml diff --git a/FileManager/res/menu/main.xml b/FileManager/src/main/res/menu/main.xml similarity index 100% rename from FileManager/res/menu/main.xml rename to FileManager/src/main/res/menu/main.xml diff --git a/FileManager/res/menu/multiselect.xml b/FileManager/src/main/res/menu/multiselect.xml similarity index 100% rename from FileManager/res/menu/multiselect.xml rename to FileManager/src/main/res/menu/multiselect.xml diff --git a/FileManager/res/menu/options_multiselect.xml b/FileManager/src/main/res/menu/options_multiselect.xml similarity index 100% rename from FileManager/res/menu/options_multiselect.xml rename to FileManager/src/main/res/menu/options_multiselect.xml diff --git a/FileManager/res/menu/simple_file_list.xml b/FileManager/src/main/res/menu/simple_file_list.xml similarity index 100% rename from FileManager/res/menu/simple_file_list.xml rename to FileManager/src/main/res/menu/simple_file_list.xml diff --git a/FileManager/res/raw-ko/recent_changes.txt b/FileManager/src/main/res/raw-ko/recent_changes.txt similarity index 100% rename from FileManager/res/raw-ko/recent_changes.txt rename to FileManager/src/main/res/raw-ko/recent_changes.txt diff --git a/FileManager/res/raw/recent_changes.txt b/FileManager/src/main/res/raw/recent_changes.txt similarity index 74% rename from FileManager/res/raw/recent_changes.txt rename to FileManager/src/main/res/raw/recent_changes.txt index e0051915..2c374b0a 100644 --- a/FileManager/res/raw/recent_changes.txt +++ b/FileManager/src/main/res/raw/recent_changes.txt @@ -1,3 +1,14 @@ +---------------- +release: 2.2.7 + +- add product flavors for foss distribution and google play distribution +- hide donation menu in google play distribution + +---------------- +release: 2.2.6 + +- fix recent changes + ---------------- release: 2.2.5 diff --git a/FileManager/res/values-ar/strings.xml b/FileManager/src/main/res/values-ar/strings.xml similarity index 100% rename from FileManager/res/values-ar/strings.xml rename to FileManager/src/main/res/values-ar/strings.xml diff --git a/FileManager/res/values-az/strings.xml b/FileManager/src/main/res/values-az/strings.xml similarity index 100% rename from FileManager/res/values-az/strings.xml rename to FileManager/src/main/res/values-az/strings.xml diff --git a/FileManager/res/values-be/strings.xml b/FileManager/src/main/res/values-be/strings.xml similarity index 100% rename from FileManager/res/values-be/strings.xml rename to FileManager/src/main/res/values-be/strings.xml diff --git a/FileManager/res/values-bg/strings.xml b/FileManager/src/main/res/values-bg/strings.xml similarity index 100% rename from FileManager/res/values-bg/strings.xml rename to FileManager/src/main/res/values-bg/strings.xml diff --git a/FileManager/res/values-bs/strings.xml b/FileManager/src/main/res/values-bs/strings.xml similarity index 100% rename from FileManager/res/values-bs/strings.xml rename to FileManager/src/main/res/values-bs/strings.xml diff --git a/FileManager/res/values-ca/strings.xml b/FileManager/src/main/res/values-ca/strings.xml similarity index 100% rename from FileManager/res/values-ca/strings.xml rename to FileManager/src/main/res/values-ca/strings.xml diff --git a/FileManager/res/values-cs/strings.xml b/FileManager/src/main/res/values-cs/strings.xml similarity index 100% rename from FileManager/res/values-cs/strings.xml rename to FileManager/src/main/res/values-cs/strings.xml diff --git a/FileManager/res/values-da/strings.xml b/FileManager/src/main/res/values-da/strings.xml similarity index 100% rename from FileManager/res/values-da/strings.xml rename to FileManager/src/main/res/values-da/strings.xml diff --git a/FileManager/res/values-de/strings.xml b/FileManager/src/main/res/values-de/strings.xml similarity index 100% rename from FileManager/res/values-de/strings.xml rename to FileManager/src/main/res/values-de/strings.xml diff --git a/FileManager/res/values-el/strings.xml b/FileManager/src/main/res/values-el/strings.xml similarity index 100% rename from FileManager/res/values-el/strings.xml rename to FileManager/src/main/res/values-el/strings.xml diff --git a/FileManager/res/values-en-rGB/strings.xml b/FileManager/src/main/res/values-en-rGB/strings.xml similarity index 100% rename from FileManager/res/values-en-rGB/strings.xml rename to FileManager/src/main/res/values-en-rGB/strings.xml diff --git a/FileManager/res/values-es/strings.xml b/FileManager/src/main/res/values-es/strings.xml similarity index 100% rename from FileManager/res/values-es/strings.xml rename to FileManager/src/main/res/values-es/strings.xml diff --git a/FileManager/res/values-fa/strings.xml b/FileManager/src/main/res/values-fa/strings.xml similarity index 100% rename from FileManager/res/values-fa/strings.xml rename to FileManager/src/main/res/values-fa/strings.xml diff --git a/FileManager/res/values-fi/strings.xml b/FileManager/src/main/res/values-fi/strings.xml similarity index 100% rename from FileManager/res/values-fi/strings.xml rename to FileManager/src/main/res/values-fi/strings.xml diff --git a/FileManager/res/values-fo/strings.xml b/FileManager/src/main/res/values-fo/strings.xml similarity index 100% rename from FileManager/res/values-fo/strings.xml rename to FileManager/src/main/res/values-fo/strings.xml diff --git a/FileManager/res/values-fr/strings.xml b/FileManager/src/main/res/values-fr/strings.xml similarity index 100% rename from FileManager/res/values-fr/strings.xml rename to FileManager/src/main/res/values-fr/strings.xml diff --git a/FileManager/res/values-hi/strings.xml b/FileManager/src/main/res/values-hi/strings.xml similarity index 100% rename from FileManager/res/values-hi/strings.xml rename to FileManager/src/main/res/values-hi/strings.xml diff --git a/FileManager/res/values-hu/strings.xml b/FileManager/src/main/res/values-hu/strings.xml similarity index 100% rename from FileManager/res/values-hu/strings.xml rename to FileManager/src/main/res/values-hu/strings.xml diff --git a/FileManager/res/values-it/strings.xml b/FileManager/src/main/res/values-it/strings.xml similarity index 100% rename from FileManager/res/values-it/strings.xml rename to FileManager/src/main/res/values-it/strings.xml diff --git a/FileManager/res/values-iw/strings.xml b/FileManager/src/main/res/values-iw/strings.xml similarity index 100% rename from FileManager/res/values-iw/strings.xml rename to FileManager/src/main/res/values-iw/strings.xml diff --git a/FileManager/res/values-ja/strings.xml b/FileManager/src/main/res/values-ja/strings.xml similarity index 100% rename from FileManager/res/values-ja/strings.xml rename to FileManager/src/main/res/values-ja/strings.xml diff --git a/FileManager/res/values-ko/strings.xml b/FileManager/src/main/res/values-ko/strings.xml similarity index 100% rename from FileManager/res/values-ko/strings.xml rename to FileManager/src/main/res/values-ko/strings.xml diff --git a/FileManager/res/values-large-land/dimensions.xml b/FileManager/src/main/res/values-large-land/dimensions.xml similarity index 100% rename from FileManager/res/values-large-land/dimensions.xml rename to FileManager/src/main/res/values-large-land/dimensions.xml diff --git a/FileManager/res/values-large/dimensions.xml b/FileManager/src/main/res/values-large/dimensions.xml similarity index 100% rename from FileManager/res/values-large/dimensions.xml rename to FileManager/src/main/res/values-large/dimensions.xml diff --git a/FileManager/res/values-large/list_background_dark.xml b/FileManager/src/main/res/values-large/list_background_dark.xml similarity index 100% rename from FileManager/res/values-large/list_background_dark.xml rename to FileManager/src/main/res/values-large/list_background_dark.xml diff --git a/FileManager/res/values-large/list_background_light.xml b/FileManager/src/main/res/values-large/list_background_light.xml similarity index 100% rename from FileManager/res/values-large/list_background_light.xml rename to FileManager/src/main/res/values-large/list_background_light.xml diff --git a/FileManager/res/values-lo/strings.xml b/FileManager/src/main/res/values-lo/strings.xml similarity index 100% rename from FileManager/res/values-lo/strings.xml rename to FileManager/src/main/res/values-lo/strings.xml diff --git a/FileManager/res/values-lv/strings.xml b/FileManager/src/main/res/values-lv/strings.xml similarity index 100% rename from FileManager/res/values-lv/strings.xml rename to FileManager/src/main/res/values-lv/strings.xml diff --git a/FileManager/res/values-nb/strings.xml b/FileManager/src/main/res/values-nb/strings.xml similarity index 100% rename from FileManager/res/values-nb/strings.xml rename to FileManager/src/main/res/values-nb/strings.xml diff --git a/FileManager/res/values-nl/strings.xml b/FileManager/src/main/res/values-nl/strings.xml similarity index 100% rename from FileManager/res/values-nl/strings.xml rename to FileManager/src/main/res/values-nl/strings.xml diff --git a/FileManager/res/values-oc/strings.xml b/FileManager/src/main/res/values-oc/strings.xml similarity index 100% rename from FileManager/res/values-oc/strings.xml rename to FileManager/src/main/res/values-oc/strings.xml diff --git a/FileManager/res/values-pa/strings.xml b/FileManager/src/main/res/values-pa/strings.xml similarity index 100% rename from FileManager/res/values-pa/strings.xml rename to FileManager/src/main/res/values-pa/strings.xml diff --git a/FileManager/res/values-pl/strings.xml b/FileManager/src/main/res/values-pl/strings.xml similarity index 100% rename from FileManager/res/values-pl/strings.xml rename to FileManager/src/main/res/values-pl/strings.xml diff --git a/FileManager/res/values-pt-rBR/strings.xml b/FileManager/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from FileManager/res/values-pt-rBR/strings.xml rename to FileManager/src/main/res/values-pt-rBR/strings.xml diff --git a/FileManager/res/values-pt/strings.xml b/FileManager/src/main/res/values-pt/strings.xml similarity index 100% rename from FileManager/res/values-pt/strings.xml rename to FileManager/src/main/res/values-pt/strings.xml diff --git a/FileManager/res/values-ro/strings.xml b/FileManager/src/main/res/values-ro/strings.xml similarity index 100% rename from FileManager/res/values-ro/strings.xml rename to FileManager/src/main/res/values-ro/strings.xml diff --git a/FileManager/res/values-ru/strings.xml b/FileManager/src/main/res/values-ru/strings.xml similarity index 100% rename from FileManager/res/values-ru/strings.xml rename to FileManager/src/main/res/values-ru/strings.xml diff --git a/FileManager/res/values-sc/strings.xml b/FileManager/src/main/res/values-sc/strings.xml similarity index 100% rename from FileManager/res/values-sc/strings.xml rename to FileManager/src/main/res/values-sc/strings.xml diff --git a/FileManager/res/values-sd/strings.xml b/FileManager/src/main/res/values-sd/strings.xml similarity index 100% rename from FileManager/res/values-sd/strings.xml rename to FileManager/src/main/res/values-sd/strings.xml diff --git a/FileManager/res/values-sk/strings.xml b/FileManager/src/main/res/values-sk/strings.xml similarity index 100% rename from FileManager/res/values-sk/strings.xml rename to FileManager/src/main/res/values-sk/strings.xml diff --git a/FileManager/res/values-sl/strings.xml b/FileManager/src/main/res/values-sl/strings.xml similarity index 100% rename from FileManager/res/values-sl/strings.xml rename to FileManager/src/main/res/values-sl/strings.xml diff --git a/FileManager/res/values-sv/strings.xml b/FileManager/src/main/res/values-sv/strings.xml similarity index 100% rename from FileManager/res/values-sv/strings.xml rename to FileManager/src/main/res/values-sv/strings.xml diff --git a/FileManager/res/values-sw600dp-land/dimensions.xml b/FileManager/src/main/res/values-sw600dp-land/dimensions.xml similarity index 100% rename from FileManager/res/values-sw600dp-land/dimensions.xml rename to FileManager/src/main/res/values-sw600dp-land/dimensions.xml diff --git a/FileManager/res/values-sw600dp/dimensions.xml b/FileManager/src/main/res/values-sw600dp/dimensions.xml similarity index 100% rename from FileManager/res/values-sw600dp/dimensions.xml rename to FileManager/src/main/res/values-sw600dp/dimensions.xml diff --git a/FileManager/res/values-sw600dp/list_background_dark.xml b/FileManager/src/main/res/values-sw600dp/list_background_dark.xml similarity index 100% rename from FileManager/res/values-sw600dp/list_background_dark.xml rename to FileManager/src/main/res/values-sw600dp/list_background_dark.xml diff --git a/FileManager/res/values-sw600dp/list_background_light.xml b/FileManager/src/main/res/values-sw600dp/list_background_light.xml similarity index 100% rename from FileManager/res/values-sw600dp/list_background_light.xml rename to FileManager/src/main/res/values-sw600dp/list_background_light.xml diff --git a/FileManager/res/values-sw720dp/dimensions.xml b/FileManager/src/main/res/values-sw720dp/dimensions.xml similarity index 100% rename from FileManager/res/values-sw720dp/dimensions.xml rename to FileManager/src/main/res/values-sw720dp/dimensions.xml diff --git a/FileManager/res/values-tl/strings.xml b/FileManager/src/main/res/values-tl/strings.xml similarity index 100% rename from FileManager/res/values-tl/strings.xml rename to FileManager/src/main/res/values-tl/strings.xml diff --git a/FileManager/res/values-tr/strings.xml b/FileManager/src/main/res/values-tr/strings.xml similarity index 100% rename from FileManager/res/values-tr/strings.xml rename to FileManager/src/main/res/values-tr/strings.xml diff --git a/FileManager/res/values-ug/strings.xml b/FileManager/src/main/res/values-ug/strings.xml similarity index 100% rename from FileManager/res/values-ug/strings.xml rename to FileManager/src/main/res/values-ug/strings.xml diff --git a/FileManager/res/values-uk/strings.xml b/FileManager/src/main/res/values-uk/strings.xml similarity index 100% rename from FileManager/res/values-uk/strings.xml rename to FileManager/src/main/res/values-uk/strings.xml diff --git a/FileManager/res/values-v11/styles.xml b/FileManager/src/main/res/values-v11/styles.xml similarity index 100% rename from FileManager/res/values-v11/styles.xml rename to FileManager/src/main/res/values-v11/styles.xml diff --git a/FileManager/res/values-v11/themes.xml b/FileManager/src/main/res/values-v11/themes.xml similarity index 100% rename from FileManager/res/values-v11/themes.xml rename to FileManager/src/main/res/values-v11/themes.xml diff --git a/FileManager/res/values-v14/themes.xml b/FileManager/src/main/res/values-v14/themes.xml similarity index 100% rename from FileManager/res/values-v14/themes.xml rename to FileManager/src/main/res/values-v14/themes.xml diff --git a/FileManager/res/values-xlarge/dimensions.xml b/FileManager/src/main/res/values-xlarge/dimensions.xml similarity index 100% rename from FileManager/res/values-xlarge/dimensions.xml rename to FileManager/src/main/res/values-xlarge/dimensions.xml diff --git a/FileManager/res/values-zh-rCN/strings.xml b/FileManager/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from FileManager/res/values-zh-rCN/strings.xml rename to FileManager/src/main/res/values-zh-rCN/strings.xml diff --git a/FileManager/res/values-zh-rTW/strings.xml b/FileManager/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from FileManager/res/values-zh-rTW/strings.xml rename to FileManager/src/main/res/values-zh-rTW/strings.xml diff --git a/FileManager/res/values/arrays.xml b/FileManager/src/main/res/values/arrays.xml similarity index 100% rename from FileManager/res/values/arrays.xml rename to FileManager/src/main/res/values/arrays.xml diff --git a/FileManager/res/values/attrs.xml b/FileManager/src/main/res/values/attrs.xml similarity index 100% rename from FileManager/res/values/attrs.xml rename to FileManager/src/main/res/values/attrs.xml diff --git a/FileManager/res/values/colors.xml b/FileManager/src/main/res/values/colors.xml similarity index 100% rename from FileManager/res/values/colors.xml rename to FileManager/src/main/res/values/colors.xml diff --git a/FileManager/res/values/dimensions.xml b/FileManager/src/main/res/values/dimensions.xml similarity index 100% rename from FileManager/res/values/dimensions.xml rename to FileManager/src/main/res/values/dimensions.xml diff --git a/FileManager/res/values/donottranslate.xml b/FileManager/src/main/res/values/donottranslate.xml similarity index 100% rename from FileManager/res/values/donottranslate.xml rename to FileManager/src/main/res/values/donottranslate.xml diff --git a/FileManager/res/values/ids.xml b/FileManager/src/main/res/values/ids.xml similarity index 100% rename from FileManager/res/values/ids.xml rename to FileManager/src/main/res/values/ids.xml diff --git a/FileManager/res/values/list_background_dark.xml b/FileManager/src/main/res/values/list_background_dark.xml similarity index 100% rename from FileManager/res/values/list_background_dark.xml rename to FileManager/src/main/res/values/list_background_dark.xml diff --git a/FileManager/res/values/list_background_light.xml b/FileManager/src/main/res/values/list_background_light.xml similarity index 100% rename from FileManager/res/values/list_background_light.xml rename to FileManager/src/main/res/values/list_background_light.xml diff --git a/FileManager/res/values/strings.xml b/FileManager/src/main/res/values/strings.xml similarity index 100% rename from FileManager/res/values/strings.xml rename to FileManager/src/main/res/values/strings.xml diff --git a/FileManager/res/values/styles.xml b/FileManager/src/main/res/values/styles.xml similarity index 100% rename from FileManager/res/values/styles.xml rename to FileManager/src/main/res/values/styles.xml diff --git a/FileManager/res/values/themes.xml b/FileManager/src/main/res/values/themes.xml similarity index 100% rename from FileManager/res/values/themes.xml rename to FileManager/src/main/res/values/themes.xml diff --git a/FileManager/res/xml/about.xml b/FileManager/src/main/res/xml/about.xml similarity index 100% rename from FileManager/res/xml/about.xml rename to FileManager/src/main/res/xml/about.xml diff --git a/FileManager/res/xml/mimetypes.xml b/FileManager/src/main/res/xml/mimetypes.xml similarity index 100% rename from FileManager/res/xml/mimetypes.xml rename to FileManager/src/main/res/xml/mimetypes.xml diff --git a/FileManager/res/xml/preferences.xml b/FileManager/src/main/res/xml/preferences.xml similarity index 100% rename from FileManager/res/xml/preferences.xml rename to FileManager/src/main/res/xml/preferences.xml diff --git a/FileManager/res/xml/searchable.xml b/FileManager/src/main/res/xml/searchable.xml similarity index 100% rename from FileManager/res/xml/searchable.xml rename to FileManager/src/main/res/xml/searchable.xml diff --git a/FileManager/src/org/openintents/filemanager/FileManagerApplication.java b/FileManager/src/org/openintents/filemanager/FileManagerApplication.java deleted file mode 100644 index b21fd4c6..00000000 --- a/FileManager/src/org/openintents/filemanager/FileManagerApplication.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.openintents.filemanager; - -import android.app.Application; - -import org.openintents.filemanager.util.CopyHelper; -import org.openintents.filemanager.util.MimeTypes; - -public class FileManagerApplication extends Application { - private CopyHelper mCopyHelper; - - @Override - public void onCreate() { - super.onCreate(); - - mCopyHelper = new CopyHelper(this); - MimeTypes.initInstance(this); - } - - public CopyHelper getCopyHelper() { - return mCopyHelper; - } -} \ No newline at end of file diff --git a/FileManager/src/play/AndroidManifest.xml b/FileManager/src/play/AndroidManifest.xml new file mode 100644 index 00000000..6f1a8409 --- /dev/null +++ b/FileManager/src/play/AndroidManifest.xml @@ -0,0 +1,10 @@ + + + + + + + \ No newline at end of file diff --git a/FileManagerDemo/build.gradle b/FileManagerDemo/build.gradle index 0fea8026..179d23fc 100644 --- a/FileManagerDemo/build.gradle +++ b/FileManagerDemo/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.application' dependencies { - implementation 'com.github.openintents:distribution:1.1.3' + implementation 'com.github.openintents:distribution:3.0.2' } android { @@ -14,6 +14,7 @@ android { versionName version_name minSdkVersion min_sdk_version targetSdkVersion target_sdk_version + setProperty("archivesBaseName", "$applicationId-$versionName") testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -49,16 +50,6 @@ android { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - - applicationVariants.all { variant -> - variant.outputs.each { output -> - def outputFile = output.outputFile - if (outputFile != null && outputFile.name.endsWith('.apk')) { - def fileName = outputFile.name.replace('.apk', "-${versionName}.apk") - output.outputFileName = new File(output.outputFile.parent, fileName).getName() - } - } - } } } diff --git a/build.gradle b/build.gradle index c3b76518..fcf5f648 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.version_code = 43 - ext.version_name = '2.2.6' + ext.version_code = 44 + ext.version_name = '2.2.7' ext.compile_sdk_version = 28 ext.target_sdk_version = 28 ext.min_sdk_version = 14 @@ -12,10 +12,14 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.3.1' + classpath 'com.android.tools.build:gradle:3.5.2' } } +plugins { + id "com.github.spotbugs" version "2.0.1" +} + allprojects { repositories { google() @@ -25,10 +29,7 @@ allprojects { } } - apply plugin: 'findbugs' - findbugs { - ignoreFailures = true - } + apply plugin: "com.github.spotbugs" apply plugin: 'pmd' pmd { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 13372aef..13536770 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0ba46975..ce4077ff 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Feb 13 09:23:13 CET 2019 +#Mon Nov 18 09:06:15 CET 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.0-all.zip diff --git a/gradlew b/gradlew index 9d82f789..cccdd3d5 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# 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\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,26 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# 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\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -85,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -150,11 +154,19 @@ if $cygwin ; then 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=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 8a0b282a..e95643d6 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,90 +1,84 @@ -@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 +@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 + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@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 Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_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=%* + +: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