From: Jorge Antonio Diaz-Benito Soriano Date: Tue, 25 Nov 2014 19:46:44 +0000 (+0100) Subject: Restore .gitignore and SETUP.md, remove files that were added X-Git-Tag: oc-android-1.7.0_signed~94^2~1 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/69013b0e8dc177d8c83e4a7c1cd72f85b30345a4?ds=inline Restore .gitignore and SETUP.md, remove files that were added --- diff --git a/.gitignore b/.gitignore index e13e5a5e..8346dbfc 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,7 @@ # generated files bin/ build/ +*.iml gen/ target/ @@ -31,15 +32,11 @@ oc_framework/proguard-project.txt oc_framework-test-project/proguard-project.txt tests/proguard-project.txt -# IntelliJ and Gradle specific entries +# Android Studio and Gradle specific entries .gradle -.idea/workspace.xml -.idea/tasks.xml -.idea/libraries/*.xml -dataSources.ids -datasources.xml -gradle.xml +.idea +*.iml build # Actionbarsherlock is now ignored since scripts takes care of init the sub-modules. -actionbarsherlock +actionbarsherlock \ No newline at end of file diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index 1fd74d19..00000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -android \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 217af471..00000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf33..00000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index e206d70d..00000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index b153e48a..00000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 92fbe54f..00000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b8..00000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 275077f8..00000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/SETUP.md b/SETUP.md index cfbd2418..a9e2a93b 100644 --- a/SETUP.md +++ b/SETUP.md @@ -86,8 +86,9 @@ NOTE: Even though API level is set to 19, APK also runs on older devices because * Complete the setup of project properties running: - Windows: "setup_env.bat gradle" - Mac OS/Linux: "./setup_env.sh gradle" -* Select 'Open Project...'. The file chooser will show an Android face as the folder icon. Select - it to open the project. +* The first time you want to open the project in Android Studio, select 'Import Project...' and choose the file "android/settings.gradle". + Android Studio will then create the '.iml' files it needs. If you ever close the project but the files are still there, you just select + 'Open Project...'. The file chooser will show an Android face as the folder icon, which you can select to reopen the project. * To build the project, follow the guidelines shown on [4. Building with Gradle][2]. ### 7. Create pull request: diff --git a/android.iml b/android.iml deleted file mode 100644 index 4d0d9af2..00000000 --- a/android.iml +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -