SystemUI Aconfig
Test: manually built and ran
Bug: 292511372
Change-Id: Ia783091f22b9d24df3f1c2273f917afad5c59059
diff --git a/packages/SystemUI/Android.bp b/packages/SystemUI/Android.bp
index 0474849..9ce5bc1 100644
--- a/packages/SystemUI/Android.bp
+++ b/packages/SystemUI/Android.bp
@@ -132,6 +132,17 @@
manifest: "AndroidManifest-res.xml",
}
+aconfig_declarations {
+ name: "systemui_aconfig_flags",
+ package: "com.android.systemui.aconfig",
+ srcs: ["src/com/android/systemui/aconfig/systemui.aconfig"],
+}
+
+java_aconfig_library {
+ name: "systemui_aconfig_flags_lib",
+ aconfig_declarations: "systemui_aconfig_flags",
+}
+
android_library {
name: "SystemUI-core",
defaults: [
@@ -166,6 +177,7 @@
"SystemUISharedLib",
"SystemUI-statsd",
"SettingsLib",
+ "systemui_aconfig_flags_lib",
"androidx.core_core-ktx",
"androidx.viewpager2_viewpager2",
"androidx.legacy_legacy-support-v4",
@@ -344,6 +356,7 @@
"SystemUICustomizationLib",
"SystemUI-statsd",
"SettingsLib",
+ "systemui_aconfig_flags_lib",
"androidx.viewpager2_viewpager2",
"androidx.legacy_legacy-support-v4",
"androidx.recyclerview_recyclerview",
diff --git a/packages/SystemUI/src/com/android/systemui/aconfig/AConfigModule.kt b/packages/SystemUI/src/com/android/systemui/aconfig/AConfigModule.kt
new file mode 100644
index 0000000..251a699
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/aconfig/AConfigModule.kt
@@ -0,0 +1,33 @@
+/*
+ * Copyright (C) 2023 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.systemui.aconfig
+
+import com.android.systemui.dagger.SysUISingleton
+import dagger.Module
+import dagger.Provides
+
+@Module
+abstract class AConfigModule {
+ @Module
+ companion object {
+ @Provides
+ @SysUISingleton
+ fun providesImpl(): FeatureFlags {
+ return FeatureFlagsImpl()
+ }
+ }
+}
diff --git a/packages/SystemUI/src/com/android/systemui/aconfig/systemui.aconfig b/packages/SystemUI/src/com/android/systemui/aconfig/systemui.aconfig
new file mode 100644
index 0000000..2d6e257
--- /dev/null
+++ b/packages/SystemUI/src/com/android/systemui/aconfig/systemui.aconfig
@@ -0,0 +1,8 @@
+package: "com.android.systemui.aconfig"
+
+flag {
+ name: "example_flag"
+ namespace: "systemui"
+ description: "An Example Flag"
+ bug: "292511372"
+}
diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
index 18b5612..9f4b956 100644
--- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
+++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java
@@ -29,6 +29,7 @@
import com.android.systemui.BootCompleteCacheImpl;
import com.android.systemui.accessibility.AccessibilityModule;
import com.android.systemui.accessibility.data.repository.AccessibilityRepositoryModule;
+import com.android.systemui.aconfig.AConfigModule;
import com.android.systemui.appops.dagger.AppOpsModule;
import com.android.systemui.assist.AssistModule;
import com.android.systemui.authentication.AuthenticationModule;
@@ -156,6 +157,7 @@
@Module(includes = {
AccessibilityModule.class,
AccessibilityRepositoryModule.class,
+ AConfigModule.class,
AppOpsModule.class,
AssistModule.class,
AuthenticationModule.class,
diff --git a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java
index 2c11d78..367a9b9 100644
--- a/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java
+++ b/packages/SystemUI/src/com/android/systemui/flags/FeatureFlagsDebug.java
@@ -32,7 +32,6 @@
import android.content.res.Resources;
import android.os.Bundle;
import android.os.UserHandle;
-import android.provider.DeviceConfig;
import android.util.Log;
import androidx.annotation.NonNull;