PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: a859441

* commit 'a85944104c6fe22947387d0ced613e07f6251d40':
  Replace "A" icon with underline with simple "A" icon on font size settings screen Bug: 27694339

Change-Id: I6ad269c28c04404d27f0050600e48cc68c11a061
This commit is contained in:
Noah Wang
2016-03-29 22:00:56 +00:00
committed by android-build-merger
parent 429f75bd8d a85944104c
commit 92ab671167
3 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/drawable/ic_font_size_36dp.xml → res/drawable/ic_font_size_16dp.xml
View File

@@ -14,12 +14,13 @@
~ limitations under the License ~ limitations under the License
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp" android:width="16dp"
android:height="36dp" android:height="16dp"
android:viewportWidth="24" android:viewportWidth="48"
android:viewportHeight="24" android:viewportHeight="48"
android:tint="?android:attr/colorAccent"> android:tint="?android:attr/colorAccent">
<path <path
android:fillColor="@android:color/white" 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> </vector>

13
res/drawable/ic_font_size_24dp.xml
View File

@@ -14,12 +14,13 @@
~ limitations under the License ~ limitations under the License
--> -->
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="48"
android:viewportHeight="24" android:viewportHeight="48"
android:tint="?android:attr/colorAccent"> android:tint="?android:attr/colorAccent">
<path <path
android:fillColor="@android:color/white" 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> </vector>

4
res/layout/font_size_activity.xml
View File

@@ -62,7 +62,7 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" 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:tint="?android:attr/colorControlNormal"
android:tintMode="src_in" android:tintMode="src_in"
android:scaleType="center" android:scaleType="center"
@@ -81,7 +81,7 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:background="?android:attr/selectableItemBackgroundBorderless" 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:tint="?android:attr/colorControlNormal"
android:tintMode="src_in" android:tintMode="src_in"
android:scaleType="center" android:scaleType="center"