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

Commit 9f9ca154 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Add "See All" page for Recent Location Access" into sc-dev am: f605777f 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/13775472

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d9ce0ab3f3338c5cdb24e448a5a558e1059ae89
parents 665ed9f8 f605777f

res/values/strings.xml

+4 −2
Original line number Diff line number Diff line
@@ -3998,7 +3998,7 @@ 
    <string name="managed_profile_location_switch_title">Location for work profile</string>

    <!-- [CHAR LIMIT=30] Location settings screen. It's a link that directs the user to a page that

      shows the location permission setting for each installed app -->

    <string name="location_app_level_permissions">App access to location</string>

    <string name="location_app_level_permissions">Manage location permissions</string>

    <!-- Summary for app permission on Location settings page when location is off [CHAR LIMIT=NONE] -->

    <string name="location_app_permission_summary_location_off">Location is off</string>

    <!--
@@ -4023,7 +4023,9 @@ 
            apps have access to location</item>

    </plurals>

    <!-- [CHAR LIMIT=50] Location settings screen, sub category for recent location access -->

    <string name="location_category_recent_location_access">Recent location access</string>

    <string name="location_category_recent_location_access">Past 24 hour access</string>

    <!-- Location settings screen, displayed when there're more than three recent location access apps [CHAR LIMIT=30] -->

    <string name="location_recent_location_access_see_all">See all</string>

    <!-- [CHAR LIMIT=30] Location settings screen, button to bring the user to view the details of recent location access -->

    <string name="location_recent_location_access_view_details">View details</string>

    <!-- Location settings screen, displayed when there's no recent app accessing location

res/xml/location_recent_access_see_all.xml

0 → 100644
+20 −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_category_recent_location_access"

    android:key="all_recent_location_access"

    settings:controller="com.android.settings.location.RecentLocationAccessSeeAllPreferenceController">



</PreferenceScreen>

res/xml/location_settings.xml

+7 −0
Original line number Diff line number Diff line
@@ -27,6 +27,13 @@ 
        settings:controller=

            "com.android.settings.location.RecentLocationAccessPreferenceController"/>



    <Preference

        android:key="recent_location_access_see_all_button"

        android:title="@string/location_recent_location_access_see_all"

        android:icon="@drawable/ic_chevron_right_24dp"

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

        settings:searchable="false"/>



    <PreferenceCategory

        android:key="location_advanced_settings"

        android:layout="@layout/preference_category_no_label"

res/xml/location_settings_personal.xml

+9 −2
Original line number Diff line number Diff line
@@ -23,11 +23,18 @@ 
    settings:keywords="@string/keywords_location">



    <PreferenceCategory

        android:key="recent_location_requests"

        android:title="@string/location_category_recent_location_requests"

        android:key="recent_location_access"

        android:title="@string/location_category_recent_location_access"

        settings:controller=

            "com.android.settings.location.RecentLocationAccessPreferenceController"/>



    <Preference

        android:key="recent_location_access_see_all_button"

        android:title="@string/location_recent_location_access_see_all"

        android:icon="@drawable/ic_chevron_right_24dp"

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

        settings:searchable="false"/>



    <!-- This preference category gets removed if new_recent_location_ui is disabled -->

    <Preference

        android:key="app_level_permissions"

res/xml/location_settings_workprofile.xml

+11 −2
Original line number Diff line number Diff line
@@ -23,11 +23,20 @@ 
    settings:keywords="@string/keywords_location">



    <PreferenceCategory

        android:key="recent_location_requests"

        android:title="@string/location_category_recent_location_requests"

        android:key="recent_location_access"

        android:title="@string/location_category_recent_location_access"

        settings:controller=

            "com.android.settings.location.RecentLocationAccessPreferenceController"/>



    <Preference

        android:key="recent_location_access_see_all_button"

        android:title="@string/location_recent_location_access_see_all"

        android:icon="@drawable/ic_chevron_right_24dp"

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

        settings:controller="com.android.settings.core.WorkPreferenceController"

        settings:forWork="true"

        settings:searchable="false"/>



    <com.android.settingslib.RestrictedSwitchPreference

        android:key="managed_profile_location_switch"

        android:title="@string/managed_profile_location_switch_title"