diff --git a/quickstep/src/com/android/quickstep/util/FontUtils.kt b/quickstep/src/com/android/quickstep/util/FontUtils.kt
new file mode 100644
index 0000000000..35a0fc7e1b
--- /dev/null
+++ b/quickstep/src/com/android/quickstep/util/FontUtils.kt
@@ -0,0 +1,41 @@
+/*
+ * Copyright (C) 2025 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.quickstep.util
+
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.graphics.Typeface
+import com.android.wm.shell.shared.TypefaceUtils
+
+object FontUtils {
+
+ private val baseTypeface =
+ Typeface.create(TypefaceUtils.FontFamily.GSF_LABEL_LARGE.value, Typeface.NORMAL)
+
+ @JvmStatic
+ fun getTypeFace(resources: Resources): Typeface =
+ Typeface.create(baseTypeface, getFontWeight(resources), /* italic= */ false)
+
+ fun getFontWeight(resources: Resources): Int {
+ val fontWeightAdjustment: Int = resources.configuration.fontWeightAdjustment
+ return if (fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED) {
+ Typeface.Builder.NORMAL_WEIGHT + fontWeightAdjustment
+ } else {
+ Typeface.Builder.NORMAL_WEIGHT
+ }
+ }
+}
diff --git a/quickstep/src/com/android/quickstep/views/RecentsView.java b/quickstep/src/com/android/quickstep/views/RecentsView.java
index 9dc331cb6b..b4c04bbb40 100644
--- a/quickstep/src/com/android/quickstep/views/RecentsView.java
+++ b/quickstep/src/com/android/quickstep/views/RecentsView.java
@@ -217,6 +217,7 @@ import com.android.quickstep.recents.viewmodel.RecentsViewModel;
import com.android.quickstep.util.ActiveGestureProtoLogProxy;
import com.android.quickstep.util.AnimUtils;
import com.android.quickstep.util.DesktopTask;
+import com.android.quickstep.util.FontUtils;
import com.android.quickstep.util.GroupTask;
import com.android.quickstep.util.LayoutUtils;
import com.android.quickstep.util.RecentsAtomicAnimationFactory;
@@ -983,12 +984,7 @@ public abstract class RecentsView<
mEmptyMessagePaint.setTextSize(getResources()
.getDimension(R.dimen.recents_empty_message_text_size));
- Typeface typeface = Typeface.create(
- Typeface.create(TypefaceUtils.FontFamily.GSF_LABEL_LARGE.getValue(),
- Typeface.NORMAL),
- getFontWeight(),
- false);
- mEmptyMessagePaint.setTypeface(typeface);
+ mEmptyMessagePaint.setTypeface(FontUtils.getTypeFace(getResources()));
mEmptyMessagePaint.setAntiAlias(true);
mEmptyMessagePadding = getResources()
.getDimensionPixelSize(R.dimen.recents_empty_message_text_padding);
@@ -7007,14 +7003,6 @@ public abstract class RecentsView<
}
}
- private int getFontWeight() {
- int fontWeightAdjustment = getResources().getConfiguration().fontWeightAdjustment;
- if (fontWeightAdjustment != Configuration.FONT_WEIGHT_ADJUSTMENT_UNDEFINED) {
- return Typeface.Builder.NORMAL_WEIGHT + fontWeightAdjustment;
- }
- return Typeface.Builder.NORMAL_WEIGHT;
- }
-
/**
* Runs the spring animations as a task dismisses or settles back into its place in overview.
*
diff --git a/res/drawable/horizontal_ellipsis.xml b/res/drawable/horizontal_ellipsis.xml
deleted file mode 100644
index 65e958d42b..0000000000
--- a/res/drawable/horizontal_ellipsis.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index eaf19ca6c7..37704985f7 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -404,7 +404,7 @@
10dp
54dp
- 18dp
+ 24dp
24dp