diff options
| author | lado <herrlado@gmail.com> | 2015-10-19 21:51:58 +0200 |
|---|---|---|
| committer | lado <herrlado@gmail.com> | 2015-10-19 21:51:58 +0200 |
| commit | 559f24829ce27087a4d36ed52432dafaed7b5717 (patch) | |
| tree | 6077f0e2f89434b382b0dfd67650d7a40011cf2a /vdrmanager | |
| parent | 4b275b0e05cd27a6e8eba90cf88ccbfdc2c8828e (diff) | |
| download | vdr-manager-559f24829ce27087a4d36ed52432dafaed7b5717.tar.gz vdr-manager-559f24829ce27087a4d36ed52432dafaed7b5717.tar.bz2 | |
Feature #2230
Diffstat (limited to 'vdrmanager')
25 files changed, 1621 insertions, 949 deletions
diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock b/vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock Binary files differindex 1420607..acc925d 100644 --- a/vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock +++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin b/vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin Binary files differindex 58a322f..f9c4b07 100644 --- a/vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin +++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin b/vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin Binary files differindex db87096..a580087 100644 --- a/vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin +++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin b/vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin Binary files differindex e62b331..91eb9f7 100644 --- a/vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin +++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin diff --git a/vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin b/vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin Binary files differindex d81a215..7a7ad69 100644 --- a/vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin +++ b/vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin diff --git a/vdrmanager/.idea/libraries/appcompat_v7_19_1_0.xml b/vdrmanager/.idea/libraries/appcompat_v7_19_1_0.xml deleted file mode 100644 index 35f71f7..0000000 --- a/vdrmanager/.idea/libraries/appcompat_v7_19_1_0.xml +++ /dev/null @@ -1,10 +0,0 @@ -<component name="libraryTable"> - <library name="appcompat-v7-19.1.0"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars/classes.jar!/" /> - <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/res" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> -</component>
\ No newline at end of file diff --git a/vdrmanager/.idea/libraries/support_annotations_21_0_3.xml b/vdrmanager/.idea/libraries/support_annotations_21_0_3.xml deleted file mode 100644 index e178303..0000000 --- a/vdrmanager/.idea/libraries/support_annotations_21_0_3.xml +++ /dev/null @@ -1,11 +0,0 @@ -<component name="libraryTable"> - <library name="support-annotations-21.0.3"> - <CLASSES> - <root url="jar:///opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar:///opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3-sources.jar!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/vdrmanager/.idea/libraries/support_v4_21_0_3.xml b/vdrmanager/.idea/libraries/support_v4_21_0_3.xml deleted file mode 100644 index 93b0bc7..0000000 --- a/vdrmanager/.idea/libraries/support_v4_21_0_3.xml +++ /dev/null @@ -1,13 +0,0 @@ -<component name="libraryTable"> - <library name="support-v4-21.0.3"> - <CLASSES> - <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar!/" /> - <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/res" /> - <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/libs/internal_impl-21.0.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar:///opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-v4/21.0.3/support-v4-21.0.3-sources.jar!/" /> - </SOURCES> - </library> -</component>
\ No newline at end of file diff --git a/vdrmanager/.idea/vcs.xml b/vdrmanager/.idea/vcs.xml index 94a25f7..6c0b863 100644 --- a/vdrmanager/.idea/vcs.xml +++ b/vdrmanager/.idea/vcs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$" vcs="Git" /> + <mapping directory="$PROJECT_DIR$/.." vcs="Git" /> </component> </project>
\ No newline at end of file diff --git a/vdrmanager/.idea/workspace.xml b/vdrmanager/.idea/workspace.xml index e4bb907..f8c76a6 100644 --- a/vdrmanager/.idea/workspace.xml +++ b/vdrmanager/.idea/workspace.xml @@ -7,16 +7,35 @@ </component> <component name="ChangeListManager"> <list default="true" id="b67c73a6-38b8-40ea-a024-48a0a359d6d1" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/ColoredButton.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/ColoredButton.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesome.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesome.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesomeButton.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesomeButton.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/remote/HITK.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/remote/HITK.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/LruCache.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/LruCache.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/edit_remote_key.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/edit_remote_key.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable/red_button.xml" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/red_button.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/menu/remote_menu.xml" afterPath="$PROJECT_DIR$/app/src/main/res/menu/remote_menu.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable/roundedbutton.xml" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/roundedbutton.xml" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/appcompat_v7_19_1_0.xml" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/ormlite_android_4_47.xml" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/ormlite_core_4_47.xml" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/slf4j_android_1_6_1_RC1.xml" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/support_annotations_21_0_3.xml" afterPath="" /> + <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/support_v4_21_0_3.xml" afterPath="" /> + <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$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/build/intermediates/gradle_project_sync_data.bin" afterPath="$PROJECT_DIR$/build/intermediates/gradle_project_sync_data.bin" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" /> + <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/tasks/AsyncProgressTask.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/tasks/AsyncProgressTask.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/BaseTimerEditActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/BaseTimerEditActivity.java" /> + <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/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpException.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpException.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" /> + <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$/local.properties" afterPath="$PROJECT_DIR$/local.properties" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/vcs.xml" afterPath="$PROJECT_DIR$/.idea/vcs.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> </list> <ignored path="vdrmanager.iws" /> <ignored path=".idea/workspace.xml" /> @@ -32,31 +51,130 @@ <option name="PATCH_PATH" value="" /> </component> <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" /> + <component name="ExternalProjectsManager"> + <system id="GRADLE"> + <state> + <projects_view /> + </state> + </system> + </component> <component name="FavoritesManager"> <favorites_list name="vdrmanager" /> </component> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="VdrManagerActivity.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java"> + <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"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" /> + <caret line="109" column="0" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="CreateTimerTask.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/tasks/CreateTimerTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SetTimerClient.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-4.32"> + <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" /> <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="4" column="30" selection-start-line="4" selection-start-column="30" selection-end-line="4" selection-end-column="30" /> + <caret line="156" column="30" selection-start-line="156" selection-start-column="16" selection-end-line="156" selection-end-column="41" /> <folding /> </state> </provider> </entry> </file> + <file leaf-file-name="SvdrpExceptionListener.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpExceptionListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SvdrpEvent.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpEvent.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> + </file> + <file leaf-file-name="SvdrpException.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpException.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" /> + <folding> + <element signature="e#308#309#0" expanded="true" /> + <element signature="e#333#334#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="AsyncProgressTask.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/tasks/AsyncProgressTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#1765#1794#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SvdrpProgressDialog.java" pinned="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="12" column="30" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="30" /> + <folding /> + </state> + </provider> + </entry> + </file> + <file leaf-file-name="SvdrpAsyncTask.java" pinned="false" current-in-tab="true"> + <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.33293977"> + <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="92" selection-end-column="0" /> + <folding> + <element signature="e#513#537#0" expanded="true" /> + <element signature="e#3996#3997#0" expanded="true" /> + <element signature="e#4031#4032#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + </file> </leaf> </component> <component name="GenerateSignedApkSettings"> @@ -65,7 +183,7 @@ <option name="REMEMBER_PASSWORDS" value="true" /> </component> <component name="Git.Settings"> - <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> </component> <component name="GradleLocalSettings"> <option name="availableProjects"> @@ -471,14 +589,14 @@ <option name="name" value="preReleaseUnitTestBuild" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:appcompat-v7:19.1.0" /> + <option name="description" value="Prepare com.android.support:appcompat-v7:21.0.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="prepareComAndroidSupportAppcompatV71910Library" /> + <option name="name" value="prepareComAndroidSupportAppcompatV72100Library" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:support-v4:21.0.3" /> + <option name="description" value="Prepare com.android.support:support-v4:21.0.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> - <option name="name" value="prepareComAndroidSupportSupportV42103Library" /> + <option name="name" value="prepareComAndroidSupportSupportV42100Library" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> @@ -972,14 +1090,14 @@ <option name="name" value="preReleaseUnitTestBuild" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:appcompat-v7:19.1.0" /> + <option name="description" value="Prepare com.android.support:appcompat-v7:21.0.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="prepareComAndroidSupportAppcompatV71910Library" /> + <option name="name" value="prepareComAndroidSupportAppcompatV72100Library" /> </ExternalTaskPojo> <ExternalTaskPojo> - <option name="description" value="Prepare com.android.support:support-v4:21.0.3" /> + <option name="description" value="Prepare com.android.support:support-v4:21.0.0" /> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> - <option name="name" value="prepareComAndroidSupportSupportV42103Library" /> + <option name="name" value="prepareComAndroidSupportSupportV42100Library" /> </ExternalTaskPojo> <ExternalTaskPojo> <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> @@ -1100,7 +1218,7 @@ </option> <option name="modificationStamps"> <map> - <entry key="$PROJECT_DIR$" value="4301554936958" /> + <entry key="$PROJECT_DIR$" value="4312903230925" /> </map> </option> <option name="projectBuildClasspath"> @@ -1115,76 +1233,76 @@ <ExternalModuleBuildClasspathPojo> <option name="entries"> <list> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.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="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3.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="$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/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3.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/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3.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/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/common/24.2.3/common-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3.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/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/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/lint/lint-api/24.2.3/lint-api-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/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/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.2.3/annotations-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3.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/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.2.3/dvlib-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3.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="$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" /> </list> </option> <option name="path" value="$PROJECT_DIR$" /> @@ -1196,79 +1314,79 @@ <ExternalModuleBuildClasspathPojo> <option name="entries"> <list> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-gradle/5.1/proguard-gradle-5.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/proguard/proguard-base/5.1/proguard-base-5.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/eclipse/jdt/core/compiler/ecj/4.4/ecj-4.4.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcprov-jdk15on/1.48/bcprov-jdk15on-1.48.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-tree/5.0.3/asm-tree-5.0.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/squareup/javawriter/2.5.0/javawriter-2.5.0.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm/5.0.3/asm-5.0.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/code/gson/gson/2.2.4/gson-2.2.4.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/bouncycastle/bcpkix-jdk15on/1.48/bcpkix-jdk15on-1.48.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/lint-api-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/ow2/asm/asm-analysis/5.0.3/asm-analysis-5.0.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/google/guava/guava/17.0/guava-17.0.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpclient/4.1.1/httpclient-4.1.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpmime/4.1/httpmime-4.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/commons/commons-compress/1.8.1/commons-compress-1.8.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/net/sf/kxml/kxml2/2.3.0/kxml2-2.3.0.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/org/apache/httpcomponents/httpcore/4.1/httpcore-4.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar" /> - <option value="$PROJECT_DIR$/../../android-studio/gradle/m2repository/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" /> - <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-v4/21.0.3/support-v4-21.0.3.aar" /> - <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/appcompat-v7/19.1.0/appcompat-v7-19.1.0.aar" /> - <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle/1.2.3/gradle-1.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/gradle-core/1.2.3/gradle-core-1.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="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint/24.2.3/lint-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder/1.2.3/builder-1.2.3.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="$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/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-checks/24.2.3/lint-checks-24.2.3.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/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdk-common/24.2.3/sdk-common-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-test-api/1.2.3/builder-test-api-1.2.3.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/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/common/24.2.3/common-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/common/24.2.3/common-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/builder-model/1.2.3/builder-model-1.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/sdklib/24.2.3/sdklib-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/build/manifest-merger/24.2.3/manifest-merger-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/ddms/ddmlib/24.2.3/ddmlib-24.2.3.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/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/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/lint/lint-api/24.2.3/lint-api-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/lint/lint-api/24.2.3/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/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.2.3/annotations-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/annotations/24.2.3/annotations-24.2.3.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/layoutlib/layoutlib-api/24.2.3/layoutlib-api-24.2.3.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/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.2.3/dvlib-24.2.3-sources.jar" /> + <option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/dvlib/24.2.3/dvlib-24.2.3.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="$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="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/appcompat-v7/21.0.0/appcompat-v7-21.0.0.aar" /> + <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-v4/21.0.0/support-v4-21.0.0.aar" /> + <option value="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.0/support-annotations-21.0.0.jar" /> <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" /> @@ -1300,7 +1418,17 @@ <component name="IdeDocumentHistory"> <option name="CHANGED_PATHS"> <list> + <option value="$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/res/values-v23/values-v23.xml" /> + <option value="$PROJECT_DIR$/app/build.gradle" /> <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> + <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> + <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/BaseTimerEditActivity.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpException.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/tasks/AsyncProgressTask.java" /> + <option value="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java" /> </list> </option> </component> @@ -1315,10 +1443,9 @@ <order /> </component> <component name="ProjectFrameBounds"> - <option name="x" value="178" /> - <option name="y" value="572" /> - <option name="width" value="3190" /> - <option name="height" value="1324" /> + <option name="y" value="39" /> + <option name="width" value="3200" /> + <option name="height" value="1761" /> </component> <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> @@ -1343,32 +1470,42 @@ <sortByType /> </navigator> <panes> - <pane id="PackagesPane"> + <pane id="Scope" /> + <pane id="Scratches" /> + <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> - </subPane> - </pane> - <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_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> @@ -1397,10 +1534,102 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> + <option name="myItemId" value="gradle" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="wrapper" /> + <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> + <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="build" /> + <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.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <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.PackageViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="app" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="de.bjusystems.vdrmanager.utils.svdrp" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="vdrmanager" /> + <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.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="de.bjusystems.vdrmanager.tasks" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="vdrmanager" /> + <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.PackageViewModuleNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="de.bjusystems.vdrmanager.gui" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageElementNode" /> + </PATH_ELEMENT> + </PATH> </subPane> </pane> </panes> @@ -1409,18 +1638,24 @@ <property name="recentsLimit" value="5" /> <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="FA43CWM09386" /> <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_22" /> - <property name="settings.editor.selected.configurable" value="reference.settingsdialog.IDE.editor.colors.Console Font" /> + <property name="settings.editor.selected.configurable" value="preferences.keymap" /> <property name="settings.editor.splitter.proportion" value="0.2" /> <property name="FullScreen" value="false" /> <property name="last_opened_file_path" value="$PROJECT_DIR$/../../keystores/vdrmanager/release.jks" /> <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.proportion" value="0.15" /> + <property name="OverrideImplement.combined" value="true" /> + <property name="OverrideImplement.overriding.sorted" value="false" /> + <property name="SearchEverywhereHistoryKey" value="EpgDe	FILE	file:///home/lado/development/android/vdr-manager/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java" /> </component> <component name="RunManager" selected="Android Application.app"> <configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> <module name="" /> <option name="ACTIVITY_CLASS" value="" /> + <option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="MODE" value="default_activity" /> <option name="DEPLOY" value="true" /> <option name="ARTIFACT_NAME" value="" /> @@ -1435,7 +1670,8 @@ <option name="NETWORK_LATENCY" value="none" /> <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> + <option name="FORCE_STOP_RUNNING_APP" value="true" /> <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> @@ -1465,7 +1701,8 @@ <option name="NETWORK_LATENCY" value="none" /> <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> + <option name="FORCE_STOP_RUNNING_APP" value="true" /> <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> @@ -1573,6 +1810,7 @@ <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android Application"> <module name="app" /> <option name="ACTIVITY_CLASS" value="" /> + <option name="ACTIVITY_EXTRA_FLAGS" value="" /> <option name="MODE" value="default_activity" /> <option name="DEPLOY" value="true" /> <option name="ARTIFACT_NAME" value="" /> @@ -1587,7 +1825,8 @@ <option name="NETWORK_LATENCY" value="none" /> <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" /> + <option name="FORCE_STOP_RUNNING_APP" value="true" /> <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> @@ -1629,36 +1868,70 @@ <servers /> </component> <component name="ToolWindowManager"> - <frame x="178" y="572" width="3190" height="1324" extended-state="0" /> + <frame x="0" y="39" width="3200" height="1761" extended-state="6" /> <editor active="false" /> <layout> <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="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" 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.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> - <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969254" sideWeight="0.5" order="2" side_tool="false" 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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="14" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="1" 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.33" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> + <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969254" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4" sideWeight="0.5" order="3" 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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" 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="7" 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="7" side_tool="true" content_ui="tabs" /> - <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> - <window_info id="Messages" active="false" anchor="bottom" 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="Android" active="false" anchor="bottom" 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="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23071979" sideWeight="0.5081081" order="4" side_tool="true" 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="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="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23071979" sideWeight="0.5027027" order="3" side_tool="true" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> + <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="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="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" 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="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" 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="7" side_tool="false" content_ui="tabs" /> - <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27944943" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <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="1" side_tool="false" content_ui="tabs" /> - <window_info id="Hierarchy" 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="combo" /> + <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="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="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23071979" sideWeight="0.4918919" order="0" side_tool="false" content_ui="combo" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="2" 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="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" /> <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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="1" 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.4" sideWeight="0.5" order="3" 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="0" 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.33" 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="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" /> <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" /> </layout> + <layout-to-restore> + <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="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="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="13" 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="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23071979" sideWeight="0.5027027" order="3" side_tool="true" 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="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="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="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="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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23071979" sideWeight="0.4918919" order="0" side_tool="false" content_ui="combo" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="3" side_tool="false" content_ui="combo" /> + <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="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="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="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="14" 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="Preview" active="false" anchor="right" 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="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969254" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" 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="4" side_tool="true" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32972974" sideWeight="0.5" order="11" 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="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="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" /> + <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="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" /> + </layout-to-restore> </component> <component name="Vcs.Log.UiProperties"> <option name="RECENTLY_FILTERED_USER_GROUPS"> @@ -1672,10 +1945,82 @@ <option name="myLimit" value="2678400000" /> </component> <component name="XDebuggerManager"> - <breakpoint-manager /> + <breakpoint-manager> + <breakpoints> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java</url> + <line>464</line> + <properties /> + <option name="timeStamp" value="8" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java</url> + <line>105</line> + <properties /> + <option name="timeStamp" value="15" /> + </line-breakpoint> + <line-breakpoint enabled="true" type="java-line"> + <url>file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpAsyncTask.java</url> + <line>92</line> + <properties /> + <option name="timeStamp" value="17" /> + </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>401</line> + <option name="timeStamp" value="3" /> + </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>344</line> + <option name="timeStamp" value="7" /> + </line-breakpoint> + </breakpoints> + <option name="time" value="18" /> + </breakpoint-manager> <watches-manager /> </component> <component name="editorHistoryManager"> + <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.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> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" /> + <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.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/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" /> + <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.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/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -1752,6 +2097,39 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/epgdetails.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> + <provider editor-type-id="android-designer"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/com/viewpagerindicator/PageIndicator.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="25" column="17" selection-start-line="25" selection-start-column="17" selection-end-line="25" selection-end-column="17" /> + </state> + </provider> + </entry> + <entry file="jar:///opt/android-sdk-update-manager/platforms/android-21/android.jar!/org/apache/http/client/ResponseHandler.class"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-4.32"> + <caret line="14" column="0" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" /> + </state> + </provider> + </entry> <entry file="file://$PROJECT_DIR$/.gitignore"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> @@ -1760,10 +2138,57 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/VdrManagerActivity.java"> + <entry file="file://$PROJECT_DIR$/build.gradle"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="35" column="13" selection-start-line="35" selection-start-column="13" selection-end-line="35" selection-end-column="13" /> + <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$/settings.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/build.gradle"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-12.888889"> + <caret line="29" column="47" selection-start-line="29" selection-start-column="47" selection-end-line="29" selection-end-column="47" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/http/HttpHelper.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="164" column="21" selection-start-line="164" selection-start-column="21" selection-end-line="164" selection-end-column="21" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/menu/epg_details.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> + <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="-2.6041667"> + <caret line="201" column="55" selection-start-line="201" selection-start-column="50" selection-end-line="201" selection-end-column="55" /> + <folding /> + </state> + </provider> + <provider editor-type-id="android-designer"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/build/generated/source/r/debug/de/bjusystems/vdrmanager/R.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-9.26"> + <caret line="1974" column="30" selection-start-line="1974" selection-start-column="30" selection-end-line="1974" selection-end-column="30" /> <folding /> </state> </provider> @@ -1776,5 +2201,217 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/timer_recording_conflict.png"> + <provider selected="true" editor-type-id="images"> + <state /> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-5.5288463"> + <caret line="541" column="56" selection-start-line="541" selection-start-column="56" selection-end-line="541" selection-end-column="56" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/ChannelListFragment.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="4" column="13" selection-start-line="4" selection-start-column="13" selection-end-line="4" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/wakeup/AsyncWakeupTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="78" column="14" selection-start-line="78" selection-start-column="14" selection-end-line="78" selection-end-column="14" /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/RecordingClient.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="5" column="13" selection-start-line="5" selection-start-column="13" selection-end-line="5" selection-end-column="13" /> + </state> + </provider> + </entry> + <entry file="file:///opt/android-sdk-update-manager/sources/android-21/android/os/MessageQueue.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.4746163"> + <caret line="333" column="34" selection-start-line="333" selection-start-column="34" selection-end-line="333" selection-end-column="34" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/BaseTimerEditActivity.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.08339124"> + <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" /> + <folding> + <element signature="e#1166#1233#0" expanded="false" /> + <element signature="method#onContextItemSelected#0;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="method#onCreateContextMenu#0;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="method#createTimer#0;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="docComment;method#getTimer#0;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="method#getTimer#0;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="method#toggleTimer#0;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="class#4854:5004" expanded="false" /> + <element signature="method#finished#0;class#4854:5004" expanded="false" /> + <element signature="docComment;method#deleteTimer#0;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="method#deleteTimer#0;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="class#5194:5344" expanded="false" /> + <element signature="method#finished#0;class#5194:5344" expanded="false" /> + <element signature="docComment;method#timerModified#1;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="method#timerModified#1;class#BaseTimerEditActivity#0" expanded="false" /> + <element signature="e#5821#5825#0" expanded="false" /> + <element signature="method#onActivityResult#0;class#BaseTimerEditActivity#0" expanded="false" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpFinishedListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="4" column="27" selection-start-line="4" selection-start-column="27" selection-end-line="4" selection-end-column="27" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="3" column="27" selection-start-line="3" selection-start-column="27" selection-end-line="3" selection-end-column="27" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file:///opt/android-sdk-update-manager/sources/android-21/android/os/Message.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="214" column="0" selection-start-line="214" selection-start-column="0" selection-end-line="214" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file:///opt/android-sdk-update-manager/sources/android-21/android/os/Handler.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="280" column="0" selection-start-line="280" selection-start-column="0" selection-end-line="280" selection-end-column="0" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file:///opt/android-sdk-update-manager/sources/android-21/android/os/AsyncTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="625" column="0" selection-start-line="625" selection-start-column="0" selection-end-line="625" selection-end-column="0" /> + <folding> + <element signature="e#17025#17026#0" expanded="true" /> + <element signature="e#17064#17065#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/CertificateProblemDialog.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="12" column="13" selection-start-line="12" selection-start-column="13" selection-end-line="12" selection-end-column="13" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpEvent.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/utils/svdrp/SvdrpException.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="23" column="0" selection-start-line="23" selection-start-column="0" selection-end-line="23" selection-end-column="0" /> + <folding> + <element signature="e#308#309#0" expanded="true" /> + <element signature="e#333#334#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpExceptionListener.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="2" column="35" selection-start-line="2" selection-start-column="35" selection-end-line="2" selection-end-column="35" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="-4.32"> + <caret line="10" column="40" selection-start-line="10" selection-start-column="40" selection-end-line="10" selection-end-column="40" /> + <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="156" column="30" selection-start-line="156" selection-start-column="16" selection-end-line="156" selection-end-column="41" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/tasks/CreateTimerTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="9" column="55" selection-start-line="9" selection-start-column="55" selection-end-line="9" selection-end-column="55" /> + <folding> + <element signature="imports" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="12" column="30" selection-start-line="12" selection-start-column="8" selection-end-line="12" selection-end-column="30" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/tasks/AsyncProgressTask.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" /> + <folding> + <element signature="imports" expanded="true" /> + <element signature="e#1765#1794#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.0"> + <caret line="109" column="0" selection-start-line="109" selection-start-column="0" selection-end-line="109" selection-end-column="0" /> + <folding /> + </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.33293977"> + <caret line="92" column="0" selection-start-line="92" selection-start-column="0" selection-end-line="92" selection-end-column="0" /> + <folding> + <element signature="e#513#537#0" expanded="true" /> + <element signature="e#3996#3997#0" expanded="true" /> + <element signature="e#4031#4032#0" expanded="true" /> + </folding> + </state> + </provider> + </entry> </component> </project>
\ No newline at end of file diff --git a/vdrmanager/app/app-release.apk b/vdrmanager/app/app-release.apk Binary files differindex 4043fc1..99049ff 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 c7a01b5..d4aab26 100644 --- a/vdrmanager/app/app.iml +++ b/vdrmanager/app/app.iml @@ -71,8 +71,8 @@ <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars" /> - <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/21.0.0/jars" /> + <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> @@ -88,14 +88,14 @@ <excludeFolder url="file://$MODULE_DIR$/build/outputs" /> <excludeFolder url="file://$MODULE_DIR$/build/tmp" /> </content> - <orderEntry type="jdk" jdkName="Android 5.0.1 Google APIs" jdkType="Android SDK" /> + <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" exported="" name="ormlite-android-4.47" level="project" /> + <orderEntry type="library" exported="" name="support-annotations-21.0.0" level="project" /> + <orderEntry type="library" exported="" name="support-v4-21.0.0" level="project" /> <orderEntry type="library" exported="" name="ormlite-core-4.47" level="project" /> <orderEntry type="library" exported="" name="svdrp4j-1.1.0-SNAPSHOT" level="project" /> - <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" /> - <orderEntry type="library" exported="" name="appcompat-v7-19.1.0" level="project" /> - <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" /> <orderEntry type="library" exported="" name="slf4j-android-1.6.1-RC1" level="project" /> + <orderEntry type="library" exported="" name="appcompat-v7-21.0.0" level="project" /> </component> </module>
\ No newline at end of file diff --git a/vdrmanager/app/build.gradle b/vdrmanager/app/build.gradle index 50373df..bda84d9 100644 --- a/vdrmanager/app/build.gradle +++ b/vdrmanager/app/build.gradle @@ -9,8 +9,8 @@ android { storePassword 'HGr6du07' } } - compileSdkVersion 'Google Inc.:Google APIs:21' - buildToolsVersion "22.0.1" + compileSdkVersion 21 + buildToolsVersion '21.1.2' defaultConfig { applicationId "de.bjusystems.vdrmanager" minSdkVersion 8 @@ -26,10 +26,10 @@ android { } dependencies { - compile 'com.android.support:support-v4:21.0.3' - compile 'com.android.support:appcompat-v7:19.1.0' compile files('libs/ormlite-android-4.47.jar') 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:appcompat-v7:21.0.0' + compile 'com.android.support:support-v4:21.0.0' } diff --git a/vdrmanager/app/src/main/AndroidManifest.xml b/vdrmanager/app/src/main/AndroidManifest.xml index 6d56eac..6615b76 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="12260" - android:versionName="12.26" > + android:versionCode="12270" + android:versionName="12.27" > <uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> diff --git a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/BaseTimerEditActivity.java b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/BaseTimerEditActivity.java index b377144..9aaed58 100644 --- a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/BaseTimerEditActivity.java +++ b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/BaseTimerEditActivity.java @@ -21,7 +21,6 @@ import de.bjusystems.vdrmanager.tasks.ToggleTimerTask; import de.bjusystems.vdrmanager.utils.svdrp.SvdrpEvent; /** - * * This class is a base class for all the listings, which can deal with timers * * @author lado diff --git a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java index c1daefa..3b6bf94 100644 --- a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java +++ b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java @@ -51,718 +51,739 @@ import de.bjusystems.vdrmanager.utils.svdrp.SvdrpEvent; /** * This class is used for showing what's current running on all channels - * + * * @author bju */ public class EpgDetailsActivity extends ActionBarActivity implements - OnClickListener, OnPageChangeListener { + OnClickListener, OnPageChangeListener, View.OnLongClickListener { - public static final String TAG = "EpgDetailsActivity"; + public static final String TAG = "EpgDetailsActivity"; - public static String IMDB_BASE_URL = "http://%s"; + public static String IMDB_BASE_URL = "http://%s"; - public static String IMDB_URL_QUERY = "/find?s=tt&q=%s"; + public static String IMDB_URL_QUERY = "/find?s=tt&q=%s"; - public static String OMDB_URL = "http://www.omdb.org/search?search[text]=%s"; + public static String OMDB_URL = "http://www.omdb.org/search?search[text]=%s"; - private static final String IMDB_URL_ENCODING = "UTF-8"; + private static final String IMDB_URL_ENCODING = "UTF-8"; - private static final String OMDB_URL_ENCODING = "UTF-8"; + private static final String OMDB_URL_ENCODING = "UTF-8"; - private static final String TMDB_URL_ENCODING = "UTF-8"; + private static final String TMDB_URL_ENCODING = "UTF-8"; - public static String TMDB_URL = "http://www.themoviedb.org/search?search=%s"; + public static String TMDB_URL = "http://www.themoviedb.org/search?search=%s"; - private String highlight = null; + private String highlight = null; - // private Event cEvent; + // private Event cEvent; - // private ImageView state; + // private ImageView state; - private boolean modifed = false; + private boolean modifed = false; - // private int current; + // private int current; - private ViewPager pager; + private ViewPager pager; - private Adapter adapter; + private Adapter adapter; - // private Timerable timerable = null; + @Override + public boolean onLongClick(View v) { + if (v.getId() == R.id.epg_event_create_timer) { + final Event cEvent = epgs.get(pager.getCurrentItem()); + if (getTimer(cEvent) != null) { + say(R.string.timer_already_exists); + return true; + } - class Adapter extends PagerAdapter implements TitleProvider { + final Timer timer = new Timer(cEvent); + final CreateTimerTask task = new CreateTimerTask( + EpgDetailsActivity.this, timer) { + boolean error = false; + @Override + public void svdrpEvent(final SvdrpEvent event, Throwable th) { + if(event == SvdrpEvent.ERROR){ + error = true; + } + super.svdrpEvent(event, th); + } - public Adapter() { + @Override + public void finished(SvdrpEvent event) { + modifed = true; + EpgCache.CACHE.remove(timer + .getChannelId()); + if(error == false && event == SvdrpEvent.FINISHED_SUCCESS) { + say(R.string.timer_created); + } + } + }; + task.start(); + return true; - } - public String getTitle(int position) { - return epgs.get(position).getChannelName(); - } + } + return false; + } - public int getCount() { - return epgs.size(); - } + // private Timerable timerable = null; - public Object instantiateItem(View pager, int position) { - View view = getLayoutInflater().inflate(R.layout.epg_detail, null); - // Event e = epgs.get(position); - publishEPG(view, position); - ((ViewPager) pager).addView(view, 0); + class Adapter extends PagerAdapter implements TitleProvider { - return view; - } + public Adapter() { - public void destroyItem(View pager, int position, Object view) { - ((ViewPager) pager).removeView((View) view); - } + } - public boolean isViewFromObject(View view, Object object) { - return view.equals(object); - } + public String getTitle(int position) { + return epgs.get(position).getChannelName(); + } - public void finishUpdate(View view) { - } + public int getCount() { + return epgs.size(); + } - public void restoreState(Parcelable p, ClassLoader c) { - } + public Object instantiateItem(View pager, int position) { + View view = getLayoutInflater().inflate(R.layout.epg_detail, null); + // Event e = epgs.get(position); + publishEPG(view, position); + ((ViewPager) pager).addView(view, 0); - public Parcelable saveState() { - return null; - } + return view; + } - public void startUpdate(View view) { - } - } + public void destroyItem(View pager, int position, Object view) { + ((ViewPager) pager).removeView((View) view); + } - @Override - protected void onCreate(final Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - getSupportActionBar().setHomeButtonEnabled(true); - // requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); + public boolean isViewFromObject(View view, Object object) { + return view.equals(object); + } - Intent i = getIntent(); + public void finishUpdate(View view) { + } - highlight = i.getStringExtra(Intents.HIGHLIGHT); - final int preselect = i.getIntExtra(Intents.CURRENT_EPG, 0); + public void restoreState(Parcelable p, ClassLoader c) { + } - + public Parcelable saveState() { + return null; + } - // requestWindowFeature(Window.FEATURE_CUSTOM_TITLE); - // getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, - // R.layout.titlebar); + public void startUpdate(View view) { + } + } - // Attach view - setContentView(R.layout.epgdetails); + @Override + protected void onCreate(final Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + getSupportActionBar().setHomeButtonEnabled(true); + // requestWindowFeature(Window.FEATURE_INDETERMINATE_PROGRESS); - // detector = new SimpleGestureFilter(this, this); + Intent i = getIntent(); - // state = (ImageView) findViewById(R.id.epg_timer_state); + highlight = i.getStringExtra(Intents.HIGHLIGHT); + final int preselect = i.getIntExtra(Intents.CURRENT_EPG, 0); - final Event epg = getApp().getCurrentEvent(); - if (epg == null) { - finish(); - } - final Event cEvent = epg; + // requestWindowFeature(Window.FEATURE_CUSTOM_TITLE); + // getWindow().setFeatureInt(Window.FEATURE_CUSTOM_TITLE, + // R.layout.titlebar); - if (epg instanceof Timerable) { - // timerable = (Timerable) cEvent; - } + // Attach view + setContentView(R.layout.epgdetails); - - pager = (ViewPager) findViewById(R.id.viewpager); - pager.setOnPageChangeListener(this); - + // detector = new SimpleGestureFilter(this, this); - new VoidAsyncTask() { + // state = (ImageView) findViewById(R.id.epg_timer_state); - int counter = 0; + final Event epg = getApp().getCurrentEvent(); + if (epg == null) { + finish(); + } - @Override - protected void onPreExecute() { - setProgressBarIndeterminateVisibility(true); - } + final Event cEvent = epg; - @Override - protected Void doInBackground(Void... params) { - // current event - final VdrManagerApp app = (VdrManagerApp) getApplication(); - epgs = app.getCurrentEpgList(); - - if (epgs.isEmpty()) { - epgs.add(cEvent); - return (Void) null; - } - - // for (Event e : epgs) { - // if (epg.equals(e)) { - // break; - //} - //counter++; - //} - - //if (counter == epgs.size()) {// not found? - //epgs.add(0, cEvent); - //counter = 0; - //} - if(preselect < epgs.size()){ - counter = preselect; - } - return (Void) null; - } - - @Override - protected void onPostExecute(Void result) { - adapter = new Adapter(); - pager.setAdapter(adapter); - pager.setCurrentItem(counter); - onPageSelected(counter); - } - }.execute((Void) null); - - } - - private void setState(ImageView view, int res) { - view.setVisibility(View.VISIBLE); - view.setImageResource(res); - } - - private static String encode(String str, String enc) { - try { - return URLEncoder.encode(str, enc); - } catch (Exception ex) { - Log.w(TAG, ex); - return URLEncoder.encode(str); - } - } - - public void publishEPG(final View view, int position) { - - Event event = epgs.get(position); - - Timerable timerable = null; - - if (event instanceof Timerable) { - timerable = (Timerable) event; - } - - view.setTag(event); - // view.setTag(event); - - final EventFormatter formatter = new EventFormatter(event); - - final TextView title = (TextView) view - .findViewById(R.id.epg_detail_title); - String titleText = formatter.getTitle(); - title.setText(Utils.highlight(titleText, highlight)); - // title.setTextSize(TypedValue.COMPLEX_UNIT_PX, title.getTextSize() - // * (float) 1.3); - - ((TextView) view.findViewById(R.id.epg_detail_time)).setText(formatter - .getDate() + " " + formatter.getTime()); - - TextView dura = (TextView) view.findViewById(R.id.epg_detail_duration); - - ((TextView) view.findViewById(R.id.epg_detail_channel)).setText(event - .getChannelName()); - // ((TextView) findViewById(R.id.epg_detail_date)).setText(formatter - // .getLongDate()); - ImageView state = (ImageView) view.findViewById(R.id.epg_timer_state); - if (timerable == null) { - setState(state, R.drawable.timer_none); - } else { - - TimerMatch match = timerable.getTimerMatch(); - - switch (timerable.getTimerState()) { - case Active: - setState(state, Utils.getTimerStateDrawable(match, - R.drawable.timer_active, - R.drawable.timer_active_begin, - R.drawable.timer_active_end, - R.drawable.timer_active_conflict)); - break; - case Inactive: - setState(state, Utils.getTimerStateDrawable(match, - R.drawable.timer_inactive, - R.drawable.timer_inactive_begin, - R.drawable.timer_inactive_end, - R.drawable.timer_inactive)); - break; - case Recording: - setState(state, Utils.getTimerStateDrawable(match, - R.drawable.timer_recording, - R.drawable.timer_recording_begin, - R.drawable.timer_recording_end, - R.drawable.timer_recording_conflict)); - break; - default: - setState(state, R.drawable.timer_none); - } - } - final TextView shortText = (TextView) view - .findViewById(R.id.epg_detail_shorttext); - shortText.setText(Utils.highlight(formatter.getShortText(), highlight)); - - final TextView textView = (TextView) view - .findViewById(R.id.epg_detail_description); - textView.setText(Utils.highlight(formatter.getDescription(), highlight)); - - if (event.getAudio().isEmpty() == false) { - view.findViewById(R.id.audio_block).setVisibility(View.VISIBLE); - final TextView audioTracks = (TextView) view - .findViewById(R.id.epg_detail_audio); - audioTracks.setText(Utils.formatAudio(this, event.getAudio())); - } else { - view.findViewById(R.id.audio_block).setVisibility(View.GONE); - } - - TextView contentView = ((TextView) view - .findViewById(R.id.epg_detail_cats)); - if (event.getContent().length > 0) { - contentView.setVisibility(View.VISIBLE); - contentView - .setText(Utils.getContenString(this, event.getContent())); - } else { - contentView.setVisibility(View.GONE); - } - - // copy color for separator lines - // final int color = textView.getTextColors().getDefaultColor(); - // ((TextView) findViewById(R.id.epg_detail_separator_1)) - // .setBackgroundColor(color); - - int p = Utils.getProgress(event); - - ((ProgressBar) view.findViewById(R.id.epg_detail_progress)) - .setProgress(p); - int dm = Utils.getDuration(event); - if (Utils.isLive(event)) { - int rest = dm - (dm * p / 100); - dura.setText(getString(R.string.epg_duration_template_live, rest, - dm)); - } else { - dura.setText(getString(R.string.epg_duration_template, dm)); - } - - // ((TextView) view.findViewById(R.id.epg_detail_separator_2)) - // .setBackgroundColor(color); - - // register button handler - if (timerable == null) { - view.findViewById(R.id.epg_event_create_timer).setVisibility( - View.GONE); - } else { - setThisAsOnClickListener(view, R.id.epg_event_create_timer); - } - - View b = view.findViewById(R.id.epg_event_imdb); - - if (Preferences.get().isShowImdbButton() == false) { - b.setVisibility(View.GONE); - } else { - b.setVisibility(View.VISIBLE); - b.setOnClickListener(new OnClickListener() { - - public void onClick(View v) { - startFilmDatabaseBrowseIntent( - String.format(IMDB_BASE_URL, Preferences.get() - .getImdbUrl()) - + IMDB_URL_QUERY, view, IMDB_URL_ENCODING); - } - }); - } - - b = view.findViewById(R.id.epg_event_omdb); - - if (Preferences.get().isShowOmdbButton() == false) { - b.setVisibility(View.GONE); - } else { - b.setVisibility(View.VISIBLE); - b.setOnClickListener(new OnClickListener() { - - public void onClick(View v) { - startFilmDatabaseBrowseIntent(OMDB_URL, view, - OMDB_URL_ENCODING); - } - }); - } - - b = view.findViewById(R.id.epg_event_tmdb); - - if (Preferences.get().isShowTmdbButton() == false) { - b.setVisibility(View.GONE); - } else { - b.setVisibility(View.VISIBLE); - b.setOnClickListener(new OnClickListener() { - - public void onClick(View v) { - startFilmDatabaseBrowseIntent(TMDB_URL, view, - TMDB_URL_ENCODING); - } - }); - } - - b = view.findViewById(R.id.epg_event_livetv); - if (Utils.isLive(event) == false - && (event instanceof Recording == false || Preferences.get() - .isEnableRecStream() == false)) { - b.setVisibility(View.GONE); - } else { - b.setVisibility(View.VISIBLE); - setThisAsOnClickListener(b); - } - // setThisAsOnClickListener(view, R.id.epg_event_left); - // setThisAsOnClickListener(view, R.id.epg_event_right); - - // set button text - if (event instanceof Timer) { - // timeButton.setText(R.string.epg_event_create_timer_text); - } else { - // timeButton.setText(R.string.epg_event_modify_timer_text); - } - - } - - private void startFilmDatabaseBrowseIntent(String url, View view, - String encoding) { - final TextView title = (TextView) view - .findViewById(R.id.epg_detail_title); - url = String.format(url, - encode(String.valueOf(title.getText()), encoding)); - Intent i = new Intent(Intent.ACTION_VIEW); - i.setData(Uri.parse(url)); - i.addCategory(Intent.CATEGORY_BROWSABLE); - try { - startActivity(i); - } catch (ActivityNotFoundException anfe) { - Log.w(TAG, anfe); - say(anfe.getLocalizedMessage()); - } - } - - private void setThisAsOnClickListener(View v) { - if (v != null) { - v.setOnClickListener(this); - } - } - - private void setThisAsOnClickListener(View root, int view) { - setThisAsOnClickListener(root.findViewById(view)); - } - - @Override - protected void onResume() { - super.onResume(); - // TODO Check here whether the config has changed for imdb - } - - @Override - protected void onPause() { - super.onPause(); - } - - class Wrapper { - public int id; - public String value; - - public Wrapper(int id) { - this.id = id; - this.value = getString(id); - } - - public String toString() { - return value; - } - } - - public Timer getTimer(Event event) { - if (event instanceof Timer) { - return (Timer) event; - } - if (event instanceof Epg) { - return ((Epg) event).getTimer(); - } - return null; - } - - protected VdrManagerApp getApp() { - final VdrManagerApp app = (VdrManagerApp) getApplication(); - return app; - } - - public void onClick(final View v) { - - final Event cEvent = epgs.get(pager.getCurrentItem()); - - switch (v.getId()) { - case R.id.epg_event_livetv: - if (cEvent instanceof Recording) { - Utils.streamRecording(this, (Recording) cEvent); - } else { - Utils.stream(this, String.valueOf(cEvent.getChannelNumber())); - } - break; - case R.id.epg_event_create_timer: - final ArrayAdapter<Wrapper> ada = new ArrayAdapter<Wrapper>(this, - android.R.layout.simple_dropdown_item_1line); - final Timer timer = getTimer(cEvent); - TimerMatch tm = Utils.getTimerMatch(cEvent, timer); - // remove unneeded menu items - if (timer != null && tm == TimerMatch.Full) { - ada.add(new Wrapper(R.string.epg_item_menu_timer_modify)); - ada.add(new Wrapper(R.string.epg_item_menu_timer_delete)); - if (timer.isEnabled()) { - ada.add(new Wrapper(R.string.epg_item_menu_timer_disable)); - } else { - ada.add(new Wrapper(R.string.epg_item_menu_timer_enable)); - } - } else if (cEvent instanceof Recording) { - ada.add(new Wrapper(R.string.epg_item_menu_timer_delete)); - } else { - - ada.add(new Wrapper(R.string.epg_item_menu_timer_add)); - if (Utils.isLive(cEvent) && (cEvent instanceof Timerable) - && ((Timerable) cEvent).getTimer() == null) { - ada.add(new Wrapper(R.string.epg_item_menu_timer_record)); - } - } - - final Timerable timerable; - - if (cEvent instanceof Timerable) { - timerable = (Timerable) cEvent; - } else { - return; - } - - new AlertDialog.Builder(this) - .setAdapter(ada, new DialogInterface.OnClickListener() { - public void onClick(DialogInterface dialog, int which) { - Wrapper w = ada.getItem(which); - switch (w.id) { - case R.string.epg_item_menu_timer_add: { - getApp().setCurrentTimer( - timerable.createTimer()); - final Intent intent = new Intent(); - intent.setClass(EpgDetailsActivity.this, - TimerDetailsActivity.class); - intent.putExtra(Intents.TIMER_OP, - Intents.ADD_TIMER); - startActivityForResult( - intent, - TimerDetailsActivity.REQUEST_CODE_TIMER_ADD); - break; - } - case R.string.epg_item_menu_timer_modify: { - getApp().setCurrentTimer(timer); - final Intent intent = new Intent(); - intent.setClass(EpgDetailsActivity.this, - TimerDetailsActivity.class); - intent.putExtra(Intents.TIMER_OP, - Intents.EDIT_TIMER); - startActivityForResult( - intent, - TimerDetailsActivity.REQUEST_CODE_TIMER_EDIT); - break; - } - case R.string.epg_item_menu_timer_delete: { - deleteTimer(timer); - break; - } - case R.string.epg_item_menu_timer_enable: - case R.string.epg_item_menu_timer_disable: { - toggleTimer(timer); - break; - } - - case R.string.epg_item_menu_timer_record: { - final Timer timer = new Timer(cEvent); - final CreateTimerTask task = new CreateTimerTask( - EpgDetailsActivity.this, timer) { - @Override - public void finished(SvdrpEvent event) { - modifed = true; - EpgCache.CACHE.remove(timer - .getChannelId()); - say(R.string.recording_started); - } - }; - task.start(); - - } - } - } - }).create()// - .show();// - - break; - // case R.id.epg_event_imdb: - - // break; - - // case R.id.epg_event_share: - // shareEvent(cEvent); - // break; - } - } - - protected void toggleTimer(final Timer timer) { - final ToggleTimerTask task = new ToggleTimerTask(this, timer) { - @Override - public void finished(SvdrpEvent event) { - if (event == SvdrpEvent.FINISHED_SUCCESS) { - TimerState state = timer.getTimerState(); - TimerMatch match = timer.getTimerMatch(); - int res = -1; - if (state == TimerState.Active) { - res = Utils.getTimerStateDrawable(match, - R.drawable.timer_inactive, - R.drawable.timer_inactive_begin, - R.drawable.timer_inactive_end, + if (epg instanceof Timerable) { + // timerable = (Timerable) cEvent; + } + + + pager = (ViewPager) findViewById(R.id.viewpager); + pager.setOnPageChangeListener(this); + + + new VoidAsyncTask() { + + int counter = 0; + + @Override + protected void onPreExecute() { + setProgressBarIndeterminateVisibility(true); + } + + @Override + protected Void doInBackground(Void... params) { + // current event + final VdrManagerApp app = (VdrManagerApp) getApplication(); + epgs = app.getCurrentEpgList(); + + if (epgs.isEmpty()) { + epgs.add(cEvent); + return (Void) null; + } + + // for (Event e : epgs) { + // if (epg.equals(e)) { + // break; + //} + //counter++; + //} + + //if (counter == epgs.size()) {// not found? + //epgs.add(0, cEvent); + //counter = 0; + //} + if (preselect < epgs.size()) { + counter = preselect; + } + return (Void) null; + } + + @Override + protected void onPostExecute(Void result) { + adapter = new Adapter(); + pager.setAdapter(adapter); + pager.setCurrentItem(counter); + onPageSelected(counter); + } + }.execute((Void) null); + + } + + private void setState(ImageView view, int res) { + view.setVisibility(View.VISIBLE); + view.setImageResource(res); + } + + private static String encode(String str, String enc) { + try { + return URLEncoder.encode(str, enc); + } catch (Exception ex) { + Log.w(TAG, ex); + return URLEncoder.encode(str); + } + } + + public void publishEPG(final View view, int position) { + + Event event = epgs.get(position); + + Timerable timerable = null; + + if (event instanceof Timerable) { + timerable = (Timerable) event; + } + + view.setTag(event); + // view.setTag(event); + + final EventFormatter formatter = new EventFormatter(event); + + final TextView title = (TextView) view + .findViewById(R.id.epg_detail_title); + String titleText = formatter.getTitle(); + title.setText(Utils.highlight(titleText, highlight)); + // title.setTextSize(TypedValue.COMPLEX_UNIT_PX, title.getTextSize() + // * (float) 1.3); + + ((TextView) view.findViewById(R.id.epg_detail_time)).setText(formatter + .getDate() + " " + formatter.getTime()); + + TextView dura = (TextView) view.findViewById(R.id.epg_detail_duration); + + ((TextView) view.findViewById(R.id.epg_detail_channel)).setText(event + .getChannelName()); + // ((TextView) findViewById(R.id.epg_detail_date)).setText(formatter + // .getLongDate()); + ImageView state = (ImageView) view.findViewById(R.id.epg_timer_state); + if (timerable == null) { + setState(state, R.drawable.timer_none); + } else { + + TimerMatch match = timerable.getTimerMatch(); + + switch (timerable.getTimerState()) { + case Active: + setState(state, Utils.getTimerStateDrawable(match, + R.drawable.timer_active, + R.drawable.timer_active_begin, + R.drawable.timer_active_end, + R.drawable.timer_active_conflict)); + break; + case Inactive: + setState(state, Utils.getTimerStateDrawable(match, + R.drawable.timer_inactive, + R.drawable.timer_inactive_begin, + R.drawable.timer_inactive_end, + R.drawable.timer_inactive)); + break; + case Recording: + setState(state, Utils.getTimerStateDrawable(match, + R.drawable.timer_recording, + R.drawable.timer_recording_begin, + R.drawable.timer_recording_end, + R.drawable.timer_recording_conflict)); + break; + default: + setState(state, R.drawable.timer_none); + } + } + final TextView shortText = (TextView) view + .findViewById(R.id.epg_detail_shorttext); + shortText.setText(Utils.highlight(formatter.getShortText(), highlight)); + + final TextView textView = (TextView) view + .findViewById(R.id.epg_detail_description); + textView.setText(Utils.highlight(formatter.getDescription(), highlight)); + + if (event.getAudio().isEmpty() == false) { + view.findViewById(R.id.audio_block).setVisibility(View.VISIBLE); + final TextView audioTracks = (TextView) view + .findViewById(R.id.epg_detail_audio); + audioTracks.setText(Utils.formatAudio(this, event.getAudio())); + } else { + view.findViewById(R.id.audio_block).setVisibility(View.GONE); + } + + TextView contentView = ((TextView) view + .findViewById(R.id.epg_detail_cats)); + if (event.getContent().length > 0) { + contentView.setVisibility(View.VISIBLE); + contentView + .setText(Utils.getContenString(this, event.getContent())); + } else { + contentView.setVisibility(View.GONE); + } + + // copy color for separator lines + // final int color = textView.getTextColors().getDefaultColor(); + // ((TextView) findViewById(R.id.epg_detail_separator_1)) + // .setBackgroundColor(color); + + int p = Utils.getProgress(event); + + ((ProgressBar) view.findViewById(R.id.epg_detail_progress)) + .setProgress(p); + int dm = Utils.getDuration(event); + if (Utils.isLive(event)) { + int rest = dm - (dm * p / 100); + dura.setText(getString(R.string.epg_duration_template_live, rest, + dm)); + } else { + dura.setText(getString(R.string.epg_duration_template, dm)); + } + + // ((TextView) view.findViewById(R.id.epg_detail_separator_2)) + // .setBackgroundColor(color); + + // register button handler + if (timerable == null) { + view.findViewById(R.id.epg_event_create_timer).setVisibility( + View.GONE); + } else { + setThisAsOnClickListener(view, R.id.epg_event_create_timer); + view.findViewById(R.id.epg_event_create_timer).setOnLongClickListener(this); + } + + View b = view.findViewById(R.id.epg_event_imdb); + + if (Preferences.get().isShowImdbButton() == false) { + b.setVisibility(View.GONE); + } else { + b.setVisibility(View.VISIBLE); + b.setOnClickListener(new OnClickListener() { + + public void onClick(View v) { + startFilmDatabaseBrowseIntent( + String.format(IMDB_BASE_URL, Preferences.get() + .getImdbUrl()) + + IMDB_URL_QUERY, view, IMDB_URL_ENCODING); + } + }); + } + + b = view.findViewById(R.id.epg_event_omdb); + + if (Preferences.get().isShowOmdbButton() == false) { + b.setVisibility(View.GONE); + } else { + b.setVisibility(View.VISIBLE); + b.setOnClickListener(new OnClickListener() { + + public void onClick(View v) { + startFilmDatabaseBrowseIntent(OMDB_URL, view, + OMDB_URL_ENCODING); + } + }); + } + + b = view.findViewById(R.id.epg_event_tmdb); + + if (Preferences.get().isShowTmdbButton() == false) { + b.setVisibility(View.GONE); + } else { + b.setVisibility(View.VISIBLE); + b.setOnClickListener(new OnClickListener() { + + public void onClick(View v) { + startFilmDatabaseBrowseIntent(TMDB_URL, view, + TMDB_URL_ENCODING); + } + }); + } + + b = view.findViewById(R.id.epg_event_livetv); + if (Utils.isLive(event) == false + && (event instanceof Recording == false || Preferences.get() + .isEnableRecStream() == false)) { + b.setVisibility(View.GONE); + } else { + b.setVisibility(View.VISIBLE); + setThisAsOnClickListener(b); + } + // setThisAsOnClickListener(view, R.id.epg_event_left); + // setThisAsOnClickListener(view, R.id.epg_event_right); + + // set button text + if (event instanceof Timer) { + // timeButton.setText(R.string.epg_event_create_timer_text); + } else { + // timeButton.setText(R.string.epg_event_modify_timer_text); + } + + } + + private void startFilmDatabaseBrowseIntent(String url, View view, + String encoding) { + final TextView title = (TextView) view + .findViewById(R.id.epg_detail_title); + url = String.format(url, + encode(String.valueOf(title.getText()), encoding)); + Intent i = new Intent(Intent.ACTION_VIEW); + i.setData(Uri.parse(url)); + i.addCategory(Intent.CATEGORY_BROWSABLE); + try { + startActivity(i); + } catch (ActivityNotFoundException anfe) { + Log.w(TAG, anfe); + say(anfe.getLocalizedMessage()); + } + } + + private void setThisAsOnClickListener(View v) { + if (v != null) { + v.setOnClickListener(this); + } + } + + private void setThisAsOnClickListener(View root, int view) { + setThisAsOnClickListener(root.findViewById(view)); + } + + @Override + protected void onResume() { + super.onResume(); + // TODO Check here whether the config has changed for imdb + } + + @Override + protected void onPause() { + super.onPause(); + } + + class Wrapper { + public int id; + public String value; + + public Wrapper(int id) { + this.id = id; + this.value = getString(id); + } + + public String toString() { + return value; + } + } + + public Timer getTimer(Event event) { + if (event instanceof Timer) { + return (Timer) event; + } + if (event instanceof Epg) { + return ((Epg) event).getTimer(); + } + return null; + } + + protected VdrManagerApp getApp() { + final VdrManagerApp app = (VdrManagerApp) getApplication(); + return app; + } + + public void onClick(final View v) { + + final Event cEvent = epgs.get(pager.getCurrentItem()); + + + if (cEvent instanceof Timerable == false) { + return; + } + + final Timerable timerable = (Timerable) cEvent; + + + switch (v.getId()) { + case R.id.epg_event_livetv: + if (cEvent instanceof Recording) { + Utils.streamRecording(this, (Recording) cEvent); + } else { + Utils.stream(this, String.valueOf(cEvent.getChannelNumber())); + } + break; + case R.id.epg_event_create_timer: + final ArrayAdapter<Wrapper> ada = new ArrayAdapter<Wrapper>(this, + android.R.layout.simple_dropdown_item_1line); + final Timer timer = getTimer(cEvent); + TimerMatch tm = Utils.getTimerMatch(cEvent, timer); + // remove unneeded menu items + if (timer != null && tm == TimerMatch.Full) { + ada.add(new Wrapper(R.string.epg_item_menu_timer_modify)); + ada.add(new Wrapper(R.string.epg_item_menu_timer_delete)); + if (timer.isEnabled()) { + ada.add(new Wrapper(R.string.epg_item_menu_timer_disable)); + } else { + ada.add(new Wrapper(R.string.epg_item_menu_timer_enable)); + } + } else if (cEvent instanceof Recording) { + ada.add(new Wrapper(R.string.epg_item_menu_timer_delete)); + } else { + getApp().setCurrentTimer( + timerable.createTimer()); + final Intent intent = new Intent(); + intent.setClass(EpgDetailsActivity.this, + TimerDetailsActivity.class); + intent.putExtra(Intents.TIMER_OP, + Intents.ADD_TIMER); + startActivityForResult( + intent, + TimerDetailsActivity.REQUEST_CODE_TIMER_ADD); + return; + //ada.add(new Wrapper(R.string.epg_item_menu_timer_add)); + //if (Utils.isLive(cEvent) && (cEvent instanceof Timerable) + // && ((Timerable) cEvent).getTimer() == null) { + // ada.add(new Wrapper(R.string.epg_item_menu_timer_record)); + //} + } + + + new AlertDialog.Builder(this) + .setAdapter(ada, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + Wrapper w = ada.getItem(which); + switch (w.id) { + case R.string.epg_item_menu_timer_modify: { + getApp().setCurrentTimer(timer); + final Intent intent = new Intent(); + intent.setClass(EpgDetailsActivity.this, + TimerDetailsActivity.class); + intent.putExtra(Intents.TIMER_OP, + Intents.EDIT_TIMER); + startActivityForResult( + intent, + TimerDetailsActivity.REQUEST_CODE_TIMER_EDIT); + break; + } + case R.string.epg_item_menu_timer_delete: { + deleteTimer(timer); + break; + } + case R.string.epg_item_menu_timer_enable: + case R.string.epg_item_menu_timer_disable: { + toggleTimer(timer); + break; + } + } + } + }).create()// + .show();// + + break; + // case R.id.epg_event_imdb: + + // break; + + // case R.id.epg_event_share: + // shareEvent(cEvent); + // break; + } + } + + protected void toggleTimer(final Timer timer) { + final ToggleTimerTask task = new ToggleTimerTask(this, timer) { + @Override + public void finished(SvdrpEvent event) { + if (event == SvdrpEvent.FINISHED_SUCCESS) { + TimerState state = timer.getTimerState(); + TimerMatch match = timer.getTimerMatch(); + int res = -1; + if (state == TimerState.Active) { + res = Utils.getTimerStateDrawable(match, + R.drawable.timer_inactive, + R.drawable.timer_inactive_begin, + R.drawable.timer_inactive_end, R.drawable.timer_inactive); - } else if (state == TimerState.Inactive) { - res = Utils.getTimerStateDrawable(match, - R.drawable.timer_active, - R.drawable.timer_active_begin, - R.drawable.timer_active_end, + } else if (state == TimerState.Inactive) { + res = Utils.getTimerStateDrawable(match, + R.drawable.timer_active, + R.drawable.timer_active_begin, + R.drawable.timer_active_end, R.drawable.timer_active_conflict); - - } - if (res != -1) { - setState( - (ImageView) findViewById(R.id.epg_timer_state), - res); - } - } - } - }; - task.start(); - } - - private List<Event> epgs = new ArrayList<Event>(); - - protected void say(int res) { - Toast.makeText(this, res, Toast.LENGTH_SHORT).show(); - } - - protected void say(String msg) { - Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); - } - - @Override - public final boolean onCreateOptionsMenu( - Menu menu) { - super.onCreateOptionsMenu(menu); - - final MenuInflater inflater = getMenuInflater(); - inflater.inflate(R.menu.epg_details, menu); - - // mShareActionProvider = (ShareActionProvider) - // menu.findItem(R.id.epg_details_menu_share).getActionProvider(); - // mShareActionProvider.setShareIntent(getDefaultShareIntent()); - - return true; - } - - private void shareEvent(Event event) { - Utils.shareEvent(this, event); - } - - @Override - public boolean onOptionsItemSelected( - MenuItem item) { - - Event cEvent = epgs.get(pager.getCurrentItem()); - - if (item.getItemId() == R.id.epg_details_menu_share) { - shareEvent(cEvent); - return true; - } - - if (item.getItemId() == R.id.epg_details_menu_add_to_cal) { - Utils.addCalendarEvent(this, cEvent); - } - - if (item.getItemId() == R.id.epg_details_menu_search_repeat) { - Intent intent = new Intent(this, EpgSearchListActivity.class); - intent.setAction(Intent.ACTION_SEARCH); - intent.putExtra(SearchManager.QUERY, cEvent.getTitle()); - startActivity(intent); - return true; - } - - if (item.getItemId() == R.id.epg_details_menu_switch) { - Utils.switchTo(this, cEvent.getChannelId(), cEvent.getChannelName()); - return true; - } - return super.onOptionsItemSelected(item); - } - - protected void deleteTimer(final Timer timer) { - final DeleteTimerTask task = new DeleteTimerTask(this, timer) { - @Override - public void finished(SvdrpEvent event) { - if (event == SvdrpEvent.FINISHED_SUCCESS) { - setState((ImageView) findViewById(R.id.epg_timer_state), - R.drawable.timer_none); - modifed = true; - EpgCache.CACHE.remove(timer.getChannelId()); - } - } - }; - task.start(); - } - - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - if (resultCode != RESULT_OK) { - return; - } - - // View view = pager.getChildAt(current); - // ImageView state = (ImageView) - // view.findViewById(R.id.epg_timer_state); - - if (requestCode == TimerDetailsActivity.REQUEST_CODE_TIMER_ADD) { - modifed = true; - // setState( - // state, - // Utils.isLive(getApp().getCurrentEvent()) ? - // R.drawable.timer_recording - // : R.drawable.timer_active); - } else if (requestCode == TimerDetailsActivity.REQUEST_CODE_TIMER_EDIT) { - modifed = true; - // ?? - } - adapter.notifyDataSetChanged(); - } - - @Override - public void onBackPressed() { - if (modifed) { - setResult(RESULT_OK); - finish(); - } else { - super.onBackPressed(); - } - } - - public void onPageScrollStateChanged(int state) { - } - - public void onPageScrolled(int position, float positionOffset, - int positionOffsetPixels) { - } - - public void onPageSelected(int position) { - - Event cEvent = epgs.get(position); - String cn = cEvent.getChannelName(); - // View view = pager.getChildAt(arg0); - // state = (ImageView) view.findViewById(R.id.epg_timer_state); - setTitle(getString(R.string.epg_of_a_channel, cn, position + 1, - epgs.size())); - } + + } + if (res != -1) { + setState( + (ImageView) findViewById(R.id.epg_timer_state), + res); + } + } + } + }; + task.start(); + } + + private List<Event> epgs = new ArrayList<Event>(); + + protected void say(int res) { + Toast.makeText(this, res, Toast.LENGTH_SHORT).show(); + } + + protected void say(String msg) { + Toast.makeText(this, msg, Toast.LENGTH_SHORT).show(); + } + + @Override + public final boolean onCreateOptionsMenu( + Menu menu) { + super.onCreateOptionsMenu(menu); + + final MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.epg_details, menu); + + // mShareActionProvider = (ShareActionProvider) + // menu.findItem(R.id.epg_details_menu_share).getActionProvider(); + // mShareActionProvider.setShareIntent(getDefaultShareIntent()); + + return true; + } + + private void shareEvent(Event event) { + Utils.shareEvent(this, event); + } + + @Override + public boolean onOptionsItemSelected( + MenuItem item) { + + Event cEvent = epgs.get(pager.getCurrentItem()); + + if (item.getItemId() == R.id.epg_details_menu_share) { + shareEvent(cEvent); + return true; + } + + if (item.getItemId() == R.id.epg_details_menu_add_to_cal) { + Utils.addCalendarEvent(this, cEvent); + } + + if (item.getItemId() == R.id.epg_details_menu_search_repeat) { + Intent intent = new Intent(this, EpgSearchListActivity.class); + intent.setAction(Intent.ACTION_SEARCH); + intent.putExtra(SearchManager.QUERY, cEvent.getTitle()); + startActivity(intent); + return true; + } + + if (item.getItemId() == R.id.epg_details_menu_switch) { + Utils.switchTo(this, cEvent.getChannelId(), cEvent.getChannelName()); + return true; + } + return super.onOptionsItemSelected(item); + } + + protected void deleteTimer(final Timer timer) { + final DeleteTimerTask task = new DeleteTimerTask(this, timer) { + @Override + public void finished(SvdrpEvent event) { + if (event == SvdrpEvent.FINISHED_SUCCESS) { + setState((ImageView) findViewById(R.id.epg_timer_state), + R.drawable.timer_none); + modifed = true; + EpgCache.CACHE.remove(timer.getChannelId()); + } + } + }; + task.start(); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + if (resultCode != RESULT_OK) { + return; + } + + // View view = pager.getChildAt(current); + // ImageView state = (ImageView) + // view.findViewById(R.id.epg_timer_state); + + if (requestCode == TimerDetailsActivity.REQUEST_CODE_TIMER_ADD) { + modifed = true; + // setState( + // state, + // Utils.isLive(getApp().getCurrentEvent()) ? + // R.drawable.timer_recording + // : R.drawable.timer_active); + } else if (requestCode == TimerDetailsActivity.REQUEST_CODE_TIMER_EDIT) { + modifed = true; + // ?? + } + adapter.notifyDataSetChanged(); + } + + @Override + public void onBackPressed() { + if (modifed) { + setResult(RESULT_OK); + finish(); + } else { + super.onBackPressed(); + } + } + + public void onPageScrollStateChanged(int state) { + } + + public void onPageScrolled(int position, float positionOffset, + int positionOffsetPixels) { + } + + public void onPageSelected(int position) { + + Event cEvent = epgs.get(position); + String cn = cEvent.getChannelName(); + // View view = pager.getChildAt(arg0); + // state = (ImageView) view.findViewById(R.id.epg_timer_state); + setTitle(getString(R.string.epg_of_a_channel, cn, position + 1, + epgs.size())); + } } diff --git a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java index 74cd502..1afab79 100644 --- a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java +++ b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/gui/SvdrpProgressDialog.java @@ -63,7 +63,7 @@ public class SvdrpProgressDialog<T> extends ProgressDialog implements @Override public void svdrpEvent(SvdrpEvent event, Throwable t) { - progress.dismiss(); + this.svdrpEvent(event); Utils.say(getContext(), t.getLocalizedMessage()); } } diff --git a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/tasks/AsyncProgressTask.java b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/tasks/AsyncProgressTask.java index daeb2c7..022b479 100644 --- a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/tasks/AsyncProgressTask.java +++ b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/tasks/AsyncProgressTask.java @@ -5,6 +5,7 @@ import de.bjusystems.vdrmanager.gui.SvdrpProgressDialog; import de.bjusystems.vdrmanager.utils.svdrp.SvdrpAsyncTask; import de.bjusystems.vdrmanager.utils.svdrp.SvdrpClient; import de.bjusystems.vdrmanager.utils.svdrp.SvdrpEvent; +import de.bjusystems.vdrmanager.utils.svdrp.SvdrpException; public abstract class AsyncProgressTask<Result> { @@ -18,6 +19,7 @@ public abstract class AsyncProgressTask<Result> { @Override public void svdrpEvent(final SvdrpEvent event) { super.svdrpEvent(event); + AsyncProgressTask.this.svdrpEvent(event); switch (event) { case ABORTED: case CONNECT_ERROR: @@ -31,6 +33,12 @@ public abstract class AsyncProgressTask<Result> { break; } } + + @Override + public void svdrpEvent(SvdrpEvent event, Throwable th) { + super.svdrpEvent(event,th); + AsyncProgressTask.this.svdrpEvent(event, th); + } } Activity activity; @@ -59,5 +67,15 @@ public abstract class AsyncProgressTask<Result> { task.run(); } - public abstract void finished(SvdrpEvent event); + public void svdrpEvent(final SvdrpEvent event){ + + } + + + public void svdrpEvent(final SvdrpEvent event, Throwable th){ + + } + + + public abstract void finished(SvdrpEvent event); } diff --git a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java index 8daab75..f672791 100644 --- a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java +++ b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SetTimerClient.java @@ -86,5 +86,6 @@ public class SetTimerClient extends SvdrpClient<Timer> { public int getProgressTextId() { return R.string.progress_timer_save; } + } diff --git a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java index 0198bb0..6efee8b 100644 --- a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java +++ b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpClient.java @@ -462,7 +462,7 @@ public abstract class SvdrpClient<Result> { msg = line; } disconnect(); - informListener(SvdrpEvent.ERROR, new SvdrpException(msg)); + informListener(SvdrpEvent.ERROR, new SvdrpException(SvdrpEvent.ERROR,msg)); break; } diff --git a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpException.java b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpException.java index fe0824e..8deb8e1 100644 --- a/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpException.java +++ b/vdrmanager/app/src/main/java/de/bjusystems/vdrmanager/utils/svdrp/SvdrpException.java @@ -20,9 +20,7 @@ public class SvdrpException extends Exception { public SvdrpException(SvdrpEvent event, String text) { super(text); - } - public SvdrpException(String text) { - this(null,text); + this.event = event; } public SvdrpException(String text, Throwable cause) { diff --git a/vdrmanager/app/src/main/res/values/strings.xml b/vdrmanager/app/src/main/res/values/strings.xml index 0fd460c..2c28997 100644 --- a/vdrmanager/app/src/main/res/values/strings.xml +++ b/vdrmanager/app/src/main/res/values/strings.xml @@ -190,6 +190,9 @@ <string name="timer_default_primary_limit_summary">Default primary limit</string> <string name="timer_default_lifetime_title">Default lifetime</string> <string name="timer_default_lifetime_summary">Default lifetime</string> + <string name="timer_already_exists">Timer already defined.</string> + <string name="timer_created">Timer created</string> + <!-- GUI --> <string name="gui_preferences">GUI Settings</string> @@ -536,4 +539,5 @@ What do you want to do?</string> <string name="menu_remapback">\'Back\' is \'Back\' HITK</string> <string name="remapback_hint">Longpress on Back Button to leave the remote.</string> <string name="not_yet_implemented">Not Yet Implemented</string> + <string name="timer_error" >Can not create timer: %1$s</string> </resources>
\ No newline at end of file diff --git a/vdrmanager/build/intermediates/dex-cache/cache.xml b/vdrmanager/build/intermediates/dex-cache/cache.xml index 4d848d6..9d35073 100644 --- a/vdrmanager/build/intermediates/dex-cache/cache.xml +++ b/vdrmanager/build/intermediates/dex-cache/cache.xml @@ -2,60 +2,88 @@ <items version="2" > <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars/classes.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-android-4.47.jar" jumboMode="false" revision="22.0.1" - sha1="3499ceba05ca1f6037c6a2fad73df8f636224a28"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-df270354a468f494c80ff7db6414859872a1cdc5.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/libs/slf4j-android-1.6.1-RC1.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-android-4.47.jar" + jumboMode="false" + revision="21.1.2" + 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/libs/ormlite-core-4.47.jar" + jumboMode="false" + revision="21.1.2" + 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/libs/ormlite-core-4.47.jar" jumboMode="false" revision="22.0.1" + 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/appcompat-v7/21.0.0/jars/classes.jar" + jumboMode="false" + revision="21.1.2" + sha1="95fd37732ec852e99f07eeb516a3650172f1d136"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-95de545bde6ed05eabed2ed644a938b5a39aef95.jar" /> + </item> + <item + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/slf4j-android-1.6.1-RC1.jar" + jumboMode="false" + revision="21.1.2" sha1="a0b527e8aabcc1f1e97d1674dc3f4f0794ec5df1"> <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/svdrp4j-1.1.0-SNAPSHOT.jar" jumboMode="false" - revision="22.0.1" + revision="21.1.2" 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="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/classes.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/slf4j-android-1.6.1-RC1.jar" jumboMode="false" revision="22.0.1" - sha1="2c91c949a45a21cdecf26e03951e46c7beec9ad8"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-dd9d53acfa94b9d3ce7c22e7af21024539551df4.jar" /> + sha1="a0b527e8aabcc1f1e97d1674dc3f4f0794ec5df1"> + <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="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar" + jar="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.0/support-annotations-21.0.0.jar" jumboMode="false" - revision="22.0.1" - sha1="4b74cefe1f0c1b819e7260c8627a14674e37fd35"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.3-d707f71375a78f647fb59424f7cb18d5bb6767ff.jar" /> + revision="21.1.2" + sha1="1a578b9607b36266c63d43a4fa0ab5664dbe911e"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.0-4b1246a750c524481c2f504854994ea0e029605c.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/svdrp4j-1.1.0-SNAPSHOT.jar" jumboMode="false" revision="22.0.1" - sha1="c72f9ed54d8a8bab3fbf56da2b358308a67899a4"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-android-4.47-cd582e76513b150a799d72777f8ce54c8cef042c.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="/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/21.0.0/jars/classes.jar" jumboMode="false" - revision="22.0.1" - sha1="e11abddd1e9c2053a92133fa83f78f7bedb820a9"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-core-4.47-f4351fd8956d1b69c8e44b91acc06d6bd235d5f2.jar" /> + revision="21.1.2" + sha1="686344a780033e4ba22b926cd225f8d4941247e6"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-acb188962163b46e4214b360fb4cbccc68f17858.jar" /> </item> <item - jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.3/jars/libs/internal_impl-21.0.3.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/support-v4/21.0.0/jars/libs/internal_impl-21.0.0.jar" jumboMode="false" - revision="22.0.1" - sha1="01ec05bfbafcc07646ba813000bf2ef11742dd03"> - <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.3-645be6d760595dd3c5cc9b37064967e8925d69e4.jar" /> + revision="21.1.2" + sha1="1609e6d42d0480b0f4188e2c29f75388fa12a8f0"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.0-83fce4df92e18416e729f641ac48c8fa01b50cdd.jar" /> </item> </items> diff --git a/vdrmanager/build/intermediates/gradle_project_sync_data.bin b/vdrmanager/build/intermediates/gradle_project_sync_data.bin Binary files differindex c30c6a1..ada083f 100644 --- a/vdrmanager/build/intermediates/gradle_project_sync_data.bin +++ b/vdrmanager/build/intermediates/gradle_project_sync_data.bin diff --git a/vdrmanager/local.properties b/vdrmanager/local.properties index 5f6dd62..767b935 100644 --- a/vdrmanager/local.properties +++ b/vdrmanager/local.properties @@ -7,5 +7,5 @@ # Location of the SDK. This is only used by Gradle. # For customization when using a Version Control System, please read the # header note. -#Sun Sep 06 19:57:17 CEST 2015 +#Sun Oct 18 22:26:39 CEST 2015 sdk.dir=/opt/android-sdk-update-manager |