Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc982f7 authored by Jacky Wang's avatar Jacky Wang Committed by Android (Google) Code Review
Browse files

Merge "Add global flag for settings catalyst" into main

parents 3cdc1e69 504feedd

aconfig/settings_flag_declarations.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -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"

}

src/com/android/settings/SettingsApplication.java

+1 −3
Original line number Diff line number Diff line
@@ -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

+1 −3
Original line number Diff line number Diff line
@@ -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();