Skip to content

Commit fd0ef32

Browse files
committed
[TEMP] Revert "Ensure everything plays nice"
This reverts commit da9f452.
1 parent ea6b4e2 commit fd0ef32

File tree

3 files changed

+9
-39
lines changed

3 files changed

+9
-39
lines changed

res/values/stag_strings.xml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,6 @@
8787
<string name="applying_theme_toast">Applying theme, please wait...</string>
8888
<string name="theme_applied_toast">Theme applied!</string>
8989

90-
<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>
91-
<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>
92-
9390
<!-- Sizes for pattern lockscreen -->
9491
<string name="lock_pattern_size_3" translatable="false">3 \u00d7 3</string>
9592
<string name="lock_pattern_size_4" translatable="false">4 \u00d7 4</string>

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

Lines changed: 2 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,10 @@
3131

3232
import com.android.settings.stag.AccentPicker;
3333

34-
import com.android.internal.util.stag.StagUtils;
35-
3634
public class AccentPickerPreferenceController extends AbstractPreferenceController
3735
implements PreferenceControllerMixin, LifecycleObserver, OnResume {
3836

3937
private static final String KEY_ACCENT_PICKER_FRAGMENT_PREF = "accent_picker";
40-
private static final String SUBS_PACKAGE = "projekt.substratum";
41-
4238
private static final int MY_USER_ID = UserHandle.myUserId();
4339

4440
private final Fragment mParent;
@@ -55,11 +51,6 @@ public AccentPickerPreferenceController(Context context, Lifecycle lifecycle, Fr
5551
@Override
5652
public void displayPreference(PreferenceScreen screen) {
5753
mAccentPickerPref = (Preference) screen.findPreference(KEY_ACCENT_PICKER_FRAGMENT_PREF);
58-
if (!StagUtils.isPackageInstalled(mContext, SUBS_PACKAGE)) {
59-
mAccentPickerPref.setEnabled(true);
60-
} else {
61-
mAccentPickerPref.setEnabled(false);
62-
}
6354
}
6455

6556
@Override
@@ -87,25 +78,16 @@ public void updateEnableState() {
8778
new OnPreferenceClickListener() {
8879
@Override
8980
public boolean onPreferenceClick(Preference preference) {
90-
if (!StagUtils.isPackageInstalled(mContext, SUBS_PACKAGE)) {
91-
AccentPicker.show(mParent);
92-
return true;
93-
} else {
94-
return false;
95-
}
81+
AccentPicker.show(mParent);
82+
return true;
9683
}
9784
});
9885
}
9986

10087
public void updateSummary() {
10188
if (mAccentPickerPref != null) {
102-
if (!StagUtils.isPackageInstalled(mContext, SUBS_PACKAGE)) {
10389
mAccentPickerPref.setSummary(mContext.getString(
10490
com.android.settings.R.string.theme_accent_picker_summary));
105-
} else {
106-
mAccentPickerPref.setSummary(mContext.getString(
107-
com.android.settings.R.string.disable_accents_installed_title));
108-
}
10991
}
11092
}
11193

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

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,8 @@
2323
import android.provider.Settings;
2424

2525
import com.android.settingslib.core.AbstractPreferenceController;
26-
import com.android.settings.core.PreferenceControllerMixin;
2726
import com.android.settingslib.drawer.SettingsDrawerActivity;
2827

29-
import com.android.internal.util.stag.StagUtils;
30-
3128
import libcore.util.Objects;
3229
import java.util.ArrayList;
3330
import java.util.List;
@@ -38,10 +35,9 @@
3835
import android.widget.Toast;
3936

4037
public class DarkUIPreferenceController extends AbstractPreferenceController implements
41-
PreferenceControllerMixin, Preference.OnPreferenceChangeListener {
38+
Preference.OnPreferenceChangeListener {
4239

4340
private static final String SYSTEM_UI_THEME = "systemui_theme_style";
44-
private static final String SUBS_PACKAGE = "projekt.substratum";
4541
private ListPreference mSystemUiThemeStyle;
4642

4743
public DarkUIPreferenceController(Context context) {
@@ -62,17 +58,12 @@ public boolean isAvailable() {
6258
public void displayPreference(PreferenceScreen screen) {
6359
super.displayPreference(screen);
6460
mSystemUiThemeStyle = (ListPreference) screen.findPreference(SYSTEM_UI_THEME);
65-
if (!StagUtils.isPackageInstalled(mContext, SUBS_PACKAGE)) {
66-
int systemuiThemeStyle = Settings.System.getInt(mContext.getContentResolver(),
67-
Settings.System.SYSTEM_UI_THEME, 0);
68-
int valueIndex = mSystemUiThemeStyle.findIndexOfValue(String.valueOf(systemuiThemeStyle));
69-
mSystemUiThemeStyle.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
70-
mSystemUiThemeStyle.setSummary(mSystemUiThemeStyle.getEntry());
71-
mSystemUiThemeStyle.setOnPreferenceChangeListener(this);
72-
} else {
73-
mSystemUiThemeStyle.setEnabled(false);
74-
mSystemUiThemeStyle.setSummary(R.string.disable_themes_installed_title);
75-
}
61+
int systemuiThemeStyle = Settings.System.getInt(mContext.getContentResolver(),
62+
Settings.System.SYSTEM_UI_THEME, 0);
63+
int valueIndex = mSystemUiThemeStyle.findIndexOfValue(String.valueOf(systemuiThemeStyle));
64+
mSystemUiThemeStyle.setValueIndex(valueIndex >= 0 ? valueIndex : 0);
65+
mSystemUiThemeStyle.setSummary(mSystemUiThemeStyle.getEntry());
66+
mSystemUiThemeStyle.setOnPreferenceChangeListener(this);
7667
}
7768
@Override
7869
public boolean onPreferenceChange(Preference preference, Object newValue) {

0 commit comments

Comments
 (0)