Merge "Add global flag for settings catalyst" into main

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);
         }

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();