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

Commit 829e5225 authored by Daniel Sandler's avatar Daniel Sandler Committed by android-build-merger
Browse files

Merge "O no, this should be a P." into pi-dev 

am: 31cb1132

Change-Id: I7392d863c935ab64fc6445fca4c3b35352ffcf1f
parents b8ed550c 31cb1132

packages/SystemUI/res/drawable-nodpi/icon.xml

+5 −26
Original line number Original line Diff line number Diff line 
<!--

<!--

Copyright (C) 2017 The Android Open Source Project

Copyright (C) 2018 The Android Open Source Project





   Licensed under the Apache License, Version 2.0 (the "License");

   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    you may not use this file except in compliance with the License.
@@ -13,28 +13,7 @@ Copyright (C) 2017 The Android Open Source Project 
    See the License for the specific language governing permissions and

    See the License for the specific language governing permissions and

    limitations under the License.

    limitations under the License.

-->

-->

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

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

        android:width="48dp"

    <background android:drawable="@drawable/icon_bg"/>

        android:height="48dp"

    <foreground android:drawable="@drawable/p"/>

        android:viewportWidth="48.0"

</adaptive-icon>
 
        android:viewportHeight="48.0">

    <path

        android:pathData="M25.0,25.0m-20.5,0.0a20.5,20.5,0,1,1,41.0,0.0a20.5,20.5,0,1,1,-41.0,0.0"

        android:fillAlpha="0.066"

        android:fillColor="#000000"/>

    <path

        android:pathData="M24.0,24.0m-20.0,0.0a20.0,20.0,0,1,1,40.0,0.0a20.0,20.0,0,1,1,-40.0,0.0"

        android:fillColor="#FFC107"/>

    <path

        android:pathData="M44,24.2010101 L33.9004889,14.101499 L14.101499,33.9004889 L24.2010101,44 C29.2525804,43.9497929 34.2887564,41.9975027 38.1431296,38.1431296 C41.9975027,34.2887564 43.9497929,29.2525804 44,24.2010101 Z"

        android:fillColor="#FE9F00"/>

    <path

        android:pathData="M24.0,24.0m-14.0,0.0a14.0,14.0,0,1,1,28.0,0.0a14.0,14.0,0,1,1,-28.0,0.0"

        android:fillColor="#FED44F"/>

    <path

        android:pathData="M37.7829445,26.469236 L29.6578482,18.3441397 L18.3441397,29.6578482 L26.469236,37.7829445 C29.1911841,37.2979273 31.7972024,36.0037754 33.9004889,33.9004889 C36.0037754,31.7972024 37.2979273,29.1911841 37.7829445,26.469236 Z"

        android:fillColor="#FFC107"/>

    <path

        android:pathData="M24.0,24.0m-8.0,0.0a8.0,8.0,0,1,1,16.0,0.0a8.0,8.0,0,1,1,-16.0,0.0"

        android:fillColor="#FFFFFF"/>

</vector>

packages/SystemUI/res/drawable-nodpi/icon_bg.xml

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

Copyright (C) 2018 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.

-->

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

    android:color="#C5E1A5" />

packages/SystemUI/res/drawable-nodpi/p.xml

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

Copyright (C) 2018 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="108dp"

    android:height="108dp"

    android:viewportWidth="108"

    android:viewportHeight="108">

  <path

      android:pathData="M49,65L54,65C60.075,65 65,60.075 65,54C65,47.925 60.075,43 54,43C47.925,43 43,47.925 43,54L43,108"

      android:strokeWidth="16"

      android:fillColor="#00000000"

      android:strokeColor="#7CB342"

      android:fillType="evenOdd"/>

  <path

      android:pathData="M51,65L54,65C60.075,65 65,60.075 65,54C65,47.925 60.075,43 54,43C47.925,43 43,47.925 43,54L43,108"

      android:strokeWidth="8"

      android:fillColor="#00000000"

      android:strokeColor="#FFFFFF"

      android:fillType="evenOdd"/>

</vector>