From 504feedd6bc4b688ff8e1ec1879e428f656ea7dc Mon Sep 17 00:00:00 2001
From: Jacky Wang <jiannan@google.com>
Date: Wed, 18 Sep 2024 14:49:48 +0800
Subject: [PATCH] Add global flag for settings catalyst

Bug: 323791114
Flag: com.android.settings.flags.catalyst
Test: Presubmit
Change-Id: I1addb2391405ced12f0b32b2415608cf3a472c37
---
 aconfig/settings_flag_declarations.aconfig                | 7 +++++++
 src/com/android/settings/SettingsApplication.java         | 4 +---
 src/com/android/settings/dashboard/DashboardFragment.java | 4 +---
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/aconfig/settings_flag_declarations.aconfig b/aconfig/settings_flag_declarations.aconfig
index c3af784f679..a9c7bd59f23 100644
--- a/aconfig/settings_flag_declarations.aconfig
+++ b/aconfig/settings_flag_declarations.aconfig
@@ -56,3 +56,10 @@ flag {
     description: "Use updated suggestion card(s) in AOSP Settings"
     bug: "323258154"
 }
+
+flag {
+  name: "catalyst"
+  namespace: "android_settings"
+  description: "Flag for all screens"
+  bug: "323791114"
+}
diff --git a/src/com/android/settings/SettingsApplication.java b/src/com/android/settings/SettingsApplication.java
index 7e008e43667..b1177dd2d87 100644
--- a/src/com/android/settings/SettingsApplication.java
+++ b/src/com/android/settings/SettingsApplication.java
@@ -16,8 +16,6 @@
 
 package com.android.settings;
 
-import static com.android.settingslib.flags.Flags.settingsCatalyst;
-
 import android.app.Application;
 import android.content.Context;
 import android.content.pm.PackageManager;
@@ -73,7 +71,7 @@ public class SettingsApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        if (settingsCatalyst()) {
+        if (Flags.catalyst()) {
             PreferenceScreenRegistry.INSTANCE.setPreferenceScreensSupplier(
                     this::getPreferenceScreens);
         }
diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java
index 220856ae664..6333f22b95b 100644
--- a/src/com/android/settings/dashboard/DashboardFragment.java
+++ b/src/com/android/settings/dashboard/DashboardFragment.java
@@ -15,8 +15,6 @@
  */
 package com.android.settings.dashboard;
 
-import static com.android.settingslib.flags.Flags.settingsCatalyst;
-
 import android.app.Activity;
 import android.app.settings.SettingsEnums;
 import android.content.ContentResolver;
@@ -390,7 +388,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
 
     /** Returns if catalyst is enabled on current screen. */
     protected final boolean isCatalystEnabled() {
-        if (!settingsCatalyst()) {
+        if (!Flags.catalyst()) {
             return false;
         }
         Context context = getContext();