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

Commit be41f05d authored by Neil Fuller's avatar Neil Fuller Committed by Android (Google) Code Review
Browse files

Merge "OfflineLocationTimeZoneProvider config in system"

parents ddfc4a5e 0131f69b

core/res/AndroidManifest.xml

+15 −0
Original line number Original line Diff line number Diff line
@@ -5223,6 +5223,9 @@ 
             android:label="@string/sensor_notification_service"/>

             android:label="@string/sensor_notification_service"/>

    <!-- Attribution for Twilight service. -->

    <!-- Attribution for Twilight service. -->

    <attribution android:tag="TwilightService" android:label="@string/twilight_service"/>

    <attribution android:tag="TwilightService" android:label="@string/twilight_service"/>

    <!-- Attribution for the Offline LocationTimeZoneProvider, used to detect time zone using

         on-device data -->

    <attribution android:tag="OfflineLocationTimeZoneProvider" android:label="@string/offline_location_time_zone_detection_service"/>





    <application android:process="system"

    <application android:process="system"

                 android:persistent="true"

                 android:persistent="true"
@@ -5689,6 +5692,18 @@ 
            </intent-filter>

            </intent-filter>

        </service>

        </service>





        <!-- AOSP configures a default secondary LocationTimeZoneProvider that uses an on-device

             data set from the com.android.geotz APEX. -->

        <uses-library android:name="com.android.location.provider" />

        <service android:name="com.android.timezone.geotz.provider.OfflineLocationTimeZoneService"

                 android:exported="false">

            <intent-filter>

                <action android:name="com.android.location.timezone.service.v1.SecondaryLocationTimeZoneProvider" />

            </intent-filter>

            <meta-data android:name="serviceVersion" android:value="1" />

            <meta-data android:name="serviceIsMultiuser" android:value="true" />

        </service>



        <provider

        <provider

            android:name="com.android.server.textclassifier.IconsContentProvider"

            android:name="com.android.server.textclassifier.IconsContentProvider"

            android:authorities="com.android.textclassifier.icons"

            android:authorities="com.android.textclassifier.icons"

core/res/res/values/config.xml

+7 −2
Original line number Original line Diff line number Diff line
@@ -1622,8 +1622,13 @@ 
         wants to disable the overlay mechanism can set it to false. -->

         wants to disable the overlay mechanism can set it to false. -->

    <bool name="config_enableSecondaryLocationTimeZoneOverlay" translatable="false">false</bool>

    <bool name="config_enableSecondaryLocationTimeZoneOverlay" translatable="false">false</bool>

    <!-- Package name providing the secondary location time zone provider. Used only when

    <!-- Package name providing the secondary location time zone provider. Used only when

         config_enableSecondaryLocationTimeZoneOverlay is false. -->

         config_enableSecondaryLocationTimeZoneOverlay is false.

    <string name="config_secondaryLocationTimeZoneProviderPackageName" translatable="false">@null</string>



         By default, set to "android" to pick up the default LocationTimeZoneProvider configured in

         the system server's AndroidManifest.xml. See the

         com.android.location.timezone.service.v1.SecondaryLocationTimeZoneProvider intent-filter

         definition there for more information. -->

    <string name="config_secondaryLocationTimeZoneProviderPackageName" translatable="false">android</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

core/res/res/values/strings.xml

+3 −0
Original line number Original line Diff line number Diff line
@@ -433,6 +433,9 @@ 
    <string name="sensor_notification_service">Sensor Notification Service</string>

    <string name="sensor_notification_service">Sensor Notification Service</string>

    <!-- Attribution for Twilight service. [CHAR LIMIT=NONE]-->

    <!-- Attribution for Twilight service. [CHAR LIMIT=NONE]-->

    <string name="twilight_service">Twilight Service</string>

    <string name="twilight_service">Twilight Service</string>

    <!-- Attribution for Offline LocationTimeZoneDetector service, i.e. one capable of performing

         time zone lookup using geo-spacial information held on the device. [CHAR LIMIT=NONE]-->

    <string name="offline_location_time_zone_detection_service">Offline Time Zone Detection Service</string>





    <!-- Factory reset warning dialog strings--> <skip />

    <!-- Factory reset warning dialog strings--> <skip />

    <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->

    <!-- Shows up in the dialog's title to warn about an impeding factory reset. [CHAR LIMIT=NONE] -->