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

Commit 092e34c7 authored by Amin Shaikh's avatar Amin Shaikh Committed by android-build-merger
Browse files

Merge "Update icon packs." into qt-dev am: 0452dcf0 

am: bd357024

Change-Id: I5cdc55a33c39a59c364b6936b50db9f68f6510be
parents d5417c36 bd357024

core/res/res/drawable/ic_corp_badge.xml

+6 −2
Original line number Diff line number Diff line
@@ -17,9 +17,13 @@ Copyright (C) 2018 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="48dp"

        android:height="48dp"

        android:tint="@*android:color/accent_device_default_light"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:fillColor="@*android:color/accent_device_default_light"

        android:pathData="M20,6h-4V4c0,-1.11 -0.89,-2 -2,-2h-4C8.89,2 8,2.89 8,4v2H4C2.89,6 2.01,6.89 2.01,8L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2V8C22,6.89 21.11,6 20,6zM10,4h4v2h-4V4zM20,19H4V8h16V19z"/>

        android:fillColor="@android:color/white"

        android:pathData="M20,6h-4V4c0-1.1-0.9-2-2-2h-4C8.9,2,8,2.9,8,4v2H4C2.9,6,2,6.9,2,8l0,11c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V8 C22,6.9,21.1,6,20,6z M10,4h4v2h-4V4z M20,19H4V8h16V19z" />

    <path

        android:fillColor="@android:color/white"

        android:pathData="M 12 12 C 12.8284271247 12 13.5 12.6715728753 13.5 13.5 C 13.5 14.3284271247 12.8284271247 15 12 15 C 11.1715728753 15 10.5 14.3284271247 10.5 13.5 C 10.5 12.6715728753 11.1715728753 12 12 12 Z" />

</vector>
 
 No newline at end of file

core/tests/coretests/res/values/overlayable_icons_test.xml

+14 −1
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ 
    <item>@*android:drawable/ic_bt_laptop</item>

    <item>@*android:drawable/ic_bt_network_pan</item>

    <item>@*android:drawable/ic_bt_pointing_hid</item>

    <item>@*android:drawable/ic_corp_badge</item>

    <item>@*android:drawable/ic_expand_more</item>

    <item>@*android:drawable/ic_file_copy</item>

    <item>@*android:drawable/ic_info_outline_24</item>

    <item>@*android:drawable/ic_lock</item>

    <item>@*android:drawable/ic_lock_bugreport</item>

    <item>@*android:drawable/ic_lock_open</item>
@@ -39,6 +39,7 @@ 
    <item>@*android:drawable/ic_phone</item>

    <item>@*android:drawable/ic_qs_airplane</item>

    <item>@*android:drawable/ic_qs_auto_rotate</item>

    <item>@*android:drawable/ic_qs_battery_saver</item>

    <item>@*android:drawable/ic_qs_bluetooth</item>

    <item>@*android:drawable/ic_qs_dnd</item>

    <item>@*android:drawable/ic_qs_flashlight</item>
@@ -46,6 +47,17 @@ 
    <item>@*android:drawable/ic_restart</item>

    <item>@*android:drawable/ic_screenshot</item>

    <item>@*android:drawable/ic_settings_bluetooth</item>

    <item>@*android:drawable/ic_signal_cellular_0_4_bar</item>

    <item>@*android:drawable/ic_signal_cellular_0_5_bar</item>

    <item>@*android:drawable/ic_signal_cellular_1_4_bar</item>

    <item>@*android:drawable/ic_signal_cellular_1_5_bar</item>

    <item>@*android:drawable/ic_signal_cellular_2_4_bar</item>

    <item>@*android:drawable/ic_signal_cellular_2_5_bar</item>

    <item>@*android:drawable/ic_signal_cellular_3_4_bar</item>

    <item>@*android:drawable/ic_signal_cellular_3_5_bar</item>

    <item>@*android:drawable/ic_signal_cellular_4_4_bar</item>

    <item>@*android:drawable/ic_signal_cellular_4_5_bar</item>

    <item>@*android:drawable/ic_signal_cellular_5_5_bar</item>

    <item>@*android:drawable/ic_signal_location</item>

    <item>@*android:drawable/ic_wifi_signal_0</item>

    <item>@*android:drawable/ic_wifi_signal_1</item>
@@ -53,6 +65,7 @@ 
    <item>@*android:drawable/ic_wifi_signal_3</item>

    <item>@*android:drawable/ic_wifi_signal_4</item>

    <item>@*android:drawable/perm_group_activity_recognition</item>

    <item>@*android:drawable/perm_group_calendar</item>

    <item>@*android:drawable/perm_group_call_log</item>

    <item>@*android:drawable/perm_group_camera</item>

    <item>@*android:drawable/perm_group_contacts</item>

packages/SystemUI/res/drawable/ic_arrow_back.xml

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

    Copyright (C) 2019 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="?android:attr/colorControlNormal">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />

</vector>

packages/SystemUI/res/drawable/stat_sys_managed_profile_status.xml

+25 −10
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="23dp"

        android:height="18dp"

        android:viewportWidth="23.0"

        android:viewportHeight="18.0">

<!--

       The asset contains a briefcase symbol of 14.551dp x 13.824dp in the center.

    Copyright (C) 2019 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="17dp"

    android:height="17dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M20,6h-4V4c0-1.1-0.9-2-2-2h-4C8.9,2,8,2.9,8,4v2H4C2.9,6,2,6.9,2,8l0,11c0,1.1,0.9,2,2,2h16c1.1,0,2-0.9,2-2V8 C22,6.9,21.1,6,20,6z M10,4h4v2h-4V4z M20,19H4V8h16V19z" />

    <path

        android:pathData="M17.32,5.06h-2.91V3.6c0,-0.81 -0.65,-1.46 -1.46,-1.46h-2.91c-0.81,0 -1.46,0.65 -1.46,1.46v1.46H5.68c-0.81,0 -1.45,0.65 -1.45,1.46l-0.01,8c0,0.81 0.65,1.46 1.46,1.46h11.64c0.81,0 1.46,-0.65 1.46,-1.46v-8C18.78,5.7 18.13,5.06 17.32,5.06zM11.5,11.6c-0.8,0 -1.46,-0.65 -1.46,-1.46c0,-0.8 0.65,-1.46 1.46,-1.46s1.46,0.65 1.46,1.46C12.96,10.95 12.3,11.6 11.5,11.6zM12.96,5.06h-2.91V3.6h2.91V5.06z"

        android:fillColor="#FF000000"/>

        android:fillColor="@android:color/white"

        android:pathData="M 12 12 C 12.8284271247 12 13.5 12.6715728753 13.5 13.5 C 13.5 14.3284271247 12.8284271247 15 12 15 C 11.1715728753 15 10.5 14.3284271247 10.5 13.5 C 10.5 12.6715728753 11.1715728753 12 12 12 Z" />

</vector>
 
 No newline at end of file

packages/SystemUI/res/values/styles.xml

+2 −1
Original line number Diff line number Diff line
@@ -285,6 +285,7 @@ 
        <item name="*android:lockPatternStyle">@style/LockPatternStyle</item>

        <item name="passwordStyle">@style/PasswordTheme</item>

        <item name="backgroundProtectedStyle">@style/BackgroundProtectedStyle</item>

        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>



        <!-- Needed for MediaRoute chooser dialog -->

        <item name="*android:isLightTheme">false</item>
@@ -311,7 +312,7 @@ 
        <item name="*android:errorColor">?android:attr/colorError</item>

    </style>



    <style name="qs_theme" parent="@*android:style/Theme.DeviceDefault.QuickSettings">

    <style name="qs_theme" parent="@style/Theme.SystemUI">

        <item name="lightIconTheme">@style/QSIconTheme</item>

        <item name="darkIconTheme">@style/QSIconTheme</item>

        <item name="android:colorError">@*android:color/error_color_material_dark</item>