From f952095a2efd5b1978c69e9df788a037f71924c7 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 11 Apr 2019 16:58:50 -0700 Subject: [PATCH] "No recent items" font should use themed font Bug: 126822309 Change-Id: I0311b0b002fa1dcda88b87da31019f4ecbb94f62 --- .../src/com/android/quickstep/views/RecentsView.java | 3 +++ src/com/android/launcher3/util/Themes.java | 8 ++++++++ 2 files changed, 11 insertions(+) diff --git a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java index ddb94d2dda..d8aeb35d66 100644 --- a/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java +++ b/quickstep/recents_ui_overrides/src/com/android/quickstep/views/RecentsView.java @@ -46,6 +46,7 @@ import android.graphics.Canvas; import android.graphics.Point; import android.graphics.Rect; import android.graphics.RectF; +import android.graphics.Typeface; import android.graphics.drawable.Drawable; import android.os.Build; import android.os.Handler; @@ -322,6 +323,8 @@ public abstract class RecentsView extends PagedView impl mEmptyMessagePaint.setColor(Themes.getAttrColor(context, android.R.attr.textColorPrimary)); mEmptyMessagePaint.setTextSize(getResources() .getDimension(R.dimen.recents_empty_message_text_size)); + mEmptyMessagePaint.setTypeface(Typeface.create(Themes.getDefaultBodyFont(context), + Typeface.NORMAL)); mEmptyMessagePadding = getResources() .getDimensionPixelSize(R.dimen.recents_empty_message_text_padding); setWillNotDraw(false); diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java index 59fd8595e0..a45f17d325 100644 --- a/src/com/android/launcher3/util/Themes.java +++ b/src/com/android/launcher3/util/Themes.java @@ -32,6 +32,14 @@ import com.android.launcher3.R; */ public class Themes { + public static String getDefaultBodyFont(Context context) { + TypedArray ta = context.obtainStyledAttributes(android.R.style.TextAppearance_DeviceDefault, + new int[]{android.R.attr.fontFamily}); + String value = ta.getString(0); + ta.recycle(); + return value; + } + public static float getDialogCornerRadius(Context context) { return getDimension(context, android.R.attr.dialogCornerRadius, context.getResources().getDimension(R.dimen.default_dialog_corner_radius));