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

Commit 5403efba authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "What color starts with O?"

parents f54c7639 a0594667

core/res/res/drawable-nodpi/platlogo.xml

+17 −14
Original line number Diff line number Diff line 
<!--

Copyright (C) 2016 The Android Open Source Project

Copyright (C) 2017 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.
@@ -14,24 +14,27 @@ Copyright (C) 2016 The Android Open Source Project 
    limitations under the License.

-->

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

        android:width="512dp"

        android:height="512dp"

        android:width="480dp"

        android:height="480dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#FFc7d4b6"

        android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>

        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:fillColor="#FFfbd3cb"

        android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>

        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:fillColor="#40000000"

        android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/>

        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:fillColor="#40000000"

        android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>

        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:fillColor="#FFe0e0d6"

        android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>

        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>

core/res/res/drawable-nodpi/stat_sys_adb.xml

+11 −15
Original line number Diff line number Diff line 
<!--

Copyright (C) 2016 The Android Open Source Project

Copyright (C) 2017 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.
@@ -16,21 +16,17 @@ Copyright (C) 2016 The Android Open Source Project 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#A0FFFFFF"

        android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>

        android:fillColor="#FF000000"

        android:pathData="M12.0,12.0m-10.0,0.0a10.0,10.0,0,1,1,20.0,0.0a10.0,10.0,0,1,1,-20.0,0.0"

        android:fillAlpha="0.25"/>

    <path

        android:fillColor="#A0FFFFFF"

        android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>

        android:fillColor="#FF000000"

        android:pathData="M12,22 C6.4771525,22 2,17.5228475 2,12 C2,6.4771525 6.4771525,2 12,2 C17.5228475,2 22,6.4771525 22,12 C22,17.5228475 17.5228475,22 12,22 Z M12,18.5 C15.5898509,18.5 18.5,15.5898509 18.5,12 C18.5,8.41014913 15.5898509,5.5 12,5.5 C8.41014913,5.5 5.5,8.41014913 5.5,12 C5.5,15.5898509 8.41014913,18.5 12,18.5 Z"/>

    <path

        android:fillColor="#40000000"

        android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/>

    <path

        android:fillColor="#40000000"

        android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>

        android:fillColor="#FF000000"

        android:pathData="M12,18.5 C8.41014913,18.5 5.5,15.5898509 5.5,12 C5.5,8.41014913 8.41014913,5.5 12,5.5 C15.5898509,5.5 18.5,8.41014913 18.5,12 C18.5,15.5898509 15.5898509,18.5 12,18.5 Z M12,15 C13.6568542,15 15,13.6568542 15,12 C15,10.3431458 13.6568542,9 12,9 C10.3431458,9 9,10.3431458 9,12 C9,13.6568542 10.3431458,15 12,15 Z"

        android:fillAlpha="0.25"/>

</vector>

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

+15 −13
Original line number Diff line number Diff line 
<!--

Copyright (C) 2016 The Android Open Source Project

Copyright (C) 2017 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.
@@ -19,20 +19,22 @@ Copyright (C) 2016 The Android Open Source Project 
        android:viewportWidth="48.0"

        android:viewportHeight="48.0">

    <path

        android:fillColor="#00796B"

        android:pathData="M32.0,12.5l0.0,28.0l12.0,-5.0l0.0,-28.0z"/>

        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:fillColor="#00796B"

        android:pathData="M4.0,40.5l12.0,-5.0l0.0,-11.0l-12.0,-12.0z"/>

        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:fillColor="#40000000"

        android:pathData="M44.0,35.5l-12.0,-12.0l0.0,-4.0z"/>

        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:fillColor="#40000000"

        android:pathData="M4.0,12.5l12.0,12.0l0.0,4.0z"/>

        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:fillColor="#4DB6AC"

        android:pathData="M32.0,23.5l-16.0,-16.0l-12.0,5.0l0.0,0.0l12.0,12.0l16.0,16.0l12.0,-5.0l0.0,0.0z"/>

        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>