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

Commit 8276a97f authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android Git Automerger
Browse files

am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions -... 

am 010b53c0: am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev

* commit '010b53c0':
  Update permission icons to final versions - framework
parents c2c3eacb 010b53c0

core/res/AndroidManifest.xml

+6 −3
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ 


    <!-- Used for runtime permissions related to user's contacts and profile. -->

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

        android:icon="@drawable/perm_group_social_info"

        android:icon="@drawable/perm_group_contacts"

        android:label="@string/permgrouplab_contacts"

        android:description="@string/permgroupdesc_contacts"

        android:priority="100" />
@@ -391,7 +391,7 @@ 


    <!-- Used for runtime permissions related to user's SMS messages. -->

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

        android:icon="@drawable/perm_group_messages"

        android:icon="@drawable/perm_group_sms"

        android:label="@string/permgrouplab_sms"

        android:description="@string/permgroupdesc_sms"

        android:priority="300" />
@@ -729,6 +729,7 @@ 
    <!-- Used for permissions that are associated with accessing

         camera or capturing images/video from the device. -->

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

        android:icon="@drawable/perm_group_sensors"

        android:label="@string/permgrouplab_sensors"

        android:description="@string/permgroupdesc_sensors"

        android:priority="800" />
@@ -1535,7 +1536,9 @@ 
    <permission android:name="android.permission.CHANGE_CONFIGURATION"

        android:protectionLevel="signature|privileged|development" />



    <!-- Allows an application to read or write the system settings. -->

    <!-- Allows an application to read or write the system settings.

         <p>Protection level: signature

    -->

    <permission android:name="android.permission.WRITE_SETTINGS"

        android:label="@string/permlab_writeSettings"

        android:description="@string/permdesc_writeSettings"

core/res/res/drawable/perm_group_messages.xml→core/res/res/drawable/ic_more_items.xml

+12 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2015 The Android Open Source Project
@@ -14,11 +15,15 @@ 
    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#000000"

        android:pathData="M3 13h2v-2H3v2zm0 4h2v-2H3v2zm0-8h2V7H3v2zm4 4h14v-2H7v2zm0 4h14v-2H7v2zM7

7v2h14V7H7z" />

    <path

        android:fillColor="#FF000000"

        android:pathData="M40.0,4.0L8.0,4.0C5.79,4.0 4.02,5.79 4.02,8.0L4.0,44.0l8.0,-8.0l28.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L44.0,8.0c0.0,-2.21 -1.79,-4.0 -4.0,-4.0zm-4.0,24.0L12.0,28.0l0.0,-4.0l16.0,0.0l0.0,4.0zm0.0,-6.0L12.0,22.0l0.0,-4.0l24.0,0.0l0.0,4.0zm0.0,-6.0L12.0,16.0l0.0,-4.0l24.0,0.0l0.0,4.0z"/>

        android:pathData="M0 0h24v24H0z" />

</vector>
 
 No newline at end of file

core/res/res/drawable/perm_group_calendar.xml

+12 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2015 The Android Open Source Project
@@ -14,11 +15,15 @@ 
    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#000000"

        android:pathData="M17 12h-5v5h5v-5zM16 1v2H8V1H6v2H5c-1.11 0-1.99 .9 -1.99 2L3 19c0 1.1 .89 2 2

2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2h-1V1h-2zm3 18H5V8h14v11z" />

    <path

        android:fillColor="#FF000000"

        android:pathData="M34.0,24.0L24.0,24.0l0.0,10.0l10.0,0.0L34.0,24.0zM32.0,2.0l0.0,4.0L16.0,6.0L16.0,2.0l-4.0,0.0l0.0,4.0l-2.0,0.0c-2.21,0.0 -3.98,1.79 -3.98,4.0L6.0,38.0c0.0,2.21 1.79,4.0 4.0,4.0l28.0,0.0c2.21,0.0 4.0,-1.79 4.0,-4.0L42.0,10.0c0.0,-2.21 -1.79,-4.0 -4.0,-4.0l-2.0,0.0L36.0,2.0l-4.0,0.0zm6.0,36.0L10.0,38.0L10.0,16.0l28.0,0.0l0.0,22.0z"/>

        android:pathData="M0 0h24v24H0z" />

</vector>
 
 No newline at end of file

core/res/res/drawable/perm_group_camera.xml

+16 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2015 The Android Open Source Project
@@ -14,11 +15,19 @@ 
    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:fillColor="#000000"

        android:pathData="M 12 8.8 C 13.7673111995 8.8 15.2 10.2326888005 15.2 12 C 15.2 13.7673111995 13.7673111995 15.2 12 15.2 C 10.2326888005 15.2 8.8 13.7673111995 8.8 12 C 8.8 10.2326888005 10.2326888005 8.8 12 8.8 Z" />

    <path

        android:fillColor="#000000"

        android:pathData="M9 2L7.17 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1 0 2-.9

2-2V6c0-1.1-.9-2-2-2h-3.17L15 2H9zm3 15c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5

5-2.24 5-5 5z" />

    <path

        android:fillColor="#FF000000"

        android:pathData="M18.8,21.0l9.53,-16.51C26.94,4.18 25.49,4.0 24.0,4.0c-4.8,0.0 -9.19,1.69 -12.64,4.51l7.33,12.6 0.11,-0.2zm24.28,-3.0c-1.84,-5.85 -6.3,-10.52 -11.99,-12.68L23.77,18.0l19.31,0.0zm0.52,2.0L28.62,20.0l0.58,1.0 9.53,16.5C41.99,33.94 44.0,29.21 44.0,24.0c0.0,-1.37 -0.14,-2.71 -0.4,-4.0zm-26.53,4.0l-7.8,-13.5C6.01,14.06 4.0,18.79 4.0,24.0c0.0,1.3 0.14,2.7 0.4,4.0l14.98,0.0l-2.31,-4.0zM4.92,30.0c1.84,5.85 6.3,10.52 11.99,12.68L24.23,30.0L4.92,30.0zm22.54,0.0l-7.8,13.51c1.0,0.31 2.8,0.49 4.3,0.49 4.8,0.0 9.19,-1.69 12.64,-4.51L29.31,26.8 27.46,30.0z"/>

        android:pathData="M0 0h24v24H0z" />

</vector>
 
 No newline at end of file

core/res/res/drawable/perm_group_social_info.xml→core/res/res/drawable/perm_group_contacts.xml

+14 −7
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

    Copyright (C) 2015 The Android Open Source Project
@@ -14,11 +15,17 @@ 
    limitations under the License.

-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24.0dp"

        android:height="24.0dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">



    <path

        android:pathData="M0 0h24v24H0zm0 0h24v24H0zm0 0h24v24H0z" />

    <path

        android:fillColor="#FF000000"

        android:pathData="M32.0,22.0c3.31,0.0 5.98,-2.69 5.98,-6.0s-2.67,-6.0 -5.98,-6.0c-3.31,0.0 -6.0,2.69 -6.0,6.0s2.69,6.0 6.0,6.0zm-16.0,0.0c3.31,0.0 5.98,-2.69 5.98,-6.0s-2.67,-6.0 -5.98,-6.0c-3.31,0.0 -6.0,2.69 -6.0,6.0s2.69,6.0 6.0,6.0zm0.0,4.0c-4.67,0.0 -14.0,2.34 -14.0,7.0l0.0,5.0l28.0,0.0l0.0,-5.0c0.0,-4.66 -9.33,-7.0 -14.0,-7.0zm16.0,0.0c-0.58,0.0 -1.2,0.04 -1.9,0.11C32.39,27.78 34.0,30.03 34.0,33.0l0.0,5.0l12.0,0.0l0.0,-5.0c0.0,-4.66 -9.33,-7.0 -14.0,-7.0z"/>

        android:fillColor="#000000"

        android:pathData="M20 0H4v2h16V0zM4 24h16v-2H4v2zM20 4H4c-1.1 0-2 .9-2 2v12c0 1.1 .9 2 2 2h16c1.1

0 2-.9 2-2V6c0-1.1-.9-2-2-2zm-8 2.75c1.24 0 2.25 1.01 2.25 2.25s-1.01 2.25-2.25

2.25S9.75 10.24 9.75 9 10.76 6.75 12 6.75zM17 17H7v-1.5c0-1.67 3.33-2.5 5-2.5s5

.83 5 2.5V17z" />

</vector>
 
 No newline at end of file