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

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

Merge "Move injected services for work into a new page" into sc-dev

parents f605777f b04a9848

res/xml/location_services.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,6 +33,6 @@ 
        <PreferenceCategory

            android:key="location_services"

            android:layout="@layout/preference_category_no_label"

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

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



</PreferenceScreen>

res/xml/location_services_workprofile.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2021 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



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

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

        android:title="@string/location_services_screen_title">



        <PreferenceCategory

            android:title="@string/managed_profile_location_services"

            android:layout="@layout/preference_category_no_label"

            android:key="location_services_managed_profile"

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



</PreferenceScreen>

res/xml/location_settings.xml

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ 
            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"/>

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



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

        <com.android.settingslib.RestrictedSwitchPreference
@@ -71,7 +71,7 @@ 
            android:key="location_services_managed_profile"

            android:title="@string/managed_profile_location_services"

            settings:forWork="true"

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

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



    </PreferenceCategory>

res/xml/location_settings_personal.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
        android:key="location_services"

        android:title="@string/location_services_screen_title"

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

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

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



    <PreferenceCategory

        android:key="location_footer"

res/xml/location_settings_workprofile.xml

+5 −5
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ 
        </intent>

    </Preference>



    <PreferenceCategory

        android:title="@string/managed_profile_location_services"

        android:layout="@layout/preference_category_no_label"

        android:key="location_services_managed_profile"

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

    <Preference

        android:key="location_services_for_work"

        android:title="@string/location_services_screen_title"

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

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



    <PreferenceCategory

        android:key="location_footer"