Skip to content

Commit

Permalink
Revert "[2/2] configure SystemUI theme"
Browse files Browse the repository at this point in the history
This reverts commit d26faa9.

Change-Id: Iab10a76f7fd1ac315221a41585b78043ebee10d6
  • Loading branch information
xlxfoxxlx committed Feb 26, 2018
1 parent 4287a51 commit 5de0aa3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 25 deletions.
8 changes: 1 addition & 7 deletions res/xml/system.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,5 @@
android:entries="@array/ringtone_focus_mode_entries"
android:entryValues="@array/ringtone_focus_mode_values" />

<ListPreference
android:key="systemui_theme_style"
android:title="@string/systemui_theme_style_title"
android:persistent="false"
android:entries="@array/systemui_theme_style_entries"
android:entryValues="@array/systemui_theme_style_values" />

</PreferenceScreen>

18 changes: 0 additions & 18 deletions src/com/aosip/owlsnest/advanced/SystemCategory.java
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,9 @@ public class SystemCategory extends SettingsPreferenceFragment implements

private static final String HEADSET_CONNECT_PLAYER = "headset_connect_player";
private static final String RINGTONE_FOCUS_MODE = "ringtone_focus_mode";
private static final String SYSTEMUI_THEME_STYLE = "systemui_theme_style";

private ListPreference mLaunchPlayerHeadsetConnection;
private ListPreference mHeadsetRingtoneFocus;
private ListPreference mSystemUIThemeStyle;

@Override
public int getMetricsCategory() {
Expand Down Expand Up @@ -65,15 +63,6 @@ public void onCreate(Bundle savedInstanceState) {
mHeadsetRingtoneFocus.setValue(Integer.toString(mHeadsetRingtoneFocusValue));
mHeadsetRingtoneFocus.setSummary(mHeadsetRingtoneFocus.getEntry());
mHeadsetRingtoneFocus.setOnPreferenceChangeListener(this);

mSystemUIThemeStyle = (ListPreference) findPreference(SYSTEMUI_THEME_STYLE);
int systemUIThemeStyle = Settings.System.getInt(resolver,
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
Expand All @@ -99,13 +88,6 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
Settings.Global.putInt(resolver, Settings.Global.RINGTONE_FOCUS_MODE,
mHeadsetRingtoneFocusValue);
return true;
} else if (preference == mSystemUIThemeStyle) {
String value = (String) newValue;
Settings.System.putInt(resolver,
Settings.System.SYSTEM_UI_THEME, Integer.valueOf(value));
int valueIndex = mSystemUIThemeStyle.findIndexOfValue(value);
mSystemUIThemeStyle.setSummary(mSystemUIThemeStyle.getEntries()[valueIndex]);
return true;
}
return false;
}
Expand Down

0 comments on commit 5de0aa3

Please sign in to comment.