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

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

Merge "Change "Manage location services" to "Location services"" into sc-dev

parents cbc3bc5a 2e177b23
Loading
Loading
Loading
Loading

res/drawable/baseline_near_me.xml

deleted100644 → 0
+0 −23
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>
+1 −1
Original line number Diff line number Diff line
@@ -4121,7 +4121,7 @@
    <!-- 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 preference title -->
    <string name="location_services_preference_title">Manage location services</string>
    <string name="location_services_preference_title">Location 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 -->
+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@
        <Preference
            android:fragment="com.android.settings.location.LocationServices"
            android:key="location_services"
            android:icon="@drawable/baseline_near_me"
            android:icon="@drawable/ic_chevron_right_24dp"
            android:title="@string/location_services_preference_title"
            settings:controller="com.android.settings.location.LocationServicesPreferenceController"/>