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

Commit 6731f0eb authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move LocationServicePreference to Location > LocationServices" into sc-dev

parents dabe7775 e93c1298

AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -1316,7 +1316,7 @@ 
        </activity>

        <activity

            android:name="Settings$ScanningSettingsActivity"

            android:label="@string/location_scanning_screen_title"

            android:label="@string/location_services_screen_title"

            android:icon="@drawable/ic_homepage_location"

            android:exported="true"

            android:configChanges="orientation|keyboardHidden|screenSize">
@@ -1325,7 +1325,7 @@ 
                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.location.ScanningSettings" />

                android:value="com.android.settings.location.LocationServices" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                android:value="true" />

        </activity>

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -4007,8 +4007,6 @@ 
    <string name="location_high_battery_use">High battery use</string>

    <!-- [CHAR LIMIT=30] Location settings screen, recent location requests low battery use-->

    <string name="location_low_battery_use">Low battery use</string>

    <!-- [CHAR LIMIT=60] Wireless background scanning settings screen, screen title -->

    <string name="location_scanning_screen_title">Wi\u2011Fi and Bluetooth scanning</string>

    <!-- [CHAR LIMIT=130] Preference title for Wi-Fi always scanning -->

    <string name="location_scanning_wifi_always_scanning_title">Wi\u2011Fi scanning</string>

    <!-- Preference description text for Wi-Fi always scanning -->
@@ -4017,6 +4015,8 @@ 
    <string name="location_scanning_bluetooth_always_scanning_title">Bluetooth scanning</string>

    <!-- Description text for Bluetooth always scanning -->

    <string name="location_scanning_bluetooth_always_scanning_description">Allow apps and services to scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services.</string>

    <!-- [CHAR LIMIT=60] Location Services screen, screen title -->

    <string name="location_services_screen_title">Location Services</string>

    <!-- [CHAR LIMIT=50] Location settings screen, sub category for location services for managed profile -->

    <string name="managed_profile_location_services">Location services for work</string>
































res/xml/location_scanning.xml→res/xml/location_services.xml



+7
−1






























Original line number
Diff line number
Diff line







@@ -15,7 +15,8 @@







-->



















<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"









        android:title="@string/location_scanning_screen_title">









                  xmlns:settings="http://schemas.android.com/apk/res-auto"









        android:title="@string/location_services_screen_title">



















        <SwitchPreference









            android:title="@string/location_scanning_wifi_always_scanning_title"








@@ -29,4 +30,9 @@







            android:defaultValue="true"









            android:key="bluetooth_always_scanning" />



















        <PreferenceCategory









            android:key="location_services"









            android:layout="@layout/preference_category_no_label"









            settings:controller="com.android.settings.location.LocationServicePreferenceController"/>



















</PreferenceScreen>
























res/xml/location_settings.xml



+3
−8






























Original line number
Diff line number
Diff line







@@ -50,9 +50,9 @@







        </Preference>



















        <Preference









            android:fragment="com.android.settings.location.ScanningSettings"









            android:key="location_scanning"









            android:title="@string/location_scanning_screen_title"









            android:fragment="com.android.settings.location.LocationServices"









            android:key="location_services"









            android:title="@string/location_services_screen_title"









            settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>



















        <!-- This preference gets removed if there is no managed profile -->








@@ -65,11 +65,6 @@







            settings:forWork="true"









            settings:useAdminDisabledSummary="true"/>



















        <PreferenceCategory









            android:key="location_services"









            android:layout="@layout/preference_category_no_label"









            settings:controller="com.android.settings.location.LocationServicePreferenceController"/>



















        <!-- This preference gets removed if there is no managed profile -->









        <PreferenceCategory









            android:key="location_services_managed_profile"
































res/xml/location_settings_personal.xml



+3
−8






























Original line number
Diff line number
Diff line







@@ -46,15 +46,10 @@







    </Preference>



















    <Preference









        android:key="location_scanning"









        android:title="@string/location_scanning_screen_title"









        android:fragment="com.android.settings.location.ScanningSettings"









        settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>



















    <PreferenceCategory









        android:key="location_services"









        android:layout="@layout/preference_category_no_label"









        settings:controller="com.android.settings.location.LocationServicePreferenceController"/>









        android:title="@string/location_services_screen_title"









        android:fragment="com.android.settings.location.LocationServices"









        settings:controller="com.android.settings.location.LocationScanningPreferenceController"/>



















    <PreferenceCategory









        android:key="location_footer"