Skip to content

Commit 7b31604

Browse files
author
Chris Bellew
committed
Moved code back out of library; Added voice control widget; Bunch of other stuff.
1 parent 59d6d39 commit 7b31604

File tree

77 files changed

+758
-569
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+758
-569
lines changed

Voice Control For Plex Library/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

Voice Control For Plex Library/Voice Control For Plex Library.iml

Lines changed: 4 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -6,76 +6,17 @@
66
<option name="GRADLE_PROJECT_PATH" value=":Voice Control For Plex Library" />
77
</configuration>
88
</facet>
9-
<facet type="android" name="Android">
10-
<configuration>
11-
<option name="SELECTED_BUILD_VARIANT" value="debug" />
12-
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
13-
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
14-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="ALLOW_USER_CONFIGURATION" value="false" />
17-
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
18-
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
19-
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
20-
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
21-
<option name="LIBRARY_PROJECT" value="true" />
22-
</configuration>
23-
</facet>
249
</component>
2510
<component name="NewModuleRootManager" inherit-compiler-output="false">
26-
<output url="file://$MODULE_DIR$/build/classes/debug" />
11+
<output url="file://$MODULE_DIR$/build/classes/main" />
12+
<output-test url="file://$MODULE_DIR$/build/classes/test" />
2713
<exclude-output />
2814
<content url="file://$MODULE_DIR$">
29-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
30-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
31-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
32-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
33-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
34-
<sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
35-
<sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
36-
<sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
38-
<sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
39-
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
40-
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
41-
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
42-
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
43-
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
44-
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
45-
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
46-
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
47-
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
48-
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
49-
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
50-
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
51-
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
52-
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
53-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
54-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
55-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
56-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" isTestSource="true" />
57-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
58-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
59-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
60-
<excludeFolder url="file://$MODULE_DIR$/build/apk" />
61-
<excludeFolder url="file://$MODULE_DIR$/build/assets" />
62-
<excludeFolder url="file://$MODULE_DIR$/build/bundles" />
63-
<excludeFolder url="file://$MODULE_DIR$/build/classes" />
64-
<excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
65-
<excludeFolder url="file://$MODULE_DIR$/build/incremental" />
66-
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
67-
<excludeFolder url="file://$MODULE_DIR$/build/manifests" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/res" />
69-
<excludeFolder url="file://$MODULE_DIR$/build/symbols" />
70-
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
15+
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
16+
<excludeFolder url="file://$MODULE_DIR$/build" />
7117
</content>
7218
<orderEntry type="jdk" jdkName="Android 4.2 Platform" jdkType="Android SDK" />
7319
<orderEntry type="sourceFolder" forTests="false" />
74-
<orderEntry type="library" exported="" name="android-async-http-1.4.4" level="project" />
75-
<orderEntry type="library" exported="" name="bugsense-3.6" level="project" />
76-
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
77-
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
78-
<orderEntry type="library" exported="" name="simple-xml-2.7.1" level="project" />
7920
</component>
8021
</module>
8122

Voice Control For Plex Library/build.gradle

Lines changed: 0 additions & 28 deletions
This file was deleted.

Voice Control For Plex Library/proguard-rules.txt

Lines changed: 0 additions & 17 deletions
This file was deleted.

Voice Control For Plex Library/src/main/AndroidManifest.xml

Lines changed: 0 additions & 50 deletions
This file was deleted.

Voice Control For Plex Library/src/main/res/layout/main.xml

Lines changed: 0 additions & 113 deletions
This file was deleted.

Voice Control For Plex Library/src/main/res/values/strings.xml

Lines changed: 0 additions & 54 deletions
This file was deleted.

Voice Control For Plex/Voice Control For Plex.iml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@
7575
<orderEntry type="library" exported="" name="gson-2.2.4" level="project" />
7676
<orderEntry type="library" exported="" name="support-v4-19.1.0" level="project" />
7777
<orderEntry type="library" exported="" name="simple-xml-2.7.1" level="project" />
78-
<orderEntry type="module" module-name="Voice Control For Plex Library" exported="" />
7978
</component>
8079
</module>
8180

Voice Control For Plex/build.gradle

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,9 @@ android {
1818
}
1919

2020
dependencies {
21-
compile project(':Voice Control For Plex Library')
21+
compile files('libs/android-async-http-1.4.4.jar')
22+
compile files('libs/bugsense-3.6.jar')
23+
compile files('libs/simple-xml-2.7.1.jar')
24+
compile 'com.google.code.gson:gson:2.2.+'
25+
compile 'com.android.support:support-v4:+'
2226
}
File renamed without changes.

0 commit comments

Comments
 (0)