Merge "The text contrast of "disconnected" in Switch media output panel is insufficient." into rvc-dev

This commit is contained in:
TreeHugger Robot
2020-03-10 14:45:46 +00:00
committed by Android (Google) Code Review

View File

@@ -24,7 +24,6 @@ import static com.android.settings.slices.CustomSliceRegistry.MEDIA_OUTPUT_SLICE
import android.app.PendingIntent; import android.app.PendingIntent;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.text.SpannableString; import android.text.SpannableString;
@@ -236,7 +235,9 @@ public class MediaOutputSlice implements CustomSliceable {
// Append status to title only for the disconnected Bluetooth device. // Append status to title only for the disconnected Bluetooth device.
final SpannableString spannableTitle = new SpannableString( final SpannableString spannableTitle = new SpannableString(
mContext.getString(R.string.media_output_disconnected_status, deviceName)); mContext.getString(R.string.media_output_disconnected_status, deviceName));
spannableTitle.setSpan(new ForegroundColorSpan(Color.GRAY), deviceName.length(), spannableTitle.setSpan(new ForegroundColorSpan(
Utils.getColorAttrDefaultColor(mContext, android.R.attr.textColorSecondary)),
deviceName.length(),
spannableTitle.length(), SPAN_EXCLUSIVE_EXCLUSIVE); spannableTitle.length(), SPAN_EXCLUSIVE_EXCLUSIVE);
rowBuilder.setTitle(spannableTitle); rowBuilder.setTitle(spannableTitle);
rowBuilder.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon, rowBuilder.setPrimaryAction(SliceAction.create(broadcastAction, deviceIcon,