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

Commit bf010071 authored by Garfield Tan's avatar Garfield Tan Committed by android-build-merger
Browse files

Migrate the rest of shortcuts to adaptive icons. am: 6e324287 

am: 84133283

Change-Id: Icfe6d343c32ac74e7646e0e38266e7c2e6b1fdb7
parents f4d9438b 84133283

res/drawable/ic_advanced_shortcut.xml

+16 −13
Original line number Diff line number Diff line
@@ -15,16 +15,19 @@ 
  ~ limitations under the License.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="oval">

            <solid android:color="@color/shortcut_background" />

        </shape>

    </item>

    <item

        android:drawable="@drawable/ic_smartphone_white"

        android:top="16dp"

        android:right="16dp"

        android:bottom="16dp"

        android:left="16dp" />

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

    <background android:drawable="@color/shortcut_background" />

    <foreground>

        <inset android:inset="33%">

            <vector

                android:width="24dp"

                android:height="24dp"

                android:viewportWidth="24.0"

                android:viewportHeight="24.0">

                <path

                    android:fillColor="@color/shortcut_foreground"

                    android:pathData="M17 1.01L7 1c-1.1 0,-2 .9,-2 2v18c0 1.1.9 2 2 2h10c1.1 0 2,-.9 2,-2V3c0,-1.1,-.9,-1.99,-2,-1.99zM17 19H7V5h10v14z"/>

            </vector>

        </inset>

    </foreground>

</adaptive-icon>

res/drawable/ic_folder_shortcut.xml

+16 −13
Original line number Diff line number Diff line
@@ -15,16 +15,19 @@ 
  ~ limitations under the License.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="oval">

            <solid android:color="@color/shortcut_background" />

        </shape>

    </item>

    <item

        android:drawable="@drawable/ic_folder_white"

        android:top="16dp"

        android:right="16dp"

        android:bottom="16dp"

        android:left="16dp" />

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

    <background android:drawable="@color/shortcut_background" />

    <foreground>

        <inset android:inset="33%">

            <vector

                android:width="24dp"

                android:height="24dp"

                android:viewportWidth="24.0"

                android:viewportHeight="24.0">

                <path

                    android:fillColor="@color/shortcut_foreground"

                    android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>

            </vector>

        </inset>

    </foreground>

</adaptive-icon>

res/drawable/ic_folder_white.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 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.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M10 4H4c-1.1 0,-1.99.9,-1.99 2L2 18c0 1.1.9 2 2 2h16c1.1 0 2,-.9 2,-2V8c0,-1.1,-.9,-2,-2,-2h-8l-2,-2z"/>

</vector>

res/drawable/ic_smartphone_white.xml

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
<!--

Copyright (C) 2015 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.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M17 1.01L7 1c-1.1 0,-2 .9,-2 2v18c0 1.1.9 2 2 2h10c1.1 0 2,-.9 2,-2V3c0,-1.1,-.9,-1.99,-2,-1.99zM17 19H7V5h10v14z"/>

</vector>

res/drawable/ic_usb_shortcut.xml

+16 −13
Original line number Diff line number Diff line
@@ -15,16 +15,19 @@ 
  ~ limitations under the License.

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">

    <item>

        <shape android:shape="oval">

            <solid android:color="@color/shortcut_background" />

        </shape>

    </item>

    <item

        android:drawable="@drawable/ic_usb_white"

        android:top="16dp"

        android:right="16dp"

        android:bottom="16dp"

        android:left="16dp" />

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

    <background android:drawable="@color/shortcut_background" />

    <foreground>

        <inset android:inset="33%">

            <vector

                android:width="24dp"

                android:height="24dp"

                android:viewportWidth="24.0"

                android:viewportHeight="24.0">

                <path

                    android:fillColor="@color/ic_shorcut_foreground"

                    android:pathData="M15 7v4h1v2h-3V5h2l-3,-4,-3 4h2v8H8v-2.07c.7,-.37 1.2,-1.08 1.2,-1.93 0,-1.21,-.99,-2.2,-2.2,-2.2,-1.21 0,-2.2.99,-2.2 2.2 0 .85.5 1.56 1.2 1.93V13c0 1.11.89 2 2 2h3v3.05c-.71.37,-1.2 1.1,-1.2 1.95 0 1.22.99 2.2 2.2 2.2 1.21 0 2.2,-.98 2.2,-2.2 0,-.85,-.49,-1.58,-1.2,-1.95V15h3c1.11 0 2,-.89 2,-2v-2h1V7h-4z"/>

            </vector>

        </inset>

    </foreground>

</adaptive-icon>