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

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

Merge "Add icons to Manage location services and App location permissions" into sc-dev

parents 318cc18f a13c0f5d
Loading
Loading
Loading
Loading
+23 −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.
-->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
    android:viewportWidth="24"
    android:viewportHeight="24"
    android:tint="?attr/colorControlNormal">
  <path
      android:fillColor="@android:color/black"
      android:pathData="M21,3L3,10.53v0.98l6.84,2.65L12.48,21h0.98L21,3z"/>
</vector>
+11 −5
Original line number Diff line number Diff line
@@ -687,18 +687,24 @@
    <!-- Location settings footer warning text when location is on [CHAR LIMIT=NONE] -->
    <string name="location_settings_footer_location_on">
        Location may use sources like GPS, Wi\u2011Fi, mobile networks, and sensors to help estimate
        your device\u2019s location. Apps with the nearby devices permission can determine the
        your device\u2019s location.
        &lt;br>&lt;br>Apps with the Nearby devices permission can determine the
        relative position of connected devices.
        &lt;a href="<xliff:g example="http://www.google.com" id="url">
        https://support.google.com/android/answer/3467281</xliff:g>">Learn more&lt;/a>.
        &lt;br>&lt;br>&lt;a href="<xliff:g example="http://www.google.com" id="url">
        https://support.google.com/android/answer/3467281</xliff:g>">Learn more&lt;/a>
    </string>
    <!-- Location settings footer warning text when location is off [CHAR LIMIT=NONE] -->
    <string name="location_settings_footer_location_off">
        Location access is off for apps and services. Your device location may still be sent to
        emergency responders when you call or text an emergency number.
        &lt;br>&lt;br>Apps with the nearby devices permission can determine the relative position of
        connected devices.
        &lt;br>&lt;br>Apps with the Nearby devices permission can determine the relative
        position of connected devices.
        &lt;br>&lt;br>&lt;a href="<xliff:g example="http://www.google.com"
        id="url"> https://support.google.com/android/answer/3467281</xliff:g>">Learn more&lt;/a>
    </string>
    <!-- Main Settings screen setting option title for the item to take you to the accounts screen [CHAR LIMIT=22] -->
+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@
        <Preference
            android:key="app_level_permissions"
            android:title="@string/location_app_level_permissions"
            android:icon="@drawable/ic_chevron_right_24dp"
            settings:controller="com.android.settings.location.AppLocationPermissionPreferenceController">
            <intent android:action="android.intent.action.MANAGE_PERMISSION_APPS">
                <extra android:name="android.intent.extra.PERMISSION_NAME"
@@ -64,6 +65,7 @@
        <Preference
            android:fragment="com.android.settings.location.LocationServices"
            android:key="location_services"
            android:icon="@drawable/baseline_near_me"
            android:title="@string/location_services_preference_title"
            settings:controller="com.android.settings.location.LocationServicesPreferenceController"/>