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 {