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

Commit 3c944130 authored by Jay Thomas Sullivan's avatar Jay Thomas Sullivan Committed by Jay Sullivan
Browse files

Rename permission group to "Nearby devices" 

This renames the "Nearby Bluetooth Devices" group to "Nearby devices",
and changes the associated icon to a more generic,
not-specifically-Bluetooth icon.

The reason for this is that we will soon be adding non-Bluetooth
permissions to this group (i.e., UWB).

Bug: 183988398
Test: manual
Change-Id: I555860880c981171f0bff7f11695a03a0f8de586
parent f5042bcc

core/res/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -1390,7 +1390,7 @@ 
    <!-- Required to be able to discover and connect to nearby Bluetooth devices.

         <p>Protection level: dangerous -->

    <permission-group android:name="android.permission-group.NEARBY_DEVICES"

        android:icon="@drawable/ic_qs_bluetooth"

        android:icon="@drawable/perm_group_nearby_devices"

        android:label="@string/permgrouplab_nearby_devices"

        android:description="@string/permgroupdesc_nearby_devices"

        android:priority="750" />

core/res/res/drawable/perm_group_nearby_devices.xml

0 → 100644
+26 −0
Original line number Diff line number Diff line 
<!--

  ~ 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="#000000"

        android:pathData="M12,16.427L7.574,12 12,7.574 16.426,12zM10.58,2.59l-8,8c-0.78,0.78 -0.78,2.05 0,2.83l8,8c0.78,0.78 2.05,0.78 2.83,0l8,-8c0.78,-0.78 0.78,-2.05 0,-2.83l-8,-8c-0.78,-0.79 -2.04,-0.79 -2.83,0zM13.39,17.81L12,19.2l-1.39,-1.39 -4.42,-4.42L4.8,12l1.39,-1.39 4.42,-4.42L12,4.8l1.39,1.39 4.42,4.42L19.2,12l-1.39,1.39 -4.42,4.42z"/>

</vector>
 
 No newline at end of file

core/res/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -823,9 +823,9 @@ 
    <string name="permgroupdesc_camera">take pictures and record video</string>



    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=40]-->

    <string name="permgrouplab_nearby_devices">Nearby Bluetooth Devices</string>

    <string name="permgrouplab_nearby_devices">Nearby devices</string>

    <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. [CHAR LIMIT=NONE]-->

    <string name="permgroupdesc_nearby_devices">discover and connect to nearby Bluetooth devices</string>

    <string name="permgroupdesc_nearby_devices">discover and connect to nearby devices</string>



    <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. -->

    <string name="permgrouplab_calllog">Call logs</string>