From a7f6bb54c89e3ab1870807e7e1b2190e694e5ebf Mon Sep 17 00:00:00 2001 From: Roozbeh Pournader Date: Tue, 22 Aug 2017 16:54:27 -0700 Subject: [PATCH] Use fallback linespacing in ChartSweepView and ChartGridView Bug: 28963299 Test: none Change-Id: I249a3795fcbfbef14eac11b72220bb92f9690de6 --- src/com/android/settings/widget/ChartGridView.java | 7 ++++--- src/com/android/settings/widget/ChartSweepView.java | 7 +++++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java index 2091719c101..b456a497338 100644 --- a/src/com/android/settings/widget/ChartGridView.java +++ b/src/com/android/settings/widget/ChartGridView.java @@ -170,8 +170,9 @@ public class ChartGridView extends View { paint.setColor(mLabelColor); paint.setTextSize(mLabelSize); - return new StaticLayout(text, paint, - (int) Math.ceil(Layout.getDesiredWidth(text, paint)), - Layout.Alignment.ALIGN_NORMAL, 1.f, 0, true); + return StaticLayout.Builder.obtain(text, 0, text.length(), paint, + (int) Math.ceil(Layout.getDesiredWidth(text, paint))) + .setUseLineSpacingFromFallbacks(true) + .build(); } } diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java index cdcd0a749fc..de1bc085753 100644 --- a/src/com/android/settings/widget/ChartSweepView.java +++ b/src/com/android/settings/widget/ChartSweepView.java @@ -265,8 +265,11 @@ public class ChartSweepView extends View { paint.setColor(mLabelColor); mLabelTemplate = new SpannableStringBuilder(template); - mLabelLayout = new DynamicLayout( - mLabelTemplate, paint, LARGE_WIDTH, Alignment.ALIGN_RIGHT, 1f, 0f, false); + mLabelLayout = DynamicLayout.Builder.obtain(mLabelTemplate, paint, LARGE_WIDTH) + .setAlignment(Alignment.ALIGN_RIGHT) + .setIncludePad(false) + .setUseLineSpacingFromFallbacks(true) + .build(); invalidateLabel(); } else {