diff --git a/res/drawable/ic_sb_weather_icon.xml b/res/drawable/ic_sb_weather_icon.xml
deleted file mode 100644
index d668767..0000000
--- a/res/drawable/ic_sb_weather_icon.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/res/drawable/ic_sb_weather_icon_nav.xml b/res/drawable/ic_sb_weather_icon_nav.xml
deleted file mode 100644
index 75c379d..0000000
--- a/res/drawable/ic_sb_weather_icon_nav.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
diff --git a/res/values/cherish_arrays.xml b/res/values/cherish_arrays.xml
index af5aed5..cec2a35 100644
--- a/res/values/cherish_arrays.xml
+++ b/res/values/cherish_arrays.xml
@@ -1215,35 +1215,6 @@
- 3
-
-
- - @string/status_bar_weather_hidden
- - @string/status_bar_temperature_image_show_scale
- - @string/status_bar_temperature_image_hide_scale
- - @string/status_bar_temperature_show_scale_hide_image
- - @string/status_bar_temperature_hide_scale_hide_image
- - @string/status_bar_show_image
-
-
-
- - 0
- - 1
- - 2
- - 3
- - 4
- - 5
-
-
-
- - @string/network_traffic_location_statusbar
- - @string/network_traffic_location_quick_statusbar
-
-
-
- - 0
- - 1
-
-
- @string/system_slider_style_default
diff --git a/res/values/cherish_strings.xml b/res/values/cherish_strings.xml
index 70b276a..388b799 100644
--- a/res/values/cherish_strings.xml
+++ b/res/values/cherish_strings.xml
@@ -1162,23 +1162,6 @@
Proceed with caution
Blocking alarms have the potential to cause instability, crashes or data loss.
-
- Status bar weather
- Configure from QS settings/Weather.
- Status bar weather style
- Hidde weather
- Show temp with scale and image
- Show temp with image without scale
- Show temp with scale
- Show temp without scale
- Location
- Show image
- Disabled
- Statusbar
- Quick Statusbar
- Temperature color
- Font size
-
Hide status bar
Touch status bar to toggle visibility
@@ -1386,5 +1369,4 @@
Danmaku speed (vertical)
Blacklist
Menu opacity level
-
diff --git a/res/xml/cherish_settings_statusbar.xml b/res/xml/cherish_settings_statusbar.xml
index fe6b71b..317c08f 100644
--- a/res/xml/cherish_settings_statusbar.xml
+++ b/res/xml/cherish_settings_statusbar.xml
@@ -39,37 +39,6 @@
android:summary="@string/clock_style_category_summary"
android:fragment="com.cherish.settings.fragments.ClockSettings" />
-
-
-
-
-
-
-
-
diff --git a/src/com/cherish/settings/fragments/StatusBarSettings.java b/src/com/cherish/settings/fragments/StatusBarSettings.java
index d1d8321..f396529 100644
--- a/src/com/cherish/settings/fragments/StatusBarSettings.java
+++ b/src/com/cherish/settings/fragments/StatusBarSettings.java
@@ -53,9 +53,6 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
private SystemSettingMasterSwitchPreference mStatusBarLogo;
private static final String PREF_KEY_CUTOUT = "cutout_settings";
- private static final String PREF_STATUS_BAR_WEATHER = "status_bar_weather";
-
- private ListPreference mStatusBarWeather;
@Override
public void onCreate(Bundle icicle) {
@@ -71,19 +68,6 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
mStatusBarLogo.setChecked((Settings.System.getInt(getActivity().getContentResolver(),
Settings.System.STATUS_BAR_LOGO, 0) == 1));
mStatusBarLogo.setOnPreferenceChangeListener(this);
-
- // Status bar weather
- mStatusBarWeather = (ListPreference) findPreference(PREF_STATUS_BAR_WEATHER);
- int temperatureShow = Settings.System.getIntForUser(resolver,
- Settings.System.STATUS_BAR_SHOW_WEATHER_TEMP, 0,
- UserHandle.USER_CURRENT);
- mStatusBarWeather.setValue(String.valueOf(temperatureShow));
- if (temperatureShow == 0) {
- mStatusBarWeather.setSummary(R.string.statusbar_weather_summary);
- } else {
- mStatusBarWeather.setSummary(mStatusBarWeather.getEntry());
- }
- mStatusBarWeather.setOnPreferenceChangeListener(this);
Preference mCutoutPref = (Preference) findPreference(PREF_KEY_CUTOUT);
@@ -101,19 +85,6 @@ public class StatusBarSettings extends SettingsPreferenceFragment implements
Settings.System.putInt(getActivity().getContentResolver(),
Settings.System.STATUS_BAR_LOGO, value ? 1 : 0);
return true;
- } else if (preference == mStatusBarWeather) {
- int temperatureShow = Integer.valueOf((String) objValue);
- int index = mStatusBarWeather.findIndexOfValue((String) objValue);
- Settings.System.putIntForUser(getActivity().getContentResolver(),
- Settings.System.STATUS_BAR_SHOW_WEATHER_TEMP,
- temperatureShow, UserHandle.USER_CURRENT);
- if (temperatureShow == 0) {
- mStatusBarWeather.setSummary(R.string.statusbar_weather_summary);
- } else {
- mStatusBarWeather.setSummary(
- mStatusBarWeather.getEntries()[index]);
- }
- return true;
}
return false;
}