diff options
| -rw-r--r-- | src/com/android/launcher3/config/BaseFlags.java | 11 | ||||
| -rw-r--r-- | src/com/android/launcher3/settings/SettingsActivity.java | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java index dc60c8fff..fa4ff752e 100644 --- a/src/com/android/launcher3/config/BaseFlags.java +++ b/src/com/android/launcher3/config/BaseFlags.java @@ -20,6 +20,7 @@ import static androidx.core.util.Preconditions.checkNotNull; import android.content.Context; import android.content.SharedPreferences; +import android.provider.Settings; import androidx.annotation.GuardedBy; import androidx.annotation.Keep; @@ -51,8 +52,10 @@ abstract class BaseFlags { throw new UnsupportedOperationException("Don't instantiate BaseFlags"); } - public static boolean showFlagTogglerUi() { - return Utilities.IS_DEBUG_DEVICE; + public static boolean showFlagTogglerUi(Context context) { + return Utilities.IS_DEBUG_DEVICE && + Settings.Global.getInt(context.getApplicationContext().getContentResolver(), + Settings.Global.DEVELOPMENT_SETTINGS_ENABLED, 0) != 0; } public static final boolean IS_DOGFOOD_BUILD = false; @@ -85,8 +88,8 @@ abstract class BaseFlags { public static final boolean OVERVIEW_USE_SCREENSHOT_ORIENTATION = true; public static void initialize(Context context) { - // Avoid the disk read for builds without the flags UI. - if (showFlagTogglerUi()) { + // Avoid the disk read for user builds + if (Utilities.IS_DEBUG_DEVICE) { SharedPreferences sharedPreferences = context.getSharedPreferences(FLAGS_PREF_NAME, Context.MODE_PRIVATE); synchronized (sLock) { diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java index 66420d079..4c022b438 100644 --- a/src/com/android/launcher3/settings/SettingsActivity.java +++ b/src/com/android/launcher3/settings/SettingsActivity.java @@ -203,7 +203,7 @@ public class SettingsActivity extends Activity case FLAGS_PREFERENCE_KEY: // Only show flag toggler UI if this build variant implements that. - return FeatureFlags.showFlagTogglerUi(); + return FeatureFlags.showFlagTogglerUi(getContext()); } return true; |