Skip to content

Commit bcca8b8

Browse files
alt236alt236
authored
Merge pull request alt236#6 from alt236/materialise
Materialise
2 parents 76bf39b + 34d8018 commit bcca8b8

File tree

91 files changed

+2374
-2262
lines changed

Some content is hidden

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

91 files changed

+2374
-2262
lines changed

‎.idea/misc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎AndroidManifest.xml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919
android:label="@string/app_name"
2020
android:theme="@android:style/Theme.Holo.Light" >
2121
<activity
22-
android:name="aws.apps.usbDeviceEnumerator.activities.UsbInfoActivity"
22+
android:name="aws.apps.usbDeviceEnumerator.ui.usbinfo.UsbInfoActivity"
2323
android:label="@string/app_name" >
2424
</activity>
25-
<activity
26-
android:name="aws.apps.usbDeviceEnumerator.activities.MainActivity"
25+
<activity android:name="aws.apps.usbDeviceEnumerator.ui.main.MainActivity"
2726
android:label="@string/app_name" >
2827
<intent-filter>
2928
<action android:name="android.intent.action.MAIN" />

‎USB-Device-Info---Android.iml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
</configuration>
99
</facet>
1010
</component>
11-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
11+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
1212
<exclude-output />
1313
<content url="file://$MODULE_DIR$">
1414
<excludeFolder url="file://$MODULE_DIR$/.gradle" />

‎_media/icons/feature.png‎

75.5 KB
Loading

_media/icons/icon.svg renamed to _media/icons/ic_launcher.svg

File renamed without changes.

‎_media/icons/icon_hires.png‎

-69.3 KB
Binary file not shown.

‎_media/icons/web_icon.png‎

60 KB
Loading

‎_media/screenshots/tablet_1.png‎

152 KB
Loading

‎_media/screenshots/tablet_2.png‎

114 KB
Loading

‎app/app.iml‎

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,19 @@
2323
</configuration>
2424
</facet>
2525
</component>
26-
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2727
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
2828
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
2929
<exclude-output />
3030
<content url="file://$MODULE_DIR$">
31+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
3132
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3233
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3334
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3435
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3536
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
3637
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
38+
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
3739
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3840
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
3941
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
@@ -82,23 +84,59 @@
8284
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8385
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8486
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
8588
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
8689
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8790
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/24.2.0/jars" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/24.2.0/jars" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/24.2.0/jars" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/24.2.0/jars" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-compat/24.2.0/jars" />
96+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-ui/24.2.0/jars" />
97+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-core-utils/24.2.0/jars" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-fragment/24.2.0/jars" />
99+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-media-compat/24.2.0/jars" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/24.2.0/jars" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/24.2.0/jars" />
102+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.jakewharton/butterknife/8.4.0/jars" />
88103
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
104+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
89106
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
107+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
108+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
109+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
90110
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
111+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
112+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
91113
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
114+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
92115
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
93116
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
94117
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
118+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
95119
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
96120
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
97121
</content>
98-
<orderEntry type="jdk" jdkName="Android API 14 Platform" jdkType="Android SDK" />
122+
<orderEntry type="jdk" jdkName="Android API 24 Platform" jdkType="Android SDK" />
99123
<orderEntry type="sourceFolder" forTests="false" />
124+
<orderEntry type="library" exported="" name="support-media-compat-24.2.0" level="project" />
125+
<orderEntry type="library" exported="" name="recyclerview-v7-24.2.0" level="project" />
126+
<orderEntry type="library" exported="" name="support-compat-24.2.0" level="project" />
127+
<orderEntry type="library" exported="" name="support-v4-24.2.0" level="project" />
128+
<orderEntry type="library" exported="" name="support-core-ui-24.2.0" level="project" />
129+
<orderEntry type="library" exported="" name="support-core-utils-24.2.0" level="project" />
130+
<orderEntry type="library" exported="" name="appcompat-v7-24.2.0" level="project" />
131+
<orderEntry type="library" exported="" name="support-fragment-24.2.0" level="project" />
132+
<orderEntry type="library" exported="" name="support-annotations-24.2.0" level="project" />
133+
<orderEntry type="library" exported="" name="support-vector-drawable-24.2.0" level="project" />
134+
<orderEntry type="library" exported="" name="animated-vector-drawable-24.2.0" level="project" />
135+
<orderEntry type="library" exported="" name="design-24.2.0" level="project" />
100136
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
101137
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
138+
<orderEntry type="library" exported="" name="butterknife-annotations-8.4.0" level="project" />
139+
<orderEntry type="library" exported="" name="butterknife-8.4.0" level="project" />
102140
<orderEntry type="module" module-name="usbdeviceenumerator" exported="" />
103141
</component>
104142
</module>

0 commit comments

Comments
 (0)