Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Let IndexableProcessor support different packages" into udc-qpr-dev

Browse Source
This commit is contained in:
Chaohui Wang
2023-06-01 03:31:44 +00:00
committed by Android (Google) Code Review
parent 5c8ee219f2 76c8f9b47d
commit 35e9cb58e0
4 changed files with 42 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SettingsLib/search/Android.bp
View File

@@ -7,8 +7,18 @@ package {
default_applicable_licenses: ["frameworks_base_license"],
}
java_library {
name: "SettingsLib-search-interface",
visibility: ["//visibility:private"],
srcs: ["interface-src/**/*.java"],
host_supported: true,
}
android_library {
name: "SettingsLib-search",
static_libs: [
"SettingsLib-search-interface",
],
srcs: ["src/**/*.java"],
sdk_version: "system_current",
@@ -19,12 +29,10 @@ java_plugin {
name: "SettingsLib-annotation-processor",
processor_class: "com.android.settingslib.search.IndexableProcessor",
static_libs: [
"SettingsLib-search-interface",
"javapoet",
],
srcs: [
"processor-src/**/*.java",
"src/com/android/settingslib/search/SearchIndexable.java",
],
srcs: ["processor-src/**/*.java"],
java_resource_dirs: ["resources"],
}

10
packages/SettingsLib/search/common.mk
View File

@@ -1,10 +0,0 @@
# Include this file to generate SearchIndexableResourcesImpl
LOCAL_ANNOTATION_PROCESSORS += \
SettingsLib-annotation-processor
LOCAL_ANNOTATION_PROCESSOR_CLASSES += \
com.android.settingslib.search.IndexableProcessor
LOCAL_STATIC_JAVA_LIBRARIES += \
SettingsLib-search

12
packages/SettingsLib/search/src/com/android/settingslib/search/SearchIndexable.java → packages/SettingsLib/search/interface-src/com/android/settingslib/search/SearchIndexable.java
View File

@@ -27,7 +27,7 @@ public @interface SearchIndexable {
/**
* Bitfield for the form factors this class should be considered indexable for.
* Default is {@link #ALL}.
*
* <p>
* TODO: actually use this value somehow
*/
int forTarget() default ALL;
@@ -35,27 +35,27 @@ public @interface SearchIndexable {
/**
* Indicates that the class should be considered indexable for Mobile.
*/
int MOBILE = 1<<0;
int MOBILE = 1 << 0;
/**
* Indicates that the class should be considered indexable for TV.
*/
int TV = 1<<1;
int TV = 1 << 1;
/**
* Indicates that the class should be considered indexable for Wear.
*/
int WEAR = 1<<2;
int WEAR = 1 << 2;
/**
* Indicates that the class should be considered indexable for Auto.
*/
int AUTO = 1<<3;
int AUTO = 1 << 3;
/**
* Indicates that the class should be considered indexable for ARC++.
*/
int ARC = 1<<4;
int ARC = 1 << 4;
/**
* Indicates that the class should be considered indexable for all targets.

39
packages/SettingsLib/search/processor-src/com/android/settingslib/search/IndexableProcessor.java
View File

@@ -34,6 +34,7 @@ import javax.annotation.processing.Messager;
import javax.annotation.processing.ProcessingEnvironment;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
import javax.annotation.processing.SupportedOptions;
import javax.annotation.processing.SupportedSourceVersion;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.Element;
@@ -48,10 +49,11 @@ import javax.tools.Diagnostic.Kind;
* subclasses.
*/
@SupportedSourceVersion(SourceVersion.RELEASE_17)
@SupportedOptions(IndexableProcessor.PACKAGE_KEY)
@SupportedAnnotationTypes({"com.android.settingslib.search.SearchIndexable"})
public class IndexableProcessor extends AbstractProcessor {
private static final String PACKAGE = "com.android.settingslib.search";
private static final String SETTINGSLIB_SEARCH_PACKAGE = "com.android.settingslib.search";
private static final String CLASS_BASE = "SearchIndexableResourcesBase";
private static final String CLASS_MOBILE = "SearchIndexableResourcesMobile";
private static final String CLASS_TV = "SearchIndexableResourcesTv";
@@ -59,6 +61,9 @@ public class IndexableProcessor extends AbstractProcessor {
private static final String CLASS_AUTO = "SearchIndexableResourcesAuto";
private static final String CLASS_ARC = "SearchIndexableResourcesArc";
static final String PACKAGE_KEY = "com.android.settingslib.search.processor.package";
private String mPackage;
private Filer mFiler;
private Messager mMessager;
private boolean mRanOnce;
@@ -72,7 +77,8 @@ public class IndexableProcessor extends AbstractProcessor {
}
mRanOnce = true;
final ClassName searchIndexableData = ClassName.get(PACKAGE, "SearchIndexableData");
final ClassName searchIndexableData =
ClassName.get(SETTINGSLIB_SEARCH_PACKAGE, "SearchIndexableData");
final FieldSpec providers = FieldSpec.builder(
ParameterizedTypeName.get(
@@ -130,7 +136,7 @@ public class IndexableProcessor extends AbstractProcessor {
builder = arcConstructorBuilder;
}
builder.addCode(
"$N(new SearchIndexableData($L.class, $L"
"$N(new com.android.settingslib.search.SearchIndexableData($L.class, $L"
+ ".SEARCH_INDEX_DATA_PROVIDER));\n",
addIndex, className, className);
} else {
@@ -150,50 +156,51 @@ public class IndexableProcessor extends AbstractProcessor {
final TypeSpec baseClass = TypeSpec.classBuilder(CLASS_BASE)
.addModifiers(Modifier.PUBLIC)
.addSuperinterface(ClassName.get(PACKAGE, "SearchIndexableResources"))
.addSuperinterface(
ClassName.get(SETTINGSLIB_SEARCH_PACKAGE, "SearchIndexableResources"))
.addField(providers)
.addMethod(baseConstructorBuilder.build())
.addMethod(addIndex)
.addMethod(getProviderValues)
.build();
final JavaFile searchIndexableResourcesBase = JavaFile.builder(PACKAGE, baseClass).build();
final JavaFile searchIndexableResourcesBase = JavaFile.builder(mPackage, baseClass).build();
final JavaFile searchIndexableResourcesMobile = JavaFile.builder(PACKAGE,
final JavaFile searchIndexableResourcesMobile = JavaFile.builder(mPackage,
TypeSpec.classBuilder(CLASS_MOBILE)
.addModifiers(Modifier.PUBLIC)
.superclass(ClassName.get(PACKAGE, baseClass.name))
.superclass(ClassName.get(mPackage, baseClass.name))
.addMethod(mobileConstructorBuilder.build())
.build())
.build();
final JavaFile searchIndexableResourcesTv = JavaFile.builder(PACKAGE,
final JavaFile searchIndexableResourcesTv = JavaFile.builder(mPackage,
TypeSpec.classBuilder(CLASS_TV)
.addModifiers(Modifier.PUBLIC)
.superclass(ClassName.get(PACKAGE, baseClass.name))
.superclass(ClassName.get(mPackage, baseClass.name))
.addMethod(tvConstructorBuilder.build())
.build())
.build();
final JavaFile searchIndexableResourcesWear = JavaFile.builder(PACKAGE,
final JavaFile searchIndexableResourcesWear = JavaFile.builder(mPackage,
TypeSpec.classBuilder(CLASS_WEAR)
.addModifiers(Modifier.PUBLIC)
.superclass(ClassName.get(PACKAGE, baseClass.name))
.superclass(ClassName.get(mPackage, baseClass.name))
.addMethod(wearConstructorBuilder.build())
.build())
.build();
final JavaFile searchIndexableResourcesAuto = JavaFile.builder(PACKAGE,
final JavaFile searchIndexableResourcesAuto = JavaFile.builder(mPackage,
TypeSpec.classBuilder(CLASS_AUTO)
.addModifiers(Modifier.PUBLIC)
.superclass(ClassName.get(PACKAGE, baseClass.name))
.superclass(ClassName.get(mPackage, baseClass.name))
.addMethod(autoConstructorBuilder.build())
.build())
.build();
final JavaFile searchIndexableResourcesArc = JavaFile.builder(PACKAGE,
final JavaFile searchIndexableResourcesArc = JavaFile.builder(mPackage,
TypeSpec.classBuilder(CLASS_ARC)
.addModifiers(Modifier.PUBLIC)
.superclass(ClassName.get(PACKAGE, baseClass.name))
.superclass(ClassName.get(mPackage, baseClass.name))
.addMethod(arcConstructorBuilder.build())
.build())
.build();
@@ -214,6 +221,8 @@ public class IndexableProcessor extends AbstractProcessor {
@Override
public synchronized void init(ProcessingEnvironment processingEnvironment) {
super.init(processingEnvironment);
mPackage = processingEnvironment.getOptions()
.getOrDefault(PACKAGE_KEY, SETTINGSLIB_SEARCH_PACKAGE);
mFiler = processingEnvironment.getFiler();
mMessager = processingEnvironment.getMessager();
}