diff options
| -rw-r--r-- | vdrmanager/.idea/misc.xml | 2 | ||||
| -rw-r--r-- | vdrmanager/.idea/workspace.xml | 1143 | ||||
| -rw-r--r-- | vdrmanager/app/app-release.apk | bin | 2262540 -> 2260172 bytes | |||
| -rw-r--r-- | vdrmanager/app/app.iml | 27 | ||||
| -rw-r--r-- | vdrmanager/app/build.gradle | 15 | ||||
| -rw-r--r-- | vdrmanager/app/src/main/AndroidManifest.xml | 4 | ||||
| -rw-r--r-- | vdrmanager/build.gradle | 2 | ||||
| -rw-r--r-- | vdrmanager/build/intermediates/dex-cache/cache.xml | 56 |
8 files changed, 640 insertions, 609 deletions
diff --git a/vdrmanager/.idea/misc.xml b/vdrmanager/.idea/misc.xml index fbb6828..5d19981 100644 --- a/vdrmanager/.idea/misc.xml +++ b/vdrmanager/.idea/misc.xml @@ -37,7 +37,7 @@ <ConfirmationsSetting value="0" id="Add" /> <ConfirmationsSetting value="0" id="Remove" /> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK"> <output url="file://$PROJECT_DIR$/build/classes" /> </component> <component name="ProjectType"> diff --git a/vdrmanager/.idea/workspace.xml b/vdrmanager/.idea/workspace.xml index acd1313..2f49bda 100644 --- a/vdrmanager/.idea/workspace.xml +++ b/vdrmanager/.idea/workspace.xml @@ -33,14 +33,11 @@ <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/svdrp4j_1_1_0_SNAPSHOT.xml" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app-release.apk" afterPath="$PROJECT_DIR$/app/app-release.apk" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build.gradle" afterPath="$PROJECT_DIR$/build.gradle" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" afterPath="$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-de/strings.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-it/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-it/strings.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values-uk/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-uk/strings.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="vdrmanager.iws" /> @@ -69,47 +66,61 @@ </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="EpgDetailsActivity.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java"> + <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.09186603"> + <caret line="3" column="30" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="30" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="no_translate.xml" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/no_translate.xml"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="209" column="0" selection-start-line="209" selection-start-column="0" selection-end-line="209" selection-end-column="0" /> - <folding> - <element signature="docComment;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="e#2743#2767#0" expanded="false" /> - <element signature="class#Wrapper#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="method#Wrapper#0;class#Wrapper#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="method#getApp#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="e#19958#20015#0" expanded="false" /> - <element signature="e#22148#22176#0" expanded="false" /> - <element signature="method#toggleTimer#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="class#22410:23751" expanded="false" /> - <element signature="method#finished#0;class#22410:23751" expanded="false" /> - <element signature="e#23826#23833#0" expanded="true" /> - <element signature="method#onCreateOptionsMenu#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="e#24292#24339#0" expanded="false" /> - <element signature="method#onOptionsItemSelected#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="method#deleteTimer#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="class#25679:26116" expanded="false" /> - <element signature="method#finished#0;class#25679:26116" expanded="false" /> - <element signature="method#onActivityResult#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="e#26323#26364#0" expanded="false" /> - <element signature="e#26573#26585#0" expanded="false" /> - <element signature="method#onBackPressed#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="method#onPageScrollStateChanged#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="method#onPageScrolled#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="method#onPageSelected#0;class#EpgDetailsActivity#0" expanded="false" /> - <element signature="e#27528#27566#0" expanded="false" /> - </folding> + <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" /> + <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> + <file leaf-file-name="SvdrpClient.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="386" column="0" selection-start-line="386" selection-start-column="0" selection-end-line="386" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="Vdr.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/data/Vdr.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="VdrSharedPreferences.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/data/VdrSharedPreferences.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.16511868"> - <caret line="10" column="75" selection-start-line="10" selection-start-column="54" selection-end-line="10" selection-end-column="75" /> + <state vertical-scroll-proportion="0.0"> + <caret line="6" column="55" selection-start-line="6" selection-start-column="55" selection-end-line="6" selection-end-column="55" /> <folding /> </state> </provider> @@ -119,7 +130,37 @@ <entry file="file://$PROJECT_DIR$/app/build.gradle"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" /> + <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="LintOptions.groovy" pinned="false" current-in-tab="false"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/LintOptions.groovy"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-8.588235"> + <caret line="166" column="9" selection-start-line="166" selection-start-column="9" selection-end-line="166" selection-end-column="9" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="ProductFlavor.groovy" pinned="false" current-in-tab="false"> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/ProductFlavor.groovy"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-39.52941"> + <caret line="109" column="16" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="gradle-wrapper.properties" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <folding /> </state> </provider> @@ -236,12 +277,10 @@ <option name="name" value="assembleDebug" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Assembles the android (on device) tests for the Debug build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="assembleDebugAndroidTest" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Assembles the unit tests for the Debug build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="assembleDebugUnitTest" /> </ExternalTaskPojo> @@ -251,7 +290,6 @@ <option name="name" value="assembleRelease" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Assembles the unit tests for the Release build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="assembleReleaseUnitTest" /> </ExternalTaskPojo> @@ -298,7 +336,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="compileDebugAndroidTestJava" /> + <option name="name" value="compileDebugAndroidTestJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> @@ -314,7 +352,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="compileDebugJava" /> + <option name="name" value="compileDebugJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> @@ -330,7 +368,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="compileDebugUnitTestJava" /> + <option name="name" value="compileDebugUnitTestJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> @@ -346,7 +384,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="compileReleaseJava" /> + <option name="name" value="compileReleaseJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> @@ -362,7 +400,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="compileReleaseUnitTestJava" /> + <option name="name" value="compileReleaseUnitTestJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> @@ -374,14 +412,14 @@ <option name="name" value="connectedAndroidTest" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Installs and runs the tests for Debug build on connected devices." /> + <option name="description" value="Runs all device checks on currently connected devices." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="connectedAndroidTestDebug" /> + <option name="name" value="connectedCheck" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Runs all device checks on currently connected devices." /> + <option name="description" value="Installs and runs the tests for debug on connected devices." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="connectedCheck" /> + <option name="name" value="connectedDebugAndroidTest" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="description" value="Installs and runs instrumentation tests using all Device Providers." /> @@ -395,18 +433,6 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="dexDebug" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="dexDebugAndroidTest" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="dexRelease" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="generateDebugAndroidTestAssets" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -504,6 +530,10 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="mergeDebugAndroidTestJniLibFolders" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="mergeDebugAndroidTestResources" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -512,6 +542,10 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="mergeDebugJniLibFolders" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="mergeDebugResources" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -520,6 +554,10 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="mergeReleaseJniLibFolders" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="mergeReleaseResources" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -545,14 +583,6 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="preCompileDebugUnitTestJava" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="preCompileReleaseUnitTestJava" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="preDebugAndroidTestBuild" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -565,18 +595,6 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="preDexDebug" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="preDexDebugAndroidTest" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="preDexRelease" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="preReleaseBuild" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -584,24 +602,24 @@ <option name="name" value="preReleaseUnitTestBuild" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:animated-vector-drawable:24.0.0-alpha1" /> + <option name="description" value="Prepare com.android.support:animated-vector-drawable:23.2.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2400Alpha1Library" /> + <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2320Library" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:appcompat-v7:24.0.0-alpha1" /> + <option name="description" value="Prepare com.android.support:appcompat-v7:23.2.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="prepareComAndroidSupportAppcompatV72400Alpha1Library" /> + <option name="name" value="prepareComAndroidSupportAppcompatV72320Library" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:support-v4:24.0.0-alpha1" /> + <option name="description" value="Prepare com.android.support:support-v4:23.2.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="prepareComAndroidSupportSupportV42400Alpha1Library" /> + <option name="name" value="prepareComAndroidSupportSupportV42320Library" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:support-vector-drawable:24.0.0-alpha1" /> + <option name="description" value="Prepare com.android.support:support-vector-drawable:23.2.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2400Alpha1Library" /> + <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2320Library" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> @@ -673,6 +691,11 @@ <option name="name" value="signingReport" /> </ExternalTaskPojo> <ExternalTaskPojo> + <option name="description" value="Prints out all the source sets defined in this project." /> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="sourceSets" /> + </ExternalTaskPojo> + <ExternalTaskPojo> <option name="description" value="Run unit tests for all variants." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> <option name="name" value="test" /> @@ -680,12 +703,56 @@ <ExternalTaskPojo> <option name="description" value="Run unit tests for the debug build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="testDebug" /> + <option name="name" value="testDebugUnitTest" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="description" value="Run unit tests for the release build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="testRelease" /> + <option name="name" value="testReleaseUnitTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformClassesWithDexForDebug" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformClassesWithDexForDebugAndroidTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformClassesWithDexForRelease" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformNative_libsWithMergeJniLibsForDebug" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformNative_libsWithMergeJniLibsForDebugAndroidTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformNative_libsWithMergeJniLibsForRelease" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformResourcesWithMergeJavaResForDebug" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformResourcesWithMergeJavaResForDebugUnitTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformResourcesWithMergeJavaResForRelease" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> + <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="description" value="Uninstall all applications." /> @@ -742,12 +809,10 @@ <option name="name" value="assembleDebug" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Assembles the android (on device) tests for the Debug build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="assembleDebugAndroidTest" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Assembles the unit tests for the Debug build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="assembleDebugUnitTest" /> </ExternalTaskPojo> @@ -757,7 +822,6 @@ <option name="name" value="assembleRelease" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Assembles the unit tests for the Release build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="assembleReleaseUnitTest" /> </ExternalTaskPojo> @@ -804,7 +868,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="compileDebugAndroidTestJava" /> + <option name="name" value="compileDebugAndroidTestJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> @@ -820,7 +884,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="compileDebugJava" /> + <option name="name" value="compileDebugJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> @@ -836,7 +900,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="compileDebugUnitTestJava" /> + <option name="name" value="compileDebugUnitTestJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> @@ -852,7 +916,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="compileReleaseJava" /> + <option name="name" value="compileReleaseJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> @@ -868,7 +932,7 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="compileReleaseUnitTestJava" /> + <option name="name" value="compileReleaseUnitTestJavaWithJavac" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> @@ -885,14 +949,14 @@ <option name="name" value="connectedAndroidTest" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Installs and runs the tests for Debug build on connected devices." /> + <option name="description" value="Runs all device checks on currently connected devices." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="connectedAndroidTestDebug" /> + <option name="name" value="connectedCheck" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Runs all device checks on currently connected devices." /> + <option name="description" value="Installs and runs the tests for debug on connected devices." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="connectedCheck" /> + <option name="name" value="connectedDebugAndroidTest" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="description" value="Displays all dependencies declared in project ':app'." /> @@ -916,18 +980,6 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="dexDebug" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="dexDebugAndroidTest" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="dexRelease" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="generateDebugAndroidTestAssets" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -1030,6 +1082,10 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="mergeDebugAndroidTestJniLibFolders" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="mergeDebugAndroidTestResources" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -1038,6 +1094,10 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="mergeDebugJniLibFolders" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="mergeDebugResources" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -1046,6 +1106,10 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="mergeReleaseJniLibFolders" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="mergeReleaseResources" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -1076,14 +1140,6 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="preCompileDebugUnitTestJava" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="preCompileReleaseUnitTestJava" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="preDebugAndroidTestBuild" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -1096,18 +1152,6 @@ </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="preDexDebug" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="preDexDebugAndroidTest" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="preDexRelease" /> - </ExternalTaskPojo> - <ExternalTaskPojo> - <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="preReleaseBuild" /> </ExternalTaskPojo> <ExternalTaskPojo> @@ -1115,24 +1159,24 @@ <option name="name" value="preReleaseUnitTestBuild" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:animated-vector-drawable:24.0.0-alpha1" /> + <option name="description" value="Prepare com.android.support:animated-vector-drawable:23.2.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2400Alpha1Library" /> + <option name="name" value="prepareComAndroidSupportAnimatedVectorDrawable2320Library" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:appcompat-v7:24.0.0-alpha1" /> + <option name="description" value="Prepare com.android.support:appcompat-v7:23.2.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="prepareComAndroidSupportAppcompatV72400Alpha1Library" /> + <option name="name" value="prepareComAndroidSupportAppcompatV72320Library" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:support-v4:24.0.0-alpha1" /> + <option name="description" value="Prepare com.android.support:support-v4:23.2.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="prepareComAndroidSupportSupportV42400Alpha1Library" /> + <option name="name" value="prepareComAndroidSupportSupportV42320Library" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:support-vector-drawable:24.0.0-alpha1" /> + <option name="description" value="Prepare com.android.support:support-vector-drawable:23.2.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2400Alpha1Library" /> + <option name="name" value="prepareComAndroidSupportSupportVectorDrawable2320Library" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> @@ -1214,6 +1258,11 @@ <option name="name" value="signingReport" /> </ExternalTaskPojo> <ExternalTaskPojo> + <option name="description" value="Prints out all the source sets defined in this project." /> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="sourceSets" /> + </ExternalTaskPojo> + <ExternalTaskPojo> <option name="description" value="Displays the tasks runnable from project ':app'." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> <option name="name" value="tasks" /> @@ -1226,12 +1275,56 @@ <ExternalTaskPojo> <option name="description" value="Run unit tests for the debug build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="testDebug" /> + <option name="name" value="testDebugUnitTest" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="description" value="Run unit tests for the release build." /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="testRelease" /> + <option name="name" value="testReleaseUnitTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformClassesWithDexForDebug" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformClassesWithDexForDebugAndroidTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformClassesWithDexForRelease" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformNative_libsWithMergeJniLibsForDebug" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformNative_libsWithMergeJniLibsForDebugAndroidTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformNative_libsWithMergeJniLibsForRelease" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformResourcesWithMergeJavaResForDebug" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformResourcesWithMergeJavaResForDebugAndroidTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformResourcesWithMergeJavaResForDebugUnitTest" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformResourcesWithMergeJavaResForRelease" /> + </ExternalTaskPojo> + <ExternalTaskPojo> + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> + <option name="name" value="transformResourcesWithMergeJavaResForReleaseUnitTest" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="description" value="Uninstall all applications." /> @@ -1268,7 +1361,7 @@ </option> <option name="modificationStamps"> <map> - <entry key="$PROJECT_DIR$" value="4372316221223" /> + <entry key="$PROJECT_DIR$" value="4373321974609" /> </map> </option> <option name="projectBuildClasspath"> @@ -1283,76 +1376,101 @@ <ExternalModuleBuildClasspathPojo> <option name="entries"> <list> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.2.3/72de4290adf91c42923ec097b2d580d6f2776ae6/gradle-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.2.3/2fc5a2f1ac2e86c5c4bb57241330198b2355e621/gradle-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/4a448f6ea508a2b547a3fea4033d2b68d287a188/gradle-core-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.2.3/c7daa52c2650a22e9ea12b1ab6ffa3699e9b3c6a/builder-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.2.3/4530e2d560877a7a514b63500e7263c973ee2413/builder-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.2.3/e8f28819a8259efda8008f89777a05266f2779cf/lint-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.2.3/3b2976b2b1b2e8cb13cb2224da81f624081db38a/lint-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.2.3/d5015d2f4ecb7c4293dfe4ead5e7c9317fbe1dbe/builder-model-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.2.3/31a6a8af1d5a4f528a5d0fa567fcd8234d100bd1/builder-model-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.2.3/9bc30dbee1080d4b3a7f7f38aa28043a4a97f576/builder-test-api-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.2.3/821301502b154d3a66d93b72bcb9ffeba4487acd/builder-test-api-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.2.3/3dce25c056234d30ed0f9b6d38e0735b519ba037/sdklib-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.2.3/2e1b33d6544db11d30fa0037ee6751675ae42329/sdklib-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.2.3/2cea5d1b216eac954bf932560f981b9b20856a54/sdk-common-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.2.3/c59b15bdc3aaf46b13491827d8a6abaa6d5213b3/sdk-common-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.2.3/4107b050242d2abe5d38014aee85cd3a402cdf19/common-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.2.3/1bcbdeecd08852eba2954b8376ef8cbf7704b39b/common-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.2.3/38364a08654d270c8494ba18c3f762b43288afc1/manifest-merger-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.2.3/ac192088836974da767392eadc3beb16d37b65b3/manifest-merger-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.2.3/6cf6c44757c9fcbda849d9ce7ff5a41ac45df976/ddmlib-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.2.3/72e612ad93e7b12d8f71c584f1f65a81e864e4de/ddmlib-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.5.0/gradle-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.5.0/gradle-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.5.0/gradle-core-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.5.0/gradle-core-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/1.5.0/transform-api-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/1.5.0/transform-api-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/1.0-rc5/compilerCommon-1.0-rc5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.5.0/lint-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.5.0/lint-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.5.0/builder-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.5.0/builder-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.5.0/annotations-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.5.0/annotations-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/tunnelvisionlabs/antlr4/4.5/antlr4-4.5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/1.0-rc5/baseLibrary-1.0-rc5-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/1.0-rc5/baseLibrary-1.0-rc5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.5.0/lint-checks-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.5.0/lint-checks-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.5.0/sdk-common-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.5.0/sdk-common-24.5.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.5.0/builder-model-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.5.0/builder-model-1.5.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.2.3/8a04a85545f1789baff3596f4ce57749257318c1/lint-checks-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.2.3/59fb927f5817e16796297140add6c879ee752f37/lint-checks-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/24.2.3/9b771c8191674d8d1f5376b1c6686327b6f9f921/annotations-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/24.2.3/5cfce42220293835e7988ceefd9b0f4e9f284791/annotations-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.2.3/c67f3e36d8b327acc8c8e56271381c9563807a19/layoutlib-api-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.2.3/267861b0cc93c5c9cf85d901e9e1e975ae109fd/layoutlib-api-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.2.3/6bfd41674c76ce440f3ec1517edb01857f48e78d/dvlib-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.2.3/14e95bd58c53762138210f48eeb5d670e11ccdba/dvlib-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.5.0/common-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.5.0/common-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.5.0/sdklib-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.5.0/sdklib-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.5.0/builder-test-api-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.5.0/builder-test-api-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.5.0/ddmlib-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.5.0/ddmlib-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.5.0/manifest-merger-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.5.0/manifest-merger-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/tunnelvisionlabs/antlr4-runtime/4.5/antlr4-runtime-4.5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/tunnelvisionlabs/antlr4-annotations/4.5/antlr4-annotations-4.5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/ST4/4.0.8/ST4-4.0.8.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.5.0/lint-api-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.5.0/lint-api-24.5.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.5.0/layoutlib-api-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.5.0/layoutlib-api-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.5.0/dvlib-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.5.0/dvlib-24.5.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.2.3/7bc81618d320f3921edb9eb25d04c453c218af67/lint-api-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.2.3/c3648cf4ae2ff004360e31ed177271d88ecd093a/lint-api-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/abego/treelayout/org.abego.treelayout.core/1.0.1/org.abego.treelayout.core-1.0.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" /> </list> </option> <option name="path" value="$PROJECT_DIR$" /> @@ -1364,81 +1482,106 @@ <ExternalModuleBuildClasspathPojo> <option name="entries"> <list> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.2.3/72de4290adf91c42923ec097b2d580d6f2776ae6/gradle-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle/1.2.3/2fc5a2f1ac2e86c5c4bb57241330198b2355e621/gradle-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/4a448f6ea508a2b547a3fea4033d2b68d287a188/gradle-core-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.2.3/c7daa52c2650a22e9ea12b1ab6ffa3699e9b3c6a/builder-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder/1.2.3/4530e2d560877a7a514b63500e7263c973ee2413/builder-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.2.3/e8f28819a8259efda8008f89777a05266f2779cf/lint-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint/24.2.3/3b2976b2b1b2e8cb13cb2224da81f624081db38a/lint-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.2.3/d5015d2f4ecb7c4293dfe4ead5e7c9317fbe1dbe/builder-model-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-model/1.2.3/31a6a8af1d5a4f528a5d0fa567fcd8234d100bd1/builder-model-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.2.3/9bc30dbee1080d4b3a7f7f38aa28043a4a97f576/builder-test-api-1.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/builder-test-api/1.2.3/821301502b154d3a66d93b72bcb9ffeba4487acd/builder-test-api-1.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.2.3/3dce25c056234d30ed0f9b6d38e0735b519ba037/sdklib-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdklib/24.2.3/2e1b33d6544db11d30fa0037ee6751675ae42329/sdklib-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.2.3/2cea5d1b216eac954bf932560f981b9b20856a54/sdk-common-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/sdk-common/24.2.3/c59b15bdc3aaf46b13491827d8a6abaa6d5213b3/sdk-common-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.2.3/4107b050242d2abe5d38014aee85cd3a402cdf19/common-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/common/24.2.3/1bcbdeecd08852eba2954b8376ef8cbf7704b39b/common-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.2.3/38364a08654d270c8494ba18c3f762b43288afc1/manifest-merger-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/manifest-merger/24.2.3/ac192088836974da767392eadc3beb16d37b65b3/manifest-merger-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.2.3/6cf6c44757c9fcbda849d9ce7ff5a41ac45df976/ddmlib-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.ddms/ddmlib/24.2.3/72e612ad93e7b12d8f71c584f1f65a81e864e4de/ddmlib-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.5.0/gradle-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.5.0/gradle-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.5.0/gradle-core-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.5.0/gradle-core-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/jacoco/org.jacoco.core/0.7.4.201502262128/org.jacoco.core-0.7.4.201502262128.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/1.5.0/transform-api-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/transform-api/1.5.0/transform-api-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/compilerCommon/1.0-rc5/compilerCommon-1.0-rc5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-gradle/5.2.1/proguard-gradle-5.2.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.5.0/lint-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.5.0/lint-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.5.0/builder-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.5.0/builder-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-debug-all/5.0.1/asm-debug-all-5.0.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.5.0/annotations-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.5.0/annotations-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/googlecode/juniversalchardet/juniversalchardet/1.0.3/juniversalchardet-1.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-lang3/3.3.2/commons-lang3-3.3.2.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/tunnelvisionlabs/antlr4/4.5/antlr4-4.5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-io/commons-io/2.4/commons-io-2.4.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/1.0-rc5/baseLibrary-1.0-rc5-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/databinding/baseLibrary/1.0-rc5/baseLibrary-1.0-rc5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.2.1/proguard-base-5.2.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.5.0/lint-checks-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.5.0/lint-checks-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4.2/ecj-4.4.2.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.5.0/sdk-common-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.5.0/sdk-common-24.5.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.5.0/builder-model-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.5.0/builder-model-1.5.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.2.3/8a04a85545f1789baff3596f4ce57749257318c1/lint-checks-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-checks/24.2.3/59fb927f5817e16796297140add6c879ee752f37/lint-checks-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/24.2.3/9b771c8191674d8d1f5376b1c6686327b6f9f921/annotations-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/annotations/24.2.3/5cfce42220293835e7988ceefd9b0f4e9f284791/annotations-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.2.3/c67f3e36d8b327acc8c8e56271381c9563807a19/layoutlib-api-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.layoutlib/layoutlib-api/24.2.3/267861b0cc93c5c9cf85d901e9e1e975ae109fd/layoutlib-api-24.2.3.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.2.3/6bfd41674c76ce440f3ec1517edb01857f48e78d/dvlib-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools/dvlib/24.2.3/14e95bd58c53762138210f48eeb5d670e11ccdba/dvlib-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.5.0/common-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.5.0/common-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.5.0/sdklib-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.5.0/sdklib-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.5.0/builder-test-api-1.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.5.0/builder-test-api-1.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jack/jack-api/0.9.0/jack-api-0.9.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.5.0/ddmlib-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.5.0/ddmlib-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.5.0/manifest-merger-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.5.0/manifest-merger-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/jill/jill-api/0.9.0/jill-api-0.9.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/tunnelvisionlabs/antlr4-runtime/4.5/antlr4-runtime-4.5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/tunnelvisionlabs/antlr4-annotations/4.5/antlr4-annotations-4.5.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/antlr/ST4/4.0.8/ST4-4.0.8.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.5.0/lint-api-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.5.0/lint-api-24.5.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.5.0/layoutlib-api-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.5.0/layoutlib-api-24.5.0.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.5.0/dvlib-24.5.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.5.0/dvlib-24.5.0.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.2.3/7bc81618d320f3921edb9eb25d04c453c218af67/lint-api-24.2.3-sources.jar" /> - <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.lint/lint-api/24.2.3/c3648cf4ae2ff004360e31ed177271d88ecd093a/lint-api-24.2.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/abego/treelayout/org.abego.treelayout.core/1.0.1/org.abego.treelayout.core-1.0.1.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" /> <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> - <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-v4/24.0.0-alpha1/support-v4-24.0.0-alpha1.aar" /> - <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/appcompat-v7/24.0.0-alpha1/appcompat-v7-24.0.0-alpha1.aar" /> - <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/24.0.0-alpha1/support-annotations-24.0.0-alpha1.jar" /> - <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-vector-drawable/24.0.0-alpha1/support-vector-drawable-24.0.0-alpha1.aar" /> - <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/animated-vector-drawable/24.0.0-alpha1/animated-vector-drawable-24.0.0-alpha1.aar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/intellij/annotations/12.0/annotations-12.0.jar" /> + <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-v4/23.2.0/support-v4-23.2.0.aar" /> + <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/appcompat-v7/23.2.0/appcompat-v7-23.2.0.aar" /> + <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/23.2.0/support-annotations-23.2.0.jar" /> + <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/animated-vector-drawable/23.2.0/animated-vector-drawable-23.2.0.aar" /> + <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-vector-drawable/23.2.0/support-vector-drawable-23.2.0.aar" /> <option value="$MODULE_DIR$/libs/ormlite-android-4.47.jar" /> <option value="$MODULE_DIR$/libs/ormlite-core-4.47.jar" /> <option value="$MODULE_DIR$/libs/slf4j-android-1.6.1-RC1.jar" /> @@ -1622,8 +1765,9 @@ <option value="$PROJECT_DIR$/app/src/main/res/values-it/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/res/values-uk/strings.xml" /> <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java" /> - <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> <option value="$PROJECT_DIR$/app/build.gradle" /> + <option value="$PROJECT_DIR$/build.gradle" /> + <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> </list> </option> </component> @@ -1638,9 +1782,9 @@ <order /> </component> <component name="ProjectFrameBounds"> - <option name="y" value="-82" /> + <option name="y" value="19" /> <option name="width" value="3840" /> - <option name="height" value="2242" /> + <option name="height" value="2141" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -1665,41 +1809,7 @@ <sortByType /> </navigator> <panes> - <pane id="Scratches" /> - <pane id="AndroidView"> - <subPane> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> - </PATH_ELEMENT> - </PATH> - </subPane> - </pane> + <pane id="Scope" /> <pane id="ProjectPane"> <subPane> <PATH> @@ -1728,29 +1838,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> + <option name="myItemId" value="gradle" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> + <option name="myItemId" value="wrapper" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1764,19 +1856,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> + <option name="myItemId" value="build" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="java" /> + <option name="myItemId" value="intermediates" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1793,26 +1877,6 @@ <option name="myItemId" value="app" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="de" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1835,89 +1899,77 @@ <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="de" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> + </PATH> + </subPane> + </pane> + <pane id="PackagesPane"> + <subPane> + <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="gui" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="app" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="java" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="de" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + <option name="myItemId" value="de.bjusystems.vdrmanager.gui" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> </PATH_ELEMENT> </PATH> </subPane> </pane> - <pane id="Scope" /> - <pane id="PackagesPane"> + <pane id="AndroidView"> <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="vdrmanager" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewProjectNode" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="app" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="de.bjusystems.vdrmanager.gui" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + <option name="myItemId" value="java" /> + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> </PATH_ELEMENT> </PATH> </subPane> </pane> + <pane id="Scratches" /> </panes> </component> <component name="PropertiesComponent"> <property name="recentsLimit" value="5" /> - <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="H8W0215B12002046" /> + <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="CB5A21940V" /> <property name="settings.editor.selected.configurable" value="preferences.keymap" /> <property name="settings.editor.splitter.proportion" value="0.2" /> <property name="FullScreen" value="false" /> @@ -1925,11 +1977,11 @@ <property name="ExportApk.ApkPath" value="$PROJECT_DIR$/app" /> <property name="ExportApk.Flavors" value="" /> <property name="ExportApk.BuildType" value="release" /> - <property name="android.project.structure.last.selected" value="app" /> + <property name="android.project.structure.last.selected" value="Project" /> <property name="android.project.structure.proportion" value="0.15" /> <property name="OverrideImplement.combined" value="true" /> <property name="OverrideImplement.overriding.sorted" value="false" /> - <property name="SearchEverywhereHistoryKey" value="Andr	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/AndroidManifest.xml EpgDe	PSI	JAVA://de.bjusystems.vdrmanager.gui.EpgDetailsActivity string	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/res/values/strings.xml Android	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/AndroidManifest.xml rest	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/backup/RestoreActivity.java htt	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/http/HttpHelper.java h	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/http/HttpHelper.java EpgDeta	PSI	JAVA://de.bjusystems.vdrmanager.gui.EpgDetailsActivity strings.	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/res/values/strings.xml" /> + <property name="SearchEverywhereHistoryKey" value="build	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/build.gradle svdr	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpAsyncTask.java Andr	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/AndroidManifest.xml EpgDe	PSI	JAVA://de.bjusystems.vdrmanager.gui.EpgDetailsActivity string	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/res/values/strings.xml Android	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/AndroidManifest.xml rest	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/backup/RestoreActivity.java htt	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/http/HttpHelper.java h	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/http/HttpHelper.java EpgDeta	PSI	JAVA://de.bjusystems.vdrmanager.gui.EpgDetailsActivity strings.	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/res/values/strings.xml" /> <property name="DEBUGGABLE_DEVICE" value="huawei-plk_l01-H8W0215B12002046" /> <property name="DEBUGGABLE_PROCESS" value="de.bjusystems.vdrmanager" /> <property name="SHOW_ALL_PROCESSES" value="false" /> @@ -2124,19 +2176,18 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="0" y="-82" width="3840" height="2242" extended-state="0" /> + <frame x="0" y="19" width="3840" height="2141" extended-state="6" /> <editor active="true" /> <layout> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2641414" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26384366" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23031914" sideWeight="0.5076004" order="3" side_tool="true" content_ui="tabs" /> <window_info id="Palette	" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Capture Analysis" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> - <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.41013515" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> - <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32978722" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.40988058" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32899022" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32953313" sideWeight="0.5" order="14" side_tool="false" content_ui="tabs" /> @@ -2144,13 +2195,12 @@ <window_info id="Capture Tool" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="true" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23005319" sideWeight="0.49239957" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32844734" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32765958" sideWeight="0.49239957" order="0" side_tool="false" content_ui="combo" /> <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969153" sideWeight="0.5" order="6" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23071979" sideWeight="0.5081081" order="5" side_tool="true" content_ui="tabs" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.42590675" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4256243" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> @@ -2158,7 +2208,9 @@ <window_info id="Dynamic Properties" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32978722" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32844734" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> </layout> <layout-to-restore> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> @@ -2239,6 +2291,12 @@ <properties /> <option name="timeStamp" value="30" /> </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java</url> + <line>386</line> + <properties /> + <option name="timeStamp" value="32" /> + </line-breakpoint> <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType"> <url>file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java</url> <line>400</line> @@ -2255,79 +2313,11 @@ <option name="timeStamp" value="28" /> </line-breakpoint> </breakpoints> - <option name="time" value="31" /> + <option name="time" value="33" /> </breakpoint-manager> <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/app/src/main/res/xml/searchable.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-9.12963"> - <caret line="17" column="17" selection-start-line="17" selection-start-column="16" selection-end-line="17" selection-end-column="17" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/Api11Adapter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="36" column="13" selection-start-line="36" selection-start-column="13" selection-end-line="36" selection-end-column="13" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/AbstractSettingsActivity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="30" column="52" selection-start-line="30" selection-start-column="52" selection-end-line="30" selection-end-column="52" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/Api14Adapter.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-11.6"> - <caret line="38" column="41" selection-start-line="38" selection-start-column="41" selection-end-line="38" selection-end-column="41" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/vdrlist.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="5" column="57" selection-start-line="5" selection-start-column="57" selection-end-line="5" selection-end-column="57" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/vdr_list_add_delete.xml"> - <provider editor-type-id="android-designer"> - <state /> - </provider> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-6.214286"> - <caret line="9" column="35" selection-start-line="9" selection-start-column="35" selection-end-line="9" selection-end-column="35" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrListActivity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-9.903846"> - <caret line="279" column="19" selection-start-line="279" selection-start-column="19" selection-end-line="279" selection-end-column="19" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrPreferencesActivity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-3.7692308"> - <caret line="374" column="60" selection-start-line="374" selection-start-column="60" selection-end-line="374" selection-end-column="60" /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgSearchTimesListActivity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-17.4"> - <caret line="96" column="29" selection-start-line="96" selection-start-column="29" selection-end-line="96" selection-end-column="29" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/remote/RemoteActivity.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-7.0185184"> @@ -2342,14 +2332,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpAsyncTask.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="92" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/RecordingListActivity.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -2390,7 +2372,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="117" column="39" selection-start-line="117" selection-start-column="39" selection-end-line="117" selection-end-column="39" /> - <folding /> </state> </provider> </entry> @@ -2401,18 +2382,10 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/build.gradle"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/TimerListActivity.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="27" column="49" selection-start-line="27" selection-start-column="49" selection-end-line="27" selection-end-column="49" /> - <folding /> </state> </provider> </entry> @@ -2420,7 +2393,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="8" column="13" selection-start-line="8" selection-start-column="13" selection-end-line="8" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -2428,7 +2400,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="49" column="53" selection-start-line="49" selection-start-column="53" selection-end-line="49" selection-end-column="53" /> - <folding /> </state> </provider> </entry> @@ -2436,7 +2407,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="33" column="13" selection-start-line="33" selection-start-column="13" selection-end-line="33" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -2444,7 +2414,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="18" column="9" selection-start-line="18" selection-start-column="9" selection-end-line="18" selection-end-column="9" /> - <folding /> </state> </provider> </entry> @@ -2452,12 +2421,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-10.45098"> <caret line="34" column="67" selection-start-line="34" selection-start-column="67" selection-end-line="34" selection-end-column="67" /> - <folding> - <element signature="e#855#1250#0" expanded="false" /> - <element signature="e#1249#1250#0" expanded="false" /> - <element signature="e#1273#1405#0" expanded="false" /> - <element signature="e#1404#1405#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2465,10 +2428,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="9" column="0" selection-start-line="9" selection-start-column="0" selection-end-line="9" selection-end-column="0" /> - <folding> - <element signature="imports" expanded="true" /> - <element signature="docComment;class#HttpHelper#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2476,7 +2435,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="54" column="41" selection-start-line="54" selection-start-column="41" selection-end-line="54" selection-end-column="41" /> - <folding /> </state> </provider> </entry> @@ -2484,7 +2442,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="30" column="13" selection-start-line="30" selection-start-column="13" selection-end-line="30" selection-end-column="13" /> - <folding /> </state> </provider> </entry> @@ -2492,7 +2449,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="32" column="0" selection-start-line="32" selection-start-column="0" selection-end-line="32" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2500,11 +2456,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="94" column="0" selection-start-line="94" selection-start-column="0" selection-end-line="94" selection-end-column="0" /> - <folding> - <element signature="e#3216#3264#0" expanded="false" /> - <element signature="e#3266#3576#0" expanded="false" /> - <element signature="e#3575#3576#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2520,10 +2471,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="738" column="20" selection-start-line="738" selection-start-column="20" selection-end-line="738" selection-end-column="20" /> - <folding> - <element signature="e#26891#26892#0" expanded="false" /> - <element signature="e#26928#26929#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2531,9 +2478,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="103" column="40" selection-start-line="103" selection-start-column="40" selection-end-line="103" selection-end-column="40" /> - <folding> - <element signature="e#3221#3227#0" expanded="true" /> - </folding> </state> </provider> </entry> @@ -2541,15 +2485,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/res/values/no_translate.xml"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2557,7 +2492,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="13" column="23" selection-start-line="8" selection-start-column="7" selection-end-line="13" selection-end-column="23" /> - <folding /> </state> </provider> </entry> @@ -2565,7 +2499,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-12.666667"> <caret line="237" column="27" selection-start-line="237" selection-start-column="27" selection-end-line="237" selection-end-column="27" /> - <folding /> </state> </provider> </entry> @@ -2573,7 +2506,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> </entry> @@ -2581,7 +2513,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-10.3529415"> <caret line="216" column="11" selection-start-line="216" selection-start-column="11" selection-end-line="216" selection-end-column="11" /> - <folding /> </state> </provider> </entry> @@ -2589,7 +2520,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-31.37255"> <caret line="218" column="14" selection-start-line="218" selection-start-column="14" selection-end-line="218" selection-end-column="14" /> - <folding /> </state> </provider> </entry> @@ -2597,7 +2527,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-6.48366"> <caret line="220" column="26" selection-start-line="220" selection-start-column="26" selection-end-line="220" selection-end-column="26" /> - <folding /> </state> </provider> </entry> @@ -2605,18 +2534,6 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-11.90196"> <caret line="216" column="8" selection-start-line="216" selection-start-column="8" selection-end-line="216" selection-end-column="8" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/data/Preferences.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.35913312"> - <caret line="117" column="0" selection-start-line="117" selection-start-column="0" selection-end-line="117" selection-end-column="0" /> - <folding> - <element signature="e#3155#3156#0" expanded="false" /> - <element signature="e#3192#3193#0" expanded="false" /> - </folding> </state> </provider> </entry> @@ -2624,45 +2541,33 @@ <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="-12.156863"> <caret line="213" column="27" selection-start-line="213" selection-start-column="27" selection-end-line="213" selection-end-column="27" /> - <folding /> </state> </provider> </entry> <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/epgdetails.xml"> - <provider selected="true" editor-type-id="android-designer"> - <state /> - </provider> <provider editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> - <folding /> </state> </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/epg_detail.xml"> - <provider editor-type-id="android-designer"> + <provider selected="true" editor-type-id="android-designer"> <state /> </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/epg_detail.xml"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.53403693"> <caret line="171" column="28" selection-start-line="171" selection-start-column="28" selection-end-line="171" selection-end-column="28" /> - <folding /> </state> </provider> + <provider editor-type-id="android-designer"> + <state /> + </provider> </entry> <entry file="file:///opt/android-sdk-update-manager/sources/android-23/android/os/AsyncTask.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="2.6594427"> <caret line="358" column="30" selection-start-line="358" selection-start-column="30" selection-end-line="358" selection-end-column="30" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/build.gradle"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="8" column="5" selection-start-line="8" selection-start-column="5" selection-end-line="8" selection-end-column="5" /> - <folding /> </state> </provider> </entry> @@ -2681,7 +2586,6 @@ <element signature="method#toggleTimer#0;class#EpgDetailsActivity#0" expanded="false" /> <element signature="class#22410:23751" expanded="false" /> <element signature="method#finished#0;class#22410:23751" expanded="false" /> - <element signature="e#23826#23833#0" expanded="true" /> <element signature="method#onCreateOptionsMenu#0;class#EpgDetailsActivity#0" expanded="false" /> <element signature="e#24292#24339#0" expanded="false" /> <element signature="method#onOptionsItemSelected#0;class#EpgDetailsActivity#0" expanded="false" /> @@ -2700,10 +2604,125 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpAsyncTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="92" selection-end-column="0" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/ChannelClient.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="112" column="12" selection-start-line="112" selection-start-column="12" selection-end-line="112" selection-end-column="12" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/preferences_keys.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="25" column="36" selection-start-line="25" selection-start-column="18" selection-end-line="25" selection-end-column="36" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/data/Preferences.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="697" column="36" selection-start-line="697" selection-start-column="36" selection-end-line="697" selection-end-column="36" /> + <folding> + <element signature="e#2137#2138#0" expanded="true" /> + <element signature="e#2167#2168#0" expanded="true" /> + <element signature="e#5430#5431#0" expanded="true" /> + <element signature="e#5478#5479#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/data/TimerMatch.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="2" column="12" selection-start-line="2" selection-start-column="12" selection-end-line="2" selection-end-column="12" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/data/Vdr.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="386" column="0" selection-start-line="386" selection-start-column="0" selection-end-line="386" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/no_translate.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="16" column="12" selection-start-line="16" selection-start-column="12" selection-end-line="16" selection-end-column="12" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/data/VdrSharedPreferences.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/ProductFlavor.groovy"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-39.52941"> + <caret line="109" column="16" selection-start-line="109" selection-start-column="16" selection-end-line="109" selection-end-column="16" /> + <folding /> + </state> + </provider> + </entry> + <entry file="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.android.tools.build/gradle-core/1.2.3/3e702e30815cc67650ed7641c7ff13725dc56f5d/gradle-core-1.2.3-sources.jar!/com/android/build/gradle/internal/dsl/LintOptions.groovy"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-8.588235"> + <caret line="166" column="9" selection-start-line="166" selection-start-column="9" selection-end-line="166" selection-end-column="9" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/build.gradle"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="6" column="55" selection-start-line="6" selection-start-column="55" selection-end-line="6" selection-end-column="55" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/build.gradle"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="27" column="5" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" /> + <folding /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.16511868"> - <caret line="10" column="75" selection-start-line="10" selection-start-column="54" selection-end-line="10" selection-end-column="75" /> + <state vertical-scroll-proportion="0.09186603"> + <caret line="3" column="30" selection-start-line="3" selection-start-column="25" selection-end-line="3" selection-end-column="30" /> <folding /> </state> </provider> diff --git a/vdrmanager/app/app-release.apk b/vdrmanager/app/app-release.apk Binary files differindex 9a382a9..813c890 100644 --- a/vdrmanager/app/app-release.apk +++ b/vdrmanager/app/app-release.apk diff --git a/vdrmanager/app/app.iml b/vdrmanager/app/app.iml index a38463e..24cf4dc 100644 --- a/vdrmanager/app/app.iml +++ b/vdrmanager/app/app.iml @@ -36,13 +36,13 @@ <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" /> <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" /> - <sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" /> + <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" /> <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" /> @@ -65,21 +65,22 @@ <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.0.0-alpha1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.0.0-alpha1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0-alpha1/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.0.0-alpha1/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" /> <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> @@ -87,12 +88,12 @@ <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" exported="" name="ormlite-android-4.47" level="project" /> <orderEntry type="library" exported="" name="ormlite-core-4.47" level="project" /> - <orderEntry type="library" exported="" name="support-v4-24.0.0-alpha1" level="project" /> - <orderEntry type="library" exported="" name="animated-vector-drawable-24.0.0-alpha1" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-24.0.0-alpha1" level="project" /> + <orderEntry type="library" exported="" name="support-v4-23.2.0" level="project" /> <orderEntry type="library" exported="" name="svdrp4j-1.1.0-SNAPSHOT" level="project" /> - <orderEntry type="library" exported="" name="support-vector-drawable-24.0.0-alpha1" level="project" /> + <orderEntry type="library" exported="" name="support-annotations-23.2.0" level="project" /> <orderEntry type="library" exported="" name="slf4j-android-1.6.1-RC1" level="project" /> - <orderEntry type="library" exported="" name="appcompat-v7-24.0.0-alpha1" level="project" /> + <orderEntry type="library" exported="" name="appcompat-v7-23.2.0" level="project" /> + <orderEntry type="library" exported="" name="animated-vector-drawable-23.2.0" level="project" /> + <orderEntry type="library" exported="" name="support-vector-drawable-23.2.0" level="project" /> </component> </module>
\ No newline at end of file diff --git a/vdrmanager/app/build.gradle b/vdrmanager/app/build.gradle index acc2bdd..c0ec540 100644 --- a/vdrmanager/app/build.gradle +++ b/vdrmanager/app/build.gradle @@ -7,6 +7,8 @@ android { // but continue the build even when errors are found: abortOnError false } + + signingConfigs { config { keyAlias 'vdrmanager' @@ -21,7 +23,16 @@ android { applicationId "de.bjusystems.vdrmanager" minSdkVersion 8 targetSdkVersion 23 + //vectorDrawables.useSupportLibrary = true + + } + + + aaptOptions { + additionalParameters "--no-version-vectors" } + + buildTypes { release { minifyEnabled false @@ -36,6 +47,6 @@ dependencies { compile files('libs/ormlite-core-4.47.jar') compile files('libs/slf4j-android-1.6.1-RC1.jar') compile files('libs/svdrp4j-1.1.0-SNAPSHOT.jar') - compile 'com.android.support:support-v4:24.0.0-alpha1' - compile 'com.android.support:appcompat-v7:24.0.0-alpha1' + compile 'com.android.support:support-v4:23.2.0' + compile 'com.android.support:appcompat-v7:23.2.0' } diff --git a/vdrmanager/app/src/main/AndroidManifest.xml b/vdrmanager/app/src/main/AndroidManifest.xml index bc0ebdb..3e549a1 100644 --- a/vdrmanager/app/src/main/AndroidManifest.xml +++ b/vdrmanager/app/src/main/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="de.bjusystems.vdrmanager" - android:versionCode="12400" - android:versionName="12.40" > + android:versionCode="12500" + android:versionName="12.50" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/vdrmanager/build.gradle b/vdrmanager/build.gradle index 88d246d..f4d8c54 100644 --- a/vdrmanager/build.gradle +++ b/vdrmanager/build.gradle @@ -4,7 +4,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:1.2.3' + classpath 'com.android.tools.build:gradle:1.5.0' } } diff --git a/vdrmanager/build/intermediates/dex-cache/cache.xml b/vdrmanager/build/intermediates/dex-cache/cache.xml index f31b7df..9c43866 100644 --- a/vdrmanager/build/intermediates/dex-cache/cache.xml +++ b/vdrmanager/build/intermediates/dex-cache/cache.xml @@ -2,74 +2,74 @@ <items version="2" > <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-core-4.47.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars/classes.jar" jumboMode="false" revision="23.0.2" - sha1="e11abddd1e9c2053a92133fa83f78f7bedb820a9"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/ormlite-core-4.47-f4351fd8956d1b69c8e44b91acc06d6bd235d5f2.jar" /> + sha1="e5f32fa48a3eb2de0c987025c11b6e3864b634d9"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/com.android.support-support-v4-23.2.0_c581826c7ff510a594db8affcca04bf5e8da4862.jar" /> </item> <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.0.0-alpha1/jars/classes.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-android-4.47.jar" jumboMode="false" revision="23.0.2" - sha1="a6af5beedc2e8c946abc3771525e2fed77439309"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/classes-40295f8557712b09508afb03458127475367ce30.jar" /> + sha1="c72f9ed54d8a8bab3fbf56da2b358308a67899a4"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-android-4.47_cd582e76513b150a799d72777f8ce54c8cef042c.jar" /> </item> <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0-alpha1/jars/libs/internal_impl-24.0.0-alpha1.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.0/jars/classes.jar" jumboMode="false" revision="23.0.2" - sha1="e57fba0a2d57d3501d8f4ff44c23092978804845"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/internal_impl-24.0.0-alpha1-37673310e79c5d93c0a81c7969ee0ebdeb97b96f.jar" /> + sha1="8c108c22c99e794eff255bb34d2a461200c4cbb0"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/com.android.support-animated-vector-drawable-23.2.0_31463bff1db35597f44feb25b48ef1fa689123c2.jar" /> </item> <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.0.0-alpha1/jars/classes.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.0/jars/classes.jar" jumboMode="false" revision="23.0.2" - sha1="9684c95278dc45a142d7de3db9e7e39aa520e1e0"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/classes-0577cfbb1def3ac06965afda6daf98e5a6100a62.jar" /> + sha1="292a9fa091757208efa65e77eef63088247e51f3"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/com.android.support-support-vector-drawable-23.2.0_f0069d8bb26c7a5b410a45f2345c77122d3e4572.jar" /> </item> <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/24.0.0-alpha1/jars/classes.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/svdrp4j-1.1.0-SNAPSHOT.jar" jumboMode="false" revision="23.0.2" - sha1="9aaaea3a89040f8176f810c85e288fc74d5d1f12"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/classes-409085bdde255d7732cbe24ac353880a6339d315.jar" /> + sha1="ab78bd1a6dddd90492477dc828583d298cfc173c"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/svdrp4j-1.1.0-SNAPSHOT_9aad1a4ae5633d9645273a17693384af69d9c05a.jar" /> </item> <item - jar="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/24.0.0-alpha1/support-annotations-24.0.0-alpha1.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.0/jars/libs/internal_impl-23.2.0.jar" jumboMode="false" revision="23.0.2" - sha1="b8062546971a3d196343232a19a3c0016272ba47"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/support-annotations-24.0.0-alpha1-9b56aef9f09623e3eda79dcf95940b0190d118b7.jar" /> + sha1="6e239441500605809818997dd63b62a947195f8c"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/internal_impl-23.2.0_175c3f5e783db8e4b955daf0fcd073a388136f3d.jar" /> </item> <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/svdrp4j-1.1.0-SNAPSHOT.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.0/jars/classes.jar" jumboMode="false" revision="23.0.2" - sha1="ab78bd1a6dddd90492477dc828583d298cfc173c"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/svdrp4j-1.1.0-SNAPSHOT-9aad1a4ae5633d9645273a17693384af69d9c05a.jar" /> + sha1="6e3578f92f7462d1a935a1d36173e3bdd1234976"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/com.android.support-appcompat-v7-23.2.0_d8a22d5225fea3073ff81db0dd79cdd1e7ec46d4.jar" /> </item> <item jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/slf4j-android-1.6.1-RC1.jar" jumboMode="false" revision="23.0.2" sha1="a0b527e8aabcc1f1e97d1674dc3f4f0794ec5df1"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/slf4j-android-1.6.1-RC1-f6bdb9b40f113bad4847688d0617ca1ece7cb7ac.jar" /> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/slf4j-android-1.6.1-RC1_f6bdb9b40f113bad4847688d0617ca1ece7cb7ac.jar" /> </item> <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-android-4.47.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-core-4.47.jar" jumboMode="false" revision="23.0.2" - sha1="c72f9ed54d8a8bab3fbf56da2b358308a67899a4"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/ormlite-android-4.47-cd582e76513b150a799d72777f8ce54c8cef042c.jar" /> + sha1="e11abddd1e9c2053a92133fa83f78f7bedb820a9"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-core-4.47_f4351fd8956d1b69c8e44b91acc06d6bd235d5f2.jar" /> </item> <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.0.0-alpha1/jars/classes.jar" + jar="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/23.2.0/support-annotations-23.2.0.jar" jumboMode="false" revision="23.0.2" - sha1="ed88e1f0c8fbf66e1da918545f0a6790f893bceb"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/release/classes-5e6d2a441c57259bc316cbec1508efda56635738.jar" /> + sha1="c5bf571bb10462bd90e5419ade67793f71acbc87"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/support-annotations-23.2.0_03465fc47b21d737652331dc4a36b91d40a22d6b.jar" /> </item> </items> |