fw: Move STATUS_BAR_SHOW_WEATHER to CMSettings. (e807e27f) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+0 −6

Original line number	Diff line number	Diff line
		@@ -3617,12 +3617,6 @@ public final class Settings {
		* the setting value. See an example above.
		*/

		/**
		* Boolean value on whether to show weather in the statusbar
		* @hide
		*/
		public static final String STATUS_BAR_SHOW_WEATHER = "status_bar_show_weather";

		/**
		* Volume keys control cursor in text fields (default is 0)
		* 0 - Disabled

+4 −4

Original line number	Diff line number	Diff line
		@@ -924,8 +924,8 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
		super.observe();

		ContentResolver resolver = mContext.getContentResolver();
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.STATUS_BAR_SHOW_WEATHER), false, this, UserHandle.USER_ALL);
		resolver.registerContentObserver(CMSettings.System.getUriFor(
		CMSettings.System.STATUS_BAR_SHOW_WEATHER), false, this, UserHandle.USER_ALL);
		resolver.registerContentObserver(CMSettings.System.getUriFor(
		CMSettings.System.STATUS_BAR_BATTERY_STYLE), false, this, UserHandle.USER_ALL);
		resolver.registerContentObserver(CMSettings.System.getUriFor(
		@@ -961,8 +961,8 @@ public class StatusBarHeaderView extends RelativeLayout implements View.OnClickL
		}

		mShowBatteryTextExpanded = showExpandedBatteryPercentage;
		mShowWeather = Settings.System.getInt(
		resolver, Settings.System.STATUS_BAR_SHOW_WEATHER, 1) == 1;
		mShowWeather = CMSettings.System.getInt(
		resolver, CMSettings.System.STATUS_BAR_SHOW_WEATHER, 1) == 1;
		updateVisibilities();
		requestCaptureValues();
		}