diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/Android.mk | 3 | ||||
| -rw-r--r-- | common/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | common/build.gradle | 36 | ||||
| -rw-r--r-- | common/java/com/android/common/widget/CompositeCursorAdapter.java | 8 |
4 files changed, 44 insertions, 5 deletions
diff --git a/common/Android.mk b/common/Android.mk index ed7c479..65a22fe 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -25,9 +25,6 @@ LOCAL_SRC_FILES := \ $(call all-logtags-files-under, java) include $(BUILD_STATIC_JAVA_LIBRARY) -# Include this library in the build server's output directory -$(call dist-for-goals, droidcore, $(LOCAL_BUILT_MODULE):android-common.jar) - # Build the test package # we can't build the test for apps only build, because android.test.runner is not unbundled yet. ifeq ($(TARGET_BUILD_APPS),) diff --git a/common/AndroidManifest.xml b/common/AndroidManifest.xml new file mode 100644 index 0000000..91f5f51 --- /dev/null +++ b/common/AndroidManifest.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8"?> +<manifest package="com.android.common"/>
\ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle new file mode 100644 index 0000000..c74682c --- /dev/null +++ b/common/build.gradle @@ -0,0 +1,36 @@ +apply plugin: 'android-library' + +buildDir = "$project.rootDir/out/android-$project.name" + +android { + compileSdkVersion 17 + buildToolsVersion = 17 + + logtags { + srcDirs = ['java'] + genDir = "$buildDir/source/generated" + } + + sourceSets { + main { + manifest { + srcFile "AndroidManifest.xml" + } + java { + srcDirs = [ + 'java', + "$buildDir/source/generated" + ] + } + resources.srcDirs = ['src'] + aidl.srcDirs = ['src'] + renderscript.srcDirs = ['src'] + res.srcDirs = ['res'] + assets.srcDirs = ['assets'] + } + } +} + +android.libraryVariants.each { variant -> + variant.packageLibrary.baseName = "android-common" +}
\ No newline at end of file diff --git a/common/java/com/android/common/widget/CompositeCursorAdapter.java b/common/java/com/android/common/widget/CompositeCursorAdapter.java index d6064e1..605eb82 100644 --- a/common/java/com/android/common/widget/CompositeCursorAdapter.java +++ b/common/java/com/android/common/widget/CompositeCursorAdapter.java @@ -309,10 +309,14 @@ public abstract class CompositeCursorAdapter extends BaseAdapter { int end = start + mPartitions[i].count; if (position >= start && position < end) { int offset = position - start; - if (mPartitions[i].hasHeader && offset == 0) { + if (mPartitions[i].hasHeader) { + offset--; + } + if (offset == -1) { return IGNORE_ITEM_VIEW_TYPE; + } else { + return getItemViewType(i, offset); } - return getItemViewType(i, position); } start = end; } |