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

Commit 9ed03729 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Updating work profile badge icon" into sc-v2-dev am: 78cb420b 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/15943178

Change-Id: I1a7eb54c06a439bf06e7cba64985c802ee3d9ef3
parents 33f43d5b 78cb420b

core/res/res/drawable/ic_corp_badge.xml

+1 −4
Original line number Diff line number Diff line
@@ -22,8 +22,5 @@ Copyright (C) 2018 The Android Open Source Project 
        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: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" />

        android:pathData="@string/config_work_badge_path_24"/>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_corp_badge_case.xml

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

        android:width="20dp"

        android:height="20dp"

        android:viewportWidth="20.0"

        android:viewportHeight="20.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M14.67,6.5h-2.33V5.33c0,-0.65 -0.52,-1.17 -1.17,-1.17H8.83c-0.65,0 -1.17,0.52 -1.17,1.17V6.5H5.33c-0.65,0 -1.16,0.52 -1.16,1.17l-0.01,6.42c0,0.65 0.52,1.17 1.17,1.17h9.33c0.65,0 1.17,-0.52 1.17,-1.17V7.67C15.83,7.02 15.31,6.5 14.67,6.5zM10,11.75c-0.64,0 -1.17,-0.52 -1.17,-1.17c0,-0.64 0.52,-1.17 1.17,-1.17c0.64,0 1.17,0.52 1.17,1.17C11.17,11.22 10.64,11.75 10,11.75zM11.17,6.5H8.83V5.33h2.33V6.5z"

        android:pathData="@string/config_work_badge_path_24"

        android:fillColor="#1A73E8"/>

</vector>

core/res/res/drawable/ic_corp_badge_no_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        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,6zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2s2,0.9 2,2S13.1,15 12,15zM14,6h-4V4h4V6z"

        android:pathData="@string/config_work_badge_path_24"

        android:fillColor="#FFFFFF"/>

</vector>

core/res/res/drawable/ic_corp_icon.xml

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,6 @@ 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M20,6h-4L16,4c0,-1.11 -0.89,-2 -2,-2h-4c-1.11,0 -2,0.89 -2,2v2L4,6c-1.11,0 -1.99,0.89 -1.99,2L2,19c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,8c0,-1.11 -0.89,-2 -2,-2zM12,15c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM14,6h-4L10,4h4v2z"

        android:pathData="@string/config_work_badge_path_24"

        android:fillColor="#000000"/>

</vector>
 
 No newline at end of file

core/res/res/drawable/ic_corp_icon_badge_case.xml

+9 −3
Original line number Diff line number Diff line
@@ -22,9 +22,15 @@ Copyright (C) 2016 The Android Open Source Project 


    <path

        android:pathData="M 42 42 L 58 42 L 58 58 L 42 58 L 42 42 Z" />

    <group

        android:scaleX=".66"

        android:scaleY=".66"

        android:translateX="42"

        android:translateY="42">

        <path

        android:fillColor="#1A73E8"

        android:pathData="M55.33,46H52.67V44.67a1.33,1.33,0,0,0-1.33-1.33H48.67a1.33,1.33,0,0,0-1.33,1.33V46H44.67a1.32,1.32,0,0,0-1.33,1.33v7.33A1.33,1.33,0,0,0,44.67,56H55.33a1.33,1.33,0,0,0,1.33-1.33V47.33A1.33,1.33,0,0,0,55.33,46ZM50,52a1.33,1.33,0,1,1,1.33-1.33A1.34,1.34,0,0,1,50,52Zm1.33-6H48.67V44.67h2.67Z" />

            android:pathData="@string/config_work_badge_path_24"

            android:fillColor="#1A73E8"/>

    </group>

    <path

        android:pathData="M 0 0 H 64 V 64 H 0 V 0 Z" />

</vector>
 
 No newline at end of file