hide Feed and At A Glance related settings in the release version

Author: hundeva

src/com/google/android/apps/nexuslauncher/NexusLauncherActivity.java

@@ -5,14 +5,15 @@
 import android.os.Bundle;
 
 import com.android.launcher3.AppInfo;
+import com.android.launcher3.BuildConfig;
 import com.android.launcher3.Launcher;
 import com.android.launcher3.R;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.config.FeatureFlags;
 import com.android.launcher3.util.ComponentKeyMapper;
 import com.android.launcher3.util.ViewOnDrawExecutor;
-import com.hdeva.launcher.LeanSettings;
 import com.google.android.libraries.gsa.launcherclient.LauncherClient;
+import com.hdeva.launcher.LeanSettings;
 
 import java.util.List;
 
@@ -62,7 +63,7 @@ public void clearPendingExecutor(ViewOnDrawExecutor executor) {
     }
 
     private boolean showSmartspace() {
-        return Utilities.getPrefs(this).getBoolean(SettingsActivity.SMARTSPACE_PREF, true);
+        return BuildConfig.DEBUG && Utilities.getPrefs(this).getBoolean(SettingsActivity.SMARTSPACE_PREF, true);
     }
 
     public void overrideTheme(boolean isDark, boolean supportsDarkText) {

src/com/google/android/apps/nexuslauncher/SettingsActivity.java

@@ -84,7 +84,10 @@ public static class MySettingsFragment extends com.android.launcher3.SettingsAct
             @Override
             public void onReceive(Context context, Intent intent) {
                 String version = intent.getStringExtra(SMARTSPACE_PING_RESPONSE);
-                findPreference(SMARTSPACE_COMPANION).setSummary(context.getString(R.string.companion_app_version_x, version));
+                Preference smartspaceCompanion = findPreference(SMARTSPACE_COMPANION);
+                if (smartspaceCompanion != null) {
+                    smartspaceCompanion.setSummary(context.getString(R.string.companion_app_version_x, version));
+                }
             }
         };
 
@@ -146,10 +149,6 @@ public void onCreate(Bundle bundle) {
                 if (!applicationInfo.enabled) {
                     throw new PackageManager.NameNotFoundException();
                 }
-
-                if (!BuildConfig.DEBUG) {
-                    findPreference(ENABLE_MINUS_ONE_PREF).setEnabled(false);
-                }
             } catch (PackageManager.NameNotFoundException ignored) {
                 ((PreferenceScreen) getPreferenceScreen().findPreference("pref_feed_screen")).removePreference(findPreference(SettingsActivity.ENABLE_MINUS_ONE_PREF));
             }
@@ -159,6 +158,11 @@ public void onCreate(Bundle bundle) {
                 ((PreferenceCategory) ((PreferenceScreen) getPreferenceScreen().findPreference("pref_edit_apps_screen")).findPreference("pref_icons_category")).removePreference(findPreference(LeanSettings.GENERATED_ADAPTIVE_BACKGROUND));
             }
 
+            if (!BuildConfig.DEBUG) {
+                getPreferenceScreen().removePreference(findPreference("pref_feed_screen"));
+                getPreferenceScreen().removePreference(findPreference("pref_smartspace_screen"));
+            }
+
             mIconPackPref = (CustomIconPreference) findPreference(ICON_PACK_PREF);
             mIconPackPref.setOnPreferenceChangeListener(this);
 
@@ -185,7 +189,10 @@ private String getDisplayGoogleTitle() {
         public void onResume() {
             super.onResume();
             mIconPackPref.reloadIconPacks();
-            findPreference(SMARTSPACE_COMPANION).setSummary(getString(R.string.companion_app_not_installed));
+            Preference smartspaceCompanion = findPreference(SMARTSPACE_COMPANION);
+            if (smartspaceCompanion != null) {
+                smartspaceCompanion.setSummary(getString(R.string.companion_app_not_installed));
+            }
             getActivity().registerReceiver(smartspaceReceiver, new IntentFilter(SMARTSPACE_PING_RESPONSE));
             getActivity().sendBroadcast(new Intent(SMARTSPACE_PING).setPackage("com.google.android.apps.nexuslauncher"));
         }