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

Commit a8594410 authored by Noah Wang's avatar Noah Wang Committed by Android (Google) Code Review
Browse files

Merge "Replace "A" icon with underline with simple "A" icon on font size... 

Merge "Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339" into nyc-dev
parents 2b1d00bf 863c5952

res/drawable/ic_font_size_36dp.xml→res/drawable/ic_font_size_16dp.xml

+7 −6
Original line number Diff line number Diff line
@@ -14,12 +14,13 @@ 
  ~ limitations under the License

  -->

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

        android:width="36dp"

        android:height="36dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

    android:width="16dp"

    android:height="16dp"

    android:viewportWidth="48"

    android:viewportHeight="48"

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

    <path

        android:fillColor="@android:color/white"

        android:pathData="M5 17v2h14v-2H5zm4.5-4.2h5l.9 2.2h2.1L12.75 4h-1.5L6.5 15h2.1l.9-2.2zM12 5.98L13.87 11h-3.74L12 5.98z"/>

        android:pathData="M33.3,36.8H14.7L10.8,48H2.1L20.2,0h7.5l18.2,48h-8.7L33.3,36.8z

M17,30.1h13.9l-7-19.9L17,30.1z" />

</vector>

res/drawable/ic_font_size_24dp.xml

+7 −6
Original line number Diff line number Diff line
@@ -16,10 +16,11 @@ 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="24dp"

    android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24"

    android:viewportWidth="48"

    android:viewportHeight="48"

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

    <path

        android:fillColor="@android:color/white"

        android:pathData="M5 17v2h14v-2H5zm4.5-4.2h5l.9 2.2h2.1L12.75 4h-1.5L6.5 15h2.1l.9-2.2zM12 5.98L13.87 11h-3.74L12 5.98z"/>

        android:pathData="M33.3,36.8H14.7L10.8,48H2.1L20.2,0h7.5l18.2,48h-8.7L33.3,36.8z

M17,30.1h13.9l-7-19.9L17,30.1z" />

</vector>

res/layout/font_size_activity.xml

+2 −2
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 
                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_font_size_24dp"

                    android:src="@drawable/ic_font_size_16dp"

                    android:tint="?android:attr/colorControlNormal"

                    android:tintMode="src_in"

                    android:scaleType="center"
@@ -81,7 +81,7 @@ 
                    android:layout_width="48dp"

                    android:layout_height="48dp"

                    android:background="?android:attr/selectableItemBackgroundBorderless"

                    android:src="@drawable/ic_font_size_36dp"

                    android:src="@drawable/ic_font_size_24dp"

                    android:tint="?android:attr/colorControlNormal"

                    android:tintMode="src_in"

                    android:scaleType="center"