Merge "Use ListFormatter to join strings"

This commit is contained in:
android-build-team Robot
2018-05-08 20:20:28 +00:00
committed by Android (Google) Code Review
12 changed files with 210 additions and 212 deletions

View File

@@ -25,7 +25,6 @@ import android.graphics.PorterDuff;
import android.graphics.PorterDuffColorFilter;
import android.graphics.Typeface;
import android.icu.text.DecimalFormatSymbols;
import androidx.annotation.ColorRes;
import android.text.Layout;
import android.text.Spannable;
import android.text.SpannableString;
@@ -37,6 +36,8 @@ import android.text.style.RelativeSizeSpan;
import android.util.AttributeSet;
import android.view.View;
import androidx.annotation.ColorRes;
import com.android.internal.annotations.VisibleForTesting;
import com.android.settings.R;
import com.android.settings.Utils;
@@ -207,7 +208,7 @@ public class DonutView extends View {
R.dimen.storage_donut_view_shrunken_label_text_size));
}
setContentDescription(getContext().getString(
R.string.join_many_items_middle, mPercentString, mFullString));
R.string.join_two_unrelated_items, mPercentString, mFullString));
invalidate();
}