commit a7f6bb54c89e3ab1870807e7e1b2190e694e5ebf
author Roozbeh Pournader <roozbeh@google.com> Tue Aug 22 16:54:27 2017 -0700
committer Roozbeh Pournader <roozbeh@google.com> Tue Aug 22 17:19:16 2017 -0700
tree bcca5d9bacb33bb883e59b7b5e064b6256c3e3c5
parent 897f396b16a40bdf96127077c01e401be21e5c5a

Use fallback linespacing in ChartSweepView and ChartGridView

Bug: 28963299
Test: none
Change-Id: I249a3795fcbfbef14eac11b72220bb92f9690de6

src/com/android/settings/widget/ChartGridView.java

diff --git a/src/com/android/settings/widget/ChartGridView.java b/src/com/android/settings/widget/ChartGridView.java
index 2091719..b456a49 100644
--- a/src/com/android/settings/widget/ChartGridView.java
+++ b/src/com/android/settings/widget/ChartGridView.java
@@ -170,8 +170,9 @@
         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();
     }
 }

src/com/android/settings/widget/ChartSweepView.java

diff --git a/src/com/android/settings/widget/ChartSweepView.java b/src/com/android/settings/widget/ChartSweepView.java
index cdcd0a7..de1bc08 100644
--- a/src/com/android/settings/widget/ChartSweepView.java
+++ b/src/com/android/settings/widget/ChartSweepView.java
@@ -265,8 +265,11 @@
             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 {