diff options
| -rw-r--r-- | vdrmanager/.gradle/2.2.1/taskArtifacts/cache.properties.lock | bin | 17 -> 17 bytes | |||
| -rw-r--r-- | vdrmanager/.gradle/2.2.1/taskArtifacts/fileHashes.bin | bin | 272775 -> 445238 bytes | |||
| -rw-r--r-- | vdrmanager/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin | bin | 6881913 -> 6984941 bytes | |||
| -rw-r--r-- | vdrmanager/.gradle/2.2.1/taskArtifacts/outputFileStates.bin | bin | 20342 -> 21482 bytes | |||
| -rw-r--r-- | vdrmanager/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin | bin | 97713 -> 111615 bytes | |||
| -rw-r--r-- | vdrmanager/.idea/libraries/support_v4_21_0_3.xml | 2 | ||||
| -rw-r--r-- | vdrmanager/.idea/vcs.xml | 2 | ||||
| -rw-r--r-- | vdrmanager/.idea/workspace.xml | 351 | ||||
| -rw-r--r-- | vdrmanager/app/app.iml | 8 | ||||
| -rw-r--r-- | vdrmanager/build/intermediates/dex-cache/cache.xml | 46 | ||||
| -rw-r--r-- | vdrmanager/build/intermediates/gradle_project_sync_data.bin | bin | 582 -> 582 bytes | |||
| -rw-r--r-- | vdrmanager/local.properties | 10 | ||||
| -rw-r--r-- | vdrmanager/vdrmanager.iml | 2 |
13 files changed, 194 insertions, 227 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 401cd0b..e100554 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 039f41e..a3c23c3 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 45f993f..9d4c937 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 319ffed..7f4a29b 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 fc1d917..c1727ba 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/support_v4_21_0_3.xml b/vdrmanager/.idea/libraries/support_v4_21_0_3.xml index a565dfa..93b0bc7 100644 --- a/vdrmanager/.idea/libraries/support_v4_21_0_3.xml +++ b/vdrmanager/.idea/libraries/support_v4_21_0_3.xml @@ -1,9 +1,9 @@ <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/libs/internal_impl-21.0.3.jar!/" /> <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> diff --git a/vdrmanager/.idea/vcs.xml b/vdrmanager/.idea/vcs.xml index 6564d52..94a25f7 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="" vcs="" /> + <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 1fec3e0..a3337ad 100644 --- a/vdrmanager/.idea/workspace.xml +++ b/vdrmanager/.idea/workspace.xml @@ -1,12 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> - <component name="AndroidLayouts"> - <shared> - <config /> - </shared> - </component> <component name="ChangeListManager"> - <list default="true" id="d01984c8-1712-4f87-89ab-4c421ed02b94" name="Default" comment="" /> + <list default="true" id="b67c73a6-38b8-40ea-a024-48a0a359d6d1" name="Default" comment=""> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/ColoredButton.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesome.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/FontAwesomeButton.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/remote/HITK.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/LruCache.java" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/layout/edit_remote_key.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/red_button.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/menu/remote_menu.xml" /> + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/roundedbutton.xml" /> + </list> <ignored path="vdrmanager.iws" /> <ignored path=".idea/workspace.xml" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> @@ -21,59 +27,14 @@ <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="AbstractSettingsActivity.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/AbstractSettingsActivity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="BackupSettingsActivity.java" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/BackupSettingsActivity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="88" column="15" selection-start-line="88" selection-start-column="15" selection-end-line="88" selection-end-column="15" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="EpgDetailsActivity.java" pinned="false" current-in-tab="true"> - <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.85634977"> - <caret line="497" column="4" selection-start-line="497" selection-start-column="4" selection-end-line="497" selection-end-column="4" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="ActionBarActivity.class" pinned="false" current-in-tab="false"> - <entry file="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars/classes.jar!/android/support/v7/app/ActionBarActivity.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-6.96"> - <caret line="28" column="50" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" /> - <folding /> - </state> - </provider> - </entry> - </file> - </leaf> + <leaf /> + </component> + <component name="Git.Settings"> + <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" /> </component> <component name="GradleLocalSettings"> <option name="availableProjects"> @@ -1108,7 +1069,7 @@ </option> <option name="modificationStamps"> <map> - <entry key="$PROJECT_DIR$" value="4297912713317" /> + <entry key="$PROJECT_DIR$" value="4301554936958" /> </map> </option> <option name="projectBuildClasspath"> @@ -1292,59 +1253,6 @@ <option name="name" value="app" /> <option name="projectBuildClasspath"> <list> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-model-core-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-resources-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-ui-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/ant-1.9.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/ant-launcher-1.9.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-base-services-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-tooling-api-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-base-services-groovy-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-cli-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-messaging-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-model-groovy-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-open-api-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-launcher-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-docs-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-wrapper-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-core-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/groovy-all-2.3.6.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/gradle-native-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-platform-native-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-language-java-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/ant-antlr-1.9.3.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-code-quality-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-build-comparison-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-platform-jvm-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-javascript-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-plugins-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-reporting-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-cunit-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-ear-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-maven-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-language-native-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-scala-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-language-jvm-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-announce-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-platform-base-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-resources-http-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-ivy-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-sonar-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-jacoco-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-plugin-development-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-jetty-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-publish-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-dependency-management-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-build-init-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-antlr-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-language-groovy-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-diagnostics-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-ide-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/ivy-2.2.0.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-osgi-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-signing-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-plugin-use-2.2.1.jar" /> - <option value="$APPLICATION_HOME_DIR$/gradle/gradle-2.2.1/lib/plugins/gradle-ide-native-2.2.1.jar" /> <option value="$PROJECT_DIR$/buildSrc/src/main/java" /> <option value="$PROJECT_DIR$/buildSrc/src/main/groovy" /> </list> @@ -1369,11 +1277,11 @@ <order /> </component> <component name="ProjectFrameBounds"> - <option name="y" value="-17" /> + <option name="y" value="39" /> <option name="width" value="3200" /> - <option name="height" value="1817" /> + <option name="height" value="1761" /> </component> - <component name="ProjectLevelVcsManager" settingsEditedManually="false"> + <component name="ProjectLevelVcsManager" settingsEditedManually="true"> <OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Remove" /> <OptionsSetting value="true" id="Checkout" /> @@ -1384,8 +1292,8 @@ <ConfirmationsSetting value="0" id="Remove" /> </component> <component name="ProjectView"> - <navigator currentView="AndroidView" proportions="" version="1"> - <flattenPackages AndroidView="true" /> + <navigator currentView="PackagesPane" proportions="" version="1"> + <flattenPackages PackagesPane="true" /> <showMembers /> <showModules /> <showLibraryContents /> @@ -1396,7 +1304,7 @@ <sortByType /> </navigator> <panes> - <pane id="ProjectPane" /> + <pane id="Scope" /> <pane id="AndroidView"> <subPane> <PATH> @@ -1405,28 +1313,65 @@ <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> </PATH_ELEMENT> </PATH> + </subPane> + </pane> + <pane id="PackagesPane"> + <subPane> <PATH> <PATH_ELEMENT> <option name="myItemId" value="vdrmanager" /> - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> + <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.android.tools.idea.navigator.nodes.AndroidModuleNode" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PackageViewModuleNode" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </pane> + <pane id="ProjectPane"> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="vdrmanager" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </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> + <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> </subPane> </pane> - <pane id="PackagesPane" /> <pane id="Scratches" /> - <pane id="Scope" /> </panes> </component> <component name="PropertiesComponent"> <property name="recentsLimit" value="5" /> - <property name="settings.editor.selected.configurable" value="preferences.keymap" /> + <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="" /> + <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.splitter.proportion" value="0.2" /> - <property name="SearchEverywhereHistoryKey" value="Activ	PSI	JAVA://de.bjusystems.vdrmanager.backup.AbstractSettingsActivity" /> <property name="FullScreen" value="false" /> </component> <component name="RunManager" selected="Android Application.app"> @@ -1448,10 +1393,45 @@ <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="SELECTED_MATRIX_CONFIGURATION_ID" value="0" /> - <option name="SELECTED_CLOUD_PROJECT_ID" value="" /> - <option name="IS_VALID_CLOUD_SELECTION" value="false" /> - <option name="INVALID_CLOUD_SELECTION_ERROR" value="" /> + <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" /> + <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> + <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" /> + <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" /> + <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" /> + <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" /> + <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" /> + <method /> + </configuration> + <configuration default="true" type="AndroidTestRunConfigurationType" factoryName="Android Tests"> + <module name="" /> + <option name="TESTING_TYPE" value="0" /> + <option name="INSTRUMENTATION_RUNNER_CLASS" value="" /> + <option name="METHOD_NAME" value="" /> + <option name="CLASS_NAME" value="" /> + <option name="PACKAGE_NAME" value="" /> + <option name="TARGET_SELECTION_MODE" value="EMULATOR" /> + <option name="USE_LAST_SELECTED_DEVICE" value="false" /> + <option name="PREFERRED_AVD" value="" /> + <option name="USE_COMMAND_LINE" value="true" /> + <option name="COMMAND_LINE" value="" /> + <option name="WIPE_USER_DATA" value="false" /> + <option name="DISABLE_BOOT_ANIMATION" value="false" /> + <option name="NETWORK_SPEED" value="full" /> + <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="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" /> + <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" /> + <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> + <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" /> + <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" /> + <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" /> + <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" /> + <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" /> <method /> </configuration> <configuration default="true" type="Application" factoryName="Application"> @@ -1469,6 +1449,22 @@ <envs /> <method /> </configuration> + <configuration default="true" type="GradleRunConfiguration" factoryName="Gradle"> + <ExternalSystemSettings> + <option name="executionName" /> + <option name="externalProjectPath" /> + <option name="externalSystemIdString" value="GRADLE" /> + <option name="scriptParameters" /> + <option name="taskDescriptions"> + <list /> + </option> + <option name="taskNames"> + <list /> + </option> + <option name="vmOptions" /> + </ExternalSystemSettings> + <method /> + </configuration> <configuration default="true" type="JUnit" factoryName="JUnit"> <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> <module name="" /> @@ -1490,6 +1486,11 @@ <patterns /> <method /> </configuration> + <configuration default="true" type="JarApplication" factoryName="JAR Application"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="idea" /> + <envs /> + <method /> + </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> @@ -1544,10 +1545,15 @@ <option name="CLEAR_LOGCAT" value="false" /> <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" /> <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" /> - <option name="SELECTED_MATRIX_CONFIGURATION_ID" value="0" /> - <option name="SELECTED_CLOUD_PROJECT_ID" value="" /> - <option name="IS_VALID_CLOUD_SELECTION" value="false" /> - <option name="INVALID_CLOUD_SELECTION_ERROR" value="" /> + <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" /> + <option name="SELECTED_CLOUD_DEVICE_PROJECT_ID" value="" /> + <option name="IS_VALID_CLOUD_MATRIX_SELECTION" value="false" /> + <option name="INVALID_CLOUD_MATRIX_SELECTION_ERROR" value="" /> + <option name="IS_VALID_CLOUD_DEVICE_SELECTION" value="false" /> + <option name="INVALID_CLOUD_DEVICE_SELECTION_ERROR" value="" /> + <option name="CLOUD_DEVICE_SERIAL_NUMBER" value="" /> <method /> </configuration> <list size="1"> @@ -1572,43 +1578,43 @@ </component> <component name="TaskManager"> <task active="true" id="Default" summary="Default task"> - <changelist id="d01984c8-1712-4f87-89ab-4c421ed02b94" name="Default" comment="" /> - <created>1433113941782</created> + <changelist id="b67c73a6-38b8-40ea-a024-48a0a359d6d1" name="Default" comment="" /> + <created>1433851748472</created> <option name="number" value="Default" /> - <updated>1433113941782</updated> + <updated>1433851748472</updated> </task> <servers /> </component> <component name="ToolWindowManager"> - <frame x="0" y="-17" width="3200" height="1817" extended-state="6" /> + <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.3299298" sideWeight="0.5" order="2" 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="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.16308725" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.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="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.24984045" sideWeight="0.5" order="1" 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="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.24967866" 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="Run" active="false" anchor="bottom" 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="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.27859896" sideWeight="0.5" order="0" 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="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="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="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32993197" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> + <window_info id="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" /> </layout> </component> <component name="Vcs.Log.UiProperties"> @@ -1623,80 +1629,35 @@ <option name="myLimit" value="2678400000" /> </component> <component name="XDebuggerManager"> - <breakpoint-manager> - <breakpoints> - <line-breakpoint enabled="true" type="java-line"> - <url>file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/gui/EpgDetailsActivity.java</url> - <line>506</line> - <properties /> - </line-breakpoint> - </breakpoints> - <option name="time" value="1" /> - </breakpoint-manager> + <breakpoint-manager /> <watches-manager /> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/AbstractSettingsActivity.java"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0"> - <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" /> - <folding /> + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/BackupSettingsActivity.java"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/LruCache.java"> <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 /> + <caret line="70" column="13" selection-start-line="70" selection-start-column="13" selection-end-line="70" selection-end-column="13" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/AbstractSettingsActivity.java"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/LruCache.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" /> - <folding /> + <state vertical-scroll-proportion="-0.021333333"> + <caret line="87" column="7" selection-start-line="87" selection-start-column="7" selection-end-line="87" selection-end-column="7" /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/BackupSettingsActivity.java"> + <entry file="file://$PROJECT_DIR$/app/src/main/java/de/androvdr/widget/AnimatedTextView.java"> <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/backup/AbstractSettingsActivity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="36" column="17" selection-start-line="36" selection-start-column="17" selection-end-line="36" selection-end-column="17" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/app/src/main/java/de/bjusystems/vdrmanager/backup/BackupSettingsActivity.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.0"> - <caret line="88" column="15" selection-start-line="88" selection-start-column="15" selection-end-line="88" selection-end-column="15" /> - <folding /> - </state> - </provider> - </entry> - <entry file="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars/classes.jar!/android/support/v7/app/ActionBarActivity.class"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-6.96"> - <caret line="28" column="50" selection-start-line="28" selection-start-column="50" selection-end-line="28" selection-end-column="50" /> - <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.85634977"> - <caret line="497" column="4" selection-start-line="497" selection-start-column="4" selection-end-line="497" selection-end-column="4" /> - <folding /> + <caret line="13" column="13" selection-start-line="13" selection-start-column="13" selection-end-line="13" selection-end-column="13" /> </state> </provider> </entry> diff --git a/vdrmanager/app/app.iml b/vdrmanager/app/app.iml index fae7fb5..c7a01b5 100644 --- a/vdrmanager/app/app.iml +++ b/vdrmanager/app/app.iml @@ -12,10 +12,12 @@ <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" /> <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" /> <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" /> - <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" /> <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" /> <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" /> - <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" /> + <afterSyncTasks> + <task>generateDebugAndroidTestSources</task> + <task>generateDebugSources</task> + </afterSyncTasks> <option name="ALLOW_USER_CONFIGURATION" value="false" /> <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" /> <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" /> @@ -24,7 +26,7 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" /> <output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" /> <exclude-output /> diff --git a/vdrmanager/build/intermediates/dex-cache/cache.xml b/vdrmanager/build/intermediates/dex-cache/cache.xml index 73798ed..dddc43f 100644 --- a/vdrmanager/build/intermediates/dex-cache/cache.xml +++ b/vdrmanager/build/intermediates/dex-cache/cache.xml @@ -2,60 +2,60 @@ <items version="2" > <item - jar="/home/lado/StudioProjects/vdrmanager/app/libs/svdrp4j-1.1.0-SNAPSHOT.jar" + jar="/opt/android-sdk-update-manager/extras/android/m2repository/com/android/support/support-annotations/21.0.3/support-annotations-21.0.3.jar" jumboMode="false" revision="22.0.1" - sha1="ab78bd1a6dddd90492477dc828583d298cfc173c"> - <dex dex="/home/lado/StudioProjects/vdrmanager/app/build/intermediates/pre-dexed/debug/svdrp4j-1.1.0-SNAPSHOT-f3cc96e0b66a3ebd8d58cd3a9cb10be54d8b8e25.jar" /> + sha1="4b74cefe1f0c1b819e7260c8627a14674e37fd35"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.3-d707f71375a78f647fb59424f7cb18d5bb6767ff.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="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-core-4.47.jar" jumboMode="false" revision="22.0.1" - sha1="4b74cefe1f0c1b819e7260c8627a14674e37fd35"> - <dex dex="/home/lado/StudioProjects/vdrmanager/app/build/intermediates/pre-dexed/debug/support-annotations-21.0.3-d707f71375a78f647fb59424f7cb18d5bb6767ff.jar" /> + sha1="e11abddd1e9c2053a92133fa83f78f7bedb820a9"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-core-4.47-f4351fd8956d1b69c8e44b91acc06d6bd235d5f2.jar" /> </item> <item - jar="/home/lado/StudioProjects/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.3/jars/libs/internal_impl-21.0.3.jar" jumboMode="false" revision="22.0.1" - sha1="e11abddd1e9c2053a92133fa83f78f7bedb820a9"> - <dex dex="/home/lado/StudioProjects/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-core-4.47-5406c90fa031ce1303865c5cf80447ba25b887dc.jar" /> + sha1="01ec05bfbafcc07646ba813000bf2ef11742dd03"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.3-645be6d760595dd3c5cc9b37064967e8925d69e4.jar" /> </item> <item - jar="/home/lado/StudioProjects/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/slf4j-android-1.6.1-RC1.jar" jumboMode="false" revision="22.0.1" - sha1="3499ceba05ca1f6037c6a2fad73df8f636224a28"> - <dex dex="/home/lado/StudioProjects/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-c0a98b11ea7cd62a46069903bc9c94cc8d15f543.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="/home/lado/StudioProjects/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.3/jars/classes.jar" jumboMode="false" revision="22.0.1" - sha1="01ec05bfbafcc07646ba813000bf2ef11742dd03"> - <dex dex="/home/lado/StudioProjects/vdrmanager/app/build/intermediates/pre-dexed/debug/internal_impl-21.0.3-4adc221ba913afe908e3658b9b09079931d9fe8b.jar" /> + sha1="2c91c949a45a21cdecf26e03951e46c7beec9ad8"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-dd9d53acfa94b9d3ce7c22e7af21024539551df4.jar" /> </item> <item - jar="/home/lado/StudioProjects/vdrmanager/app/libs/slf4j-android-1.6.1-RC1.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/exploded-aar/com.android.support/appcompat-v7/19.1.0/jars/classes.jar" jumboMode="false" revision="22.0.1" - sha1="a0b527e8aabcc1f1e97d1674dc3f4f0794ec5df1"> - <dex dex="/home/lado/StudioProjects/vdrmanager/app/build/intermediates/pre-dexed/debug/slf4j-android-1.6.1-RC1-432ebd29e427bfa66bab36a70efd142a5067e38e.jar" /> + sha1="3499ceba05ca1f6037c6a2fad73df8f636224a28"> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-df270354a468f494c80ff7db6414859872a1cdc5.jar" /> </item> <item - jar="/home/lado/StudioProjects/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/svdrp4j-1.1.0-SNAPSHOT.jar" jumboMode="false" revision="22.0.1" - sha1="2c91c949a45a21cdecf26e03951e46c7beec9ad8"> - <dex dex="/home/lado/StudioProjects/vdrmanager/app/build/intermediates/pre-dexed/debug/classes-b0eb5b9a86cb855b350c7959caf9bc9ed92716f1.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/StudioProjects/vdrmanager/app/libs/ormlite-android-4.47.jar" + jar="/home/lado/development/android/vdr-manager/vdrmanager/app/libs/ormlite-android-4.47.jar" jumboMode="false" revision="22.0.1" sha1="c72f9ed54d8a8bab3fbf56da2b358308a67899a4"> - <dex dex="/home/lado/StudioProjects/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-android-4.47-4b050ab4d24526fdd96166653699e49a1dd2ad87.jar" /> + <dex dex="/home/lado/development/android/vdr-manager/vdrmanager/app/build/intermediates/pre-dexed/debug/ormlite-android-4.47-cd582e76513b150a799d72777f8ce54c8cef042c.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 330d0db..c30c6a1 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 887e350..5f6dd62 100644 --- a/vdrmanager/local.properties +++ b/vdrmanager/local.properties @@ -1,7 +1,11 @@ -## This file must *NOT* be checked into Version Control Systems, +## This file is automatically generated by Android Studio. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. # # Location of the SDK. This is only used by Gradle. -# -#Sun May 03 19:59:27 CEST 2015 +# For customization when using a Version Control System, please read the +# header note. +#Sun Sep 06 19:57:17 CEST 2015 sdk.dir=/opt/android-sdk-update-manager diff --git a/vdrmanager/vdrmanager.iml b/vdrmanager/vdrmanager.iml index 58bc4f8..82aff01 100644 --- a/vdrmanager/vdrmanager.iml +++ b/vdrmanager/vdrmanager.iml @@ -8,7 +8,7 @@ </configuration> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="true"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> <excludeFolder url="file://$MODULE_DIR$/.gradle" /> |