commit d6e4cdcdb5357e79934190bee0a91c0336e9d9f5
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Oct 22 21:20:07 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Oct 22 21:20:07 2018 +0000
tree 6569dfeb4ebb30e4f3e18505157db4e536b2ab41
parent e3617a01ef80724cfe623227bd8430e1a2218c75
parent 904dbcdf9db7aa54a63a53e07e7d0b00d822db41

Merge "Only show flags UI if developer options is enabled" into ub-launcher3-master

src/com/android/launcher3/config/BaseFlags.java

diff --git a/src/com/android/launcher3/config/BaseFlags.java b/src/com/android/launcher3/config/BaseFlags.java
index dc60c8f..fa4ff75 100644
--- a/src/com/android/launcher3/config/BaseFlags.java
+++ b/src/com/android/launcher3/config/BaseFlags.java
@@ -20,6 +20,7 @@
 
 import android.content.Context;
 import android.content.SharedPreferences;
+import android.provider.Settings;
 
 import androidx.annotation.GuardedBy;
 import androidx.annotation.Keep;
@@ -51,8 +52,10 @@
         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 @@
     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) {

src/com/android/launcher3/settings/SettingsActivity.java

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index 66420d0..4c022b4 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -203,7 +203,7 @@
 
                 case FLAGS_PREFERENCE_KEY:
                     // Only show flag toggler UI if this build variant implements that.
-                    return FeatureFlags.showFlagTogglerUi();
+                    return FeatureFlags.showFlagTogglerUi(getContext());
             }
 
             return true;