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

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

Merge "Remove frictionIconColor attribute"

parents e90a5a68 1ccecdef
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@
        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="?attr/frictionIconColor" />
        android:fillColor="?android:attr/colorControlNormal" />
</vector>
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
        android:width="18dp"
        android:height="18dp">

    <path android:fillColor="?attr/frictionIconColor"
    <path android:fillColor="?android:attr/colorControlNormal"
          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
Original line number Diff line number Diff line
@@ -168,6 +168,4 @@
    <attr name="ic_menu_moreoverflow" format="reference" />
    <attr name="side_margin" format="reference|dimension" />
    <attr name="wifi_signal_color" format="reference" />

    <attr name="frictionIconColor" format="reference|color" />
</resources>
+0 −1
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@
        <item name="wifi_signal">@drawable/wifi_signal</item>
        <item name="wifi_signal_color">?android:attr/colorAccent</item>
        <item name="wifi_friction">@drawable/wifi_friction</item>
        <item name="frictionIconColor">?android:colorControlNormal</item>

        <item name="side_margin">@dimen/settings_side_margin</item>
        <item name="suwListItemIconColor">?android:attr/colorAccent</item>