From f55895e2fb55e418b0f38d0cd9bbf17dde6bee82 Mon Sep 17 00:00:00 2001 From: paphonb Date: Wed, 24 Oct 2018 02:23:13 +0700 Subject: [PATCH] Use google sans in "clear all" button --- AndroidManifest-common.xml | 2 +- .../res/layout/overview_clear_all_button.xml | 2 ++ .../quickstep/views/ClearAllButton.java | 4 ++-- res/font/google_sans_medium.xml | 24 +++++++++++++++++++ res/values/preloaded_fonts.xml | 1 + 5 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 res/font/google_sans_medium.xml diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml index cf7ba75c13..4fb019a891 100644 --- a/AndroidManifest-common.xml +++ b/AndroidManifest-common.xml @@ -128,7 +128,7 @@ android:value="com.android.launcher3.LauncherProvider" /> + android:resource="@array/preloaded_fonts"/> diff --git a/quickstep/res/layout/overview_clear_all_button.xml b/quickstep/res/layout/overview_clear_all_button.xml index ea7a494225..deed21c59c 100644 --- a/quickstep/res/layout/overview_clear_all_button.xml +++ b/quickstep/res/layout/overview_clear_all_button.xml @@ -19,7 +19,9 @@ style="@android:style/Widget.DeviceDefault.Button.Borderless" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:fontFamily="@font/google_sans_medium" android:text="@string/recents_clear_all" + android:textAllCaps="false" android:textColor="?attr/workspaceTextColor" android:textSize="14sp" android:translationY="@dimen/task_thumbnail_half_top_margin" diff --git a/quickstep/src/com/android/quickstep/views/ClearAllButton.java b/quickstep/src/com/android/quickstep/views/ClearAllButton.java index fbecd8486a..485ed7f4ce 100644 --- a/quickstep/src/com/android/quickstep/views/ClearAllButton.java +++ b/quickstep/src/com/android/quickstep/views/ClearAllButton.java @@ -17,14 +17,14 @@ package com.android.quickstep.views; import android.content.Context; +import android.support.v7.widget.AppCompatButton; import android.util.AttributeSet; -import android.widget.Button; import com.android.launcher3.Utilities; import com.android.quickstep.views.RecentsView.PageCallbacks; import com.android.quickstep.views.RecentsView.ScrollState; -public class ClearAllButton extends Button implements PageCallbacks { +public class ClearAllButton extends AppCompatButton implements PageCallbacks { private float mScrollAlpha = 1; private float mContentAlpha = 1; diff --git a/res/font/google_sans_medium.xml b/res/font/google_sans_medium.xml new file mode 100644 index 0000000000..9afff5d035 --- /dev/null +++ b/res/font/google_sans_medium.xml @@ -0,0 +1,24 @@ + + + + + diff --git a/res/values/preloaded_fonts.xml b/res/values/preloaded_fonts.xml index dcd599e5e6..84b652b06f 100644 --- a/res/values/preloaded_fonts.xml +++ b/res/values/preloaded_fonts.xml @@ -2,5 +2,6 @@ @font/google_sans + @font/google_sans_medium