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

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

Merge "Add friction icon for metered networks." into oc-dev

parents 3c0d5ff3 dee09e7a

res/drawable/ic_friction_lock_closed.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@ 
        android:height="18dp">

    <path

        android:pathData="M36 16l-2 0 0 -4C34 6.48 29.52 2 24 2 18.48 2 14 6.48 14 12l0 4 -2 0c-2.21 0 -4 1.79 -4 4l0 20c0 2.21 1.79 4 4 4l24 0c2.21 0 4 -1.79 4 -4l0 -20c0 -2.21 -1.79 -4 -4 -4zM24 34c-2.21 0 -4 -1.79 -4 -4 0 -2.21 1.79 -4 4 -4 2.21 0 4 1.79 4 4 0 2.21 -1.79 4 -4 4zm6.2 -18l-12.4 0 0 -4c0 -3.42 2.78 -6.2 6.2 -6.2 3.42 0 6.2 2.78 6.2 6.2l0 4z"

        android:fillColor="#000000"

        android:fillColor="?android:attr/colorForeground"

        android:fillAlpha="0.54" />

</vector>

res/drawable/ic_friction_lock_open.xml→res/drawable/ic_friction_money.xml

+11 −6
Original line number Diff line number Diff line
@@ -15,12 +15,17 @@ 
    limitations under the License.

-->

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

        android:viewportWidth="48"

        android:viewportHeight="48"

        android:viewportWidth="18"

        android:viewportHeight="18"

        android:width="18dp"

        android:height="18dp">

    <path

        android:pathData="M24 34c2.21 0 4 -1.79 4 -4 0 -2.21 -1.79 -4 -4 -4 -2.21 0 -4 1.79 -4 4 0 2.21 1.79 4 4 4zm12 -18l-2 0 0 -4C34 6.48 29.52 2 24 2 18.48 2 14 6.48 14 12l3.8 0c0 -3.42 2.78 -6.2 6.2 -6.2 3.42 0 6.2 2.78 6.2 6.2l0 4 -18.2 0c-2.21 0 -4 1.79 -4 4l0 20c0 2.21 1.79 4 4 4l24 0c2.21 0 4 -1.79 4 -4l0 -20c0 -2.21 -1.79 -4 -4 -4zm0 24l-24 0 0 -20 24 0 0 20z"

        android:fillColor="#000000"

        android:fillAlpha="0.54" />



    <path android:fillColor="?android:attr/colorForeground"

          android:fillAlpha="0.54"

          android:pathData="M9.56 8.1c-1.6-.51-2.66-.71-2.66-1.88 0-.83 .72 -1.62 2.1-1.62 1.59 0 2.1 .88

          2.1 1.94H13c0-1.79-1.17-3.09-3-3.44V1H8v2.11c-1.58 .32 -3 1.37-3 3.12 0 2.25

          1.78 2.8 4 3.52 1.88 .61 2.25 1.04 2.25 2.09 0 .9-.67 1.56-2.25 1.56-1.2

          0-2.25-.84-2.25-2.06h-2c0 1.88 1.38 3.2 3.25 3.56V17h2v-2.07c2.04-.29 3.2-1.49

          3.2-3.1 0-1.87-.94-2.87-3.64-3.73z" />

    <path android:pathData="M0 0h18v18H0z" />

</vector>

res/drawable/wifi_friction.xml

+3 −0
Original line number Diff line number Diff line
@@ -19,4 +19,7 @@ 
    <item

        settings:state_encrypted="true"

        android:drawable="@drawable/ic_friction_lock_closed"/>

    <item

        settings:state_metered="true"

        android:drawable="@drawable/ic_friction_money"/>

</selector>