Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1a31b9df authored Jan 31, 2023 by Adnan Begovic

sysui: Observe weather enabled for lockscreen.

Bug: 261757708
Test: manually, unit
Change-Id: I7a7830cb8875d74a447b3ee07105899418a084c4
Merged-In: I7a7830cb8875d74a447b3ee07105899418a084c4

parent 95d01891

core/java/android/provider/Settings.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -11046,6 +11046,13 @@ public final class Settings {
		public static final String EXTRA_AUTOMATIC_POWER_SAVE_MODE =
		"extra_automatic_power_save_mode";

		/**
		* Whether lockscreen weather is enabled.
		*
		* @hide
		*/
		public static final String LOCK_SCREEN_WEATHER_ENABLED = "lockscreen_weather_enabled";

		/**
		* These entries are considered common between the personal and the managed profile,
		* since the managed profile doesn't get to change them.

core/res/res/values/config.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -6037,4 +6037,7 @@
		<!-- List of certificate to be used for font fs-verity integrity verification -->
		<string-array translatable="false" name="config_fontManagerServiceCerts">
		</string-array>

		<!-- Whether to show weather on the lock screen by default. -->
		<bool name="config_lockscreenWeatherEnabledByDefault">false</bool>
		</resources>

core/res/res/values/symbols.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -4917,4 +4917,7 @@
		<java-symbol type="id" name="language_picker_header" />

		<java-symbol type="dimen" name="status_bar_height_default" />

		<!-- Whether to show weather on the lockscreen by default. -->
		<java-symbol type="bool" name="config_lockscreenWeatherEnabledByDefault" />
		</resources>

packages/SettingsProvider/src/android/provider/settings/backup/SecureSettings.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -219,6 +219,7 @@ public class SecureSettings {
		Settings.Secure.ASSIST_LONG_PRESS_HOME_ENABLED,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_CODE,
		Settings.Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME
		Settings.Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME,
		Settings.Secure.LOCK_SCREEN_WEATHER_ENABLED
		};
		}

packages/SettingsProvider/src/android/provider/settings/validators/SecureSettingsValidators.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -352,5 +352,6 @@ public class SecureSettingsValidators {
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_PROGRAM_INFO, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_CODE, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.BLUETOOTH_LE_BROADCAST_APP_SOURCE_NAME, ANY_STRING_VALIDATOR);
		VALIDATORS.put(Secure.LOCK_SCREEN_WEATHER_ENABLED, BOOLEAN_VALIDATOR);
		}
		}