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

Commit 546a06af authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[Wi-Fi DPP] Refine Wi-Fi DPP UI layouts with SUW library"

parents c5df8f0c 8e3c4912

res/drawable/ic_check_circle_green.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
-->

<vector

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

    android:width="24dp"

    android:height="24dp"

    android:width="16dp"

    android:height="16dp"

    android:viewportWidth="64.0"

    android:viewportHeight="64.0">

    <path

res/drawable/ic_devices_check_circle_green.xml→res/drawable/ic_devices_check_circle_green_32dp.xml

+5 −5
Original line number Diff line number Diff line
@@ -16,15 +16,15 @@ 
<layer-list

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

    <item

        android:drawable="@drawable/ic_devices_other_opaque_black"

        android:width="@dimen/wifi_dpp_fragment_icon_width_height"

        android:height="@dimen/wifi_dpp_fragment_icon_width_height"

        android:drawable="@drawable/ic_devices_other_32dp"

        android:width="40dp"

        android:height="40dp"

        android:gravity="center"/>



    <item

        android:drawable="@drawable/ic_check_circle_green"

        android:top="28dp"

        android:left="44dp"

        android:top="16dp"

        android:left="32dp"

        android:gravity="center"/>



</layer-list>

res/drawable/ic_devices_other_opaque_black.xml→res/drawable/ic_devices_other_32dp.xml

+4 −3
Original line number Diff line number Diff line
@@ -14,10 +14,11 @@ 
    limitations under the License.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:width="32dp"

    android:height="32dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

    android:viewportHeight="24"

    android:tint="?android:attr/colorAccent">

  <path

      android:fillColor="#FF000000"

      android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22 0,0.89 0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>

res/drawable/ic_qrcode_32dp.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="32dp"

    android:height="32dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorAccent">

  <path

      android:fillColor="#FF000000"

      android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM13,15v2h-2v-2v-2v-2h2v2h2v-2h2v2v2H13zM17,19h4v2h-4h-2v-2v-2h2V19zM19,11h2v6h-2V11zM7,11h2v2H7V11zM11,19h2v2h-2V19zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>

</vector>

res/drawable/ic_scan_32dp.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="32dp"

    android:height="32dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorAccent">

  <path

      android:fillColor="#FF000000"

      android:pathData="M3,9h6V3H3V9zM5,5h2v2H5V5zM15,3v6h6V3H15zM19,7h-2V5h2V7zM3,21h6v-6H3V21zM5,17h2v2H5V17zM17,15h4v2h-4v4h-2v-4h-4v-2h4v-4h2V15zM7,11h2v2H7V11zM5,13H3v-2h2V13zM13,9h-2V3h2V9z"/>

</vector>