Merge "Tidy configuration associated with geotz" into sc-dev

This commit is contained in:
Neil Fuller
2021-05-19 08:33:00 +00:00
committed by Android (Google) Code Review

View File

@@ -1653,29 +1653,38 @@
<integer name="config_timeZoneRulesCheckRetryCount">5</integer> <integer name="config_timeZoneRulesCheckRetryCount">5</integer>
<!-- Whether the geolocation time zone detection feature is enabled. Setting this to false means <!-- Whether the geolocation time zone detection feature is enabled. Setting this to false means
the feature cannot be used. Setting this to true means it may be used if other the feature cannot be used. Setting this to true means system server components can be
configuration allows (see provider configuration below, also compile time overlays). --> tested and location time zone detection may be used if other configuration allows (see
location time zone provider configuration settings below). -->
<bool name="config_enableGeolocationTimeZoneDetection" translatable="false">true</bool> <bool name="config_enableGeolocationTimeZoneDetection" translatable="false">true</bool>
<!-- Whether the primary LocationTimeZoneProvider is enabled. <!-- Whether the primary location time zone provider is enabled.
Ignored if config_enableGeolocationTimeZoneDetection is false --> This setting is ignored if config_enableGeolocationTimeZoneDetection is false.
AOSP does not configure a primary location time zone provider. -->
<bool name="config_enablePrimaryLocationTimeZoneProvider" translatable="false">false</bool> <bool name="config_enablePrimaryLocationTimeZoneProvider" translatable="false">false</bool>
<!-- The package name providing the primary location time zone provider.
<!-- The package hosting the primary location time zone provider.
Only used when config_enableGeolocationTimeZoneDetection and Only used when config_enableGeolocationTimeZoneDetection and
enablePrimaryLocationTimeZoneProvider are true. --> config_enablePrimaryLocationTimeZoneProvider are true.
<string name="config_primaryLocationTimeZoneProviderPackageName" translatable="false">@null</string>
<!-- Whether the secondary LocationTimeZoneProvider is enabled. See android.service.timezone.TimeZoneProviderService for how to host location time zone
Ignored if config_enableGeolocationTimeZoneDetection is false --> provider services. -->
<bool name="config_enableSecondaryLocationTimeZoneProvider" translatable="false">true</bool> <string name="config_primaryLocationTimeZoneProviderPackageName" translatable="false"></string>
<!-- Package name providing the secondary location time zone provider. Used only when
config_enableSecondaryLocationTimeZoneOverlay is false.
By default, set to "android" to pick up the default LocationTimeZoneProvider configured in <!-- Whether the secondary location time zone provider is enabled.
the system server's AndroidManifest.xml. See the This setting is ignored if config_enableGeolocationTimeZoneDetection is false.
com.android.location.timezone.service.v1.SecondaryLocationTimeZoneProvider intent-filter
definition there for more information. --> AOSP does not configure a secondary location time zone provider. -->
<string name="config_secondaryLocationTimeZoneProviderPackageName" translatable="false">android</string> <bool name="config_enableSecondaryLocationTimeZoneProvider" translatable="false">false</bool>
<!-- The package hosting the secondary location time zone provider.
Only used when config_enableGeolocationTimeZoneDetection and
config_enableSecondaryLocationTimeZoneProvider are true.
See android.service.timezone.TimeZoneProviderService for how to host location time zone
provider services. -->
<string name="config_secondaryLocationTimeZoneProviderPackageName" translatable="false"></string>
<!-- Whether to enable network location overlay which allows network location provider to be <!-- Whether to enable network location overlay which allows network location provider to be
replaced by an app at run-time. When disabled, only the replaced by an app at run-time. When disabled, only the