[TEMP] Revert "Ensure everything plays nice"

This reverts commit da9f452.

Author: phenomenall

res/values/stag_strings.xml

@@ -87,9 +87,6 @@
     <string name="applying_theme_toast">Applying theme, please wait...</string>
     <string name="theme_applied_toast">Theme applied!</string>
 
-    <string name="disable_themes_installed_title">System themes are unavailable to avoid conflicts with Substratum. Uninstall it if you wish to use these themes instead.</string>
-    <string name="disable_accents_installed_title">Accent picker is unavailable to avoid conflicts with Substratum. Uninstall it if you wish to use the accent picker.</string>
-
     <!-- Sizes for pattern lockscreen -->
     <string name="lock_pattern_size_3" translatable="false">3 \u00d7 3</string>
     <string name="lock_pattern_size_4" translatable="false">4 \u00d7 4</string>

src/com/android/settings/display/AccentPickerPreferenceController.java

@@ -31,14 +31,10 @@
 
 import com.android.settings.stag.AccentPicker;
 
-import com.android.internal.util.stag.StagUtils;
-
 public class AccentPickerPreferenceController extends AbstractPreferenceController
         implements PreferenceControllerMixin, LifecycleObserver, OnResume {
 
     private static final String KEY_ACCENT_PICKER_FRAGMENT_PREF = "accent_picker";
-    private static final String SUBS_PACKAGE = "projekt.substratum";
-
     private static final int MY_USER_ID = UserHandle.myUserId();
 
     private final Fragment mParent;
@@ -55,11 +51,6 @@ public AccentPickerPreferenceController(Context context, Lifecycle lifecycle, Fr
     @Override
     public void displayPreference(PreferenceScreen screen) {
         mAccentPickerPref  = (Preference) screen.findPreference(KEY_ACCENT_PICKER_FRAGMENT_PREF);
-        if (!StagUtils.isPackageInstalled(mContext, SUBS_PACKAGE)) {
-            mAccentPickerPref.setEnabled(true);
-        } else {
-            mAccentPickerPref.setEnabled(false);
-        }
     }
 
     @Override
@@ -87,25 +78,16 @@ public void updateEnableState() {
             new OnPreferenceClickListener() {
                 @Override
                 public boolean onPreferenceClick(Preference preference) {
-                   if (!StagUtils.isPackageInstalled(mContext, SUBS_PACKAGE)) {
-                        AccentPicker.show(mParent);
-                        return true;
-                   } else {
-                        return false;
-                   }
+                    AccentPicker.show(mParent);
+                    return true;
                 }
             });
     }
 
     public void updateSummary() {
         if (mAccentPickerPref != null) {
-            if (!StagUtils.isPackageInstalled(mContext, SUBS_PACKAGE)) {
                 mAccentPickerPref.setSummary(mContext.getString(
                         com.android.settings.R.string.theme_accent_picker_summary));
-            } else {
-                mAccentPickerPref.setSummary(mContext.getString(
-                        com.android.settings.R.string.disable_accents_installed_title));
-            }
         }
     }
 

src/com/android/settings/display/DarkUIPreferenceController.java

@@ -23,11 +23,8 @@
 import android.provider.Settings;
 
 import com.android.settingslib.core.AbstractPreferenceController;
-import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settingslib.drawer.SettingsDrawerActivity;
 
-import com.android.internal.util.stag.StagUtils;
-
 import libcore.util.Objects;
 import java.util.ArrayList;
 import java.util.List;
@@ -38,10 +35,9 @@
 import android.widget.Toast;
 
 public class DarkUIPreferenceController extends AbstractPreferenceController implements
-       PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
+        Preference.OnPreferenceChangeListener {
 
     private static final String SYSTEM_UI_THEME = "systemui_theme_style";
-    private static final String SUBS_PACKAGE = "projekt.substratum";
     private ListPreference mSystemUiThemeStyle;
 
     public DarkUIPreferenceController(Context context) {
@@ -62,17 +58,12 @@ public boolean isAvailable() {
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mSystemUiThemeStyle = (ListPreference) screen.findPreference(SYSTEM_UI_THEME);
-	if (!StagUtils.isPackageInstalled(mContext, SUBS_PACKAGE)) {
-        	int systemuiThemeStyle = Settings.System.getInt(mContext.getContentResolver(),
-                	Settings.System.SYSTEM_UI_THEME, 0);
-        	int valueIndex = mSystemUiThemeStyle.findIndexOfValue(String.valueOf(systemuiThemeStyle));
-        	mSystemUiThemeStyle.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
-        	mSystemUiThemeStyle.setSummary(mSystemUiThemeStyle.getEntry());
-        	mSystemUiThemeStyle.setOnPreferenceChangeListener(this);
-	} else {
-	    mSystemUiThemeStyle.setEnabled(false);
-            mSystemUiThemeStyle.setSummary(R.string.disable_themes_installed_title);
-        }
+        int systemuiThemeStyle = Settings.System.getInt(mContext.getContentResolver(),
+                Settings.System.SYSTEM_UI_THEME, 0);
+        int valueIndex = mSystemUiThemeStyle.findIndexOfValue(String.valueOf(systemuiThemeStyle));
+        mSystemUiThemeStyle.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
+        mSystemUiThemeStyle.setSummary(mSystemUiThemeStyle.getEntry());
+        mSystemUiThemeStyle.setOnPreferenceChangeListener(this);
     }
     @Override
     public boolean onPreferenceChange(Preference preference, Object newValue) {