From a13c0f5d7abfe097e93096bb089e3152cd13a5f3 Mon Sep 17 00:00:00 2001
From: Yu-Han Yang <yuhany@google.com>
Date: Tue, 6 Apr 2021 18:48:25 -0700
Subject: [PATCH] Add icons to Manage location services and App location
 permissions

- Also updates footer strings

Bug: 180533061
Test: on device
Change-Id: Id75d74ebe72e92f314fbb116beaacb301f86b34a
---
 res/drawable/baseline_near_me.xml | 23 +++++++++++++++++++++++
 res/values/strings.xml            | 16 +++++++++++-----
 res/xml/location_settings.xml     |  2 ++
 3 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 res/drawable/baseline_near_me.xml

diff --git a/res/drawable/baseline_near_me.xml b/res/drawable/baseline_near_me.xml
new file mode 100644
index 00000000000..343f97041ed
--- /dev/null
+++ b/res/drawable/baseline_near_me.xml
@@ -0,0 +1,23 @@
+<?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>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index fcf2f45b075..acafaba23ed 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -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] -->
diff --git a/res/xml/location_settings.xml b/res/xml/location_settings.xml
index 857885dee39..cae128ba645 100644
--- a/res/xml/location_settings.xml
+++ b/res/xml/location_settings.xml
@@ -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"/>