Skip to content

Commit 8cb785a

Browse files
AndroidDeveloperLBAndroidDeveloperLB
committed
updated example to hold searching too.
1 parent ffb83e1 commit 8cb785a

File tree

15 files changed

+413
-328
lines changed

15 files changed

+413
-328
lines changed

‎.idea/encodings.xml‎

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/gradle.xml‎

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

‎.idea/misc.xml‎

Lines changed: 31 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/runConfigurations.xml‎

Lines changed: 12 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.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.

‎ListViewVariants.iml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
</configuration>
99
</facet>
1010
</component>
11-
<component name="NewModuleRootManager" 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" />
1515
</content>
16-
<orderEntry type="inheritedJdk" />
16+
<orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
1717
<orderEntry type="sourceFolder" forTests="false" />
1818
</component>
1919
</module>

‎app/app.iml‎

Lines changed: 44 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,9 @@
1212
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
1313
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
1414
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
15-
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
16-
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
17-
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
18-
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
15+
<afterSyncTasks>
16+
<task>generateDebugSources</task>
17+
</afterSyncTasks>
1918
<option name="ALLOW_USER_CONFIGURATION" value="false" />
2019
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
2120
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
@@ -24,30 +23,37 @@
2423
</configuration>
2524
</facet>
2625
</component>
27-
<component name="NewModuleRootManager" inherit-compiler-output="false">
26+
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
2827
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
29-
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/androidTest/debug" />
28+
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
3029
<exclude-output />
3130
<content url="file://$MODULE_DIR$">
3231
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
3332
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
3433
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
3534
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
3635
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
37-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
36+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
3837
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
3938
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
4039
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
4140
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
4241
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
43-
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/androidTest/debug" type="java-test-resource" />
42+
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
4443
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
4544
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
4645
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
4746
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
4847
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
4948
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
5049
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
50+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
51+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
52+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
53+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
54+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
55+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
56+
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
5157
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
5258
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
5359
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -62,35 +68,52 @@
6268
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
6369
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
6470
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
71+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
72+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
73+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
74+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
75+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
76+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
77+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
6578
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
79+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
6680
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
6781
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
68-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
6982
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
7083
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
71-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
72-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/22.1.1/jars" />
73-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/22.1.1/jars" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/animated-vector-drawable/23.2.1/jars" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.2.1/jars" />
86+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.2.1/jars" />
87+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-vector-drawable/23.2.1/jars" />
7488
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
75-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
76-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
77-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
78-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
89+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
90+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
93+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
7994
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
95+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/mockable-android-22.jar" />
8096
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
8197
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
82-
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
98+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
8399
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
100+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
101+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
84102
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
103+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
85104
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
105+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/tmp" />
106+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
86107
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
87108
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
88109
</content>
89-
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
110+
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
90111
<orderEntry type="sourceFolder" forTests="false" />
91-
<orderEntry type="library" exported="" name="support-annotations-22.1.1" level="project" />
92-
<orderEntry type="library" exported="" name="support-v4-22.1.1" level="project" />
93-
<orderEntry type="library" exported="" name="appcompat-v7-22.1.1" level="project" />
112+
<orderEntry type="library" exported="" name="support-v4-23.2.1" level="project" />
113+
<orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" />
114+
<orderEntry type="library" exported="" name="animated-vector-drawable-23.2.1" level="project" />
115+
<orderEntry type="library" exported="" name="support-vector-drawable-23.2.1" level="project" />
116+
<orderEntry type="library" exported="" name="appcompat-v7-23.2.1" level="project" />
94117
<orderEntry type="module" module-name="library" exported="" />
95118
</component>
96119
</module>

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
apply plugin: 'com.android.application'
22

33
android {
4-
compileSdkVersion 22
4+
compileSdkVersion 23
55
buildToolsVersion "21.1.2"
66

77
defaultConfig {
@@ -21,6 +21,6 @@ android {
2121

2222
dependencies {
2323
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:22.1.1'
24+
compile 'com.android.support:appcompat-v7:23.2.1'
2525
compile project(':library')
2626
}

0 commit comments

Comments
 (0)