diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml index adc6a02e005fc..0228142779c69 100644 --- a/packages/SettingsLib/res/values/strings.xml +++ b/packages/SettingsLib/res/values/strings.xml @@ -1315,13 +1315,20 @@ This tablet This phone + + Unavailable due to unknown error Upgrade account to switch Can\’t play downloads here Try again after the ad - + + Device in low power mode + + Requires authorization + + Current media track not supported Problem connecting. Turn device off & back on diff --git a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java index 38387f1de779f..6b9866bf05e0a 100644 --- a/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java +++ b/packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java @@ -36,9 +36,13 @@ import static android.media.RouteListingPreference.Item.FLAG_SUGGESTED; import static android.media.RouteListingPreference.Item.SELECTION_BEHAVIOR_TRANSFER; import static android.media.RouteListingPreference.Item.SUBTEXT_AD_ROUTING_DISALLOWED; import static android.media.RouteListingPreference.Item.SUBTEXT_CUSTOM; +import static android.media.RouteListingPreference.Item.SUBTEXT_DEVICE_LOW_POWER; import static android.media.RouteListingPreference.Item.SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED; +import static android.media.RouteListingPreference.Item.SUBTEXT_ERROR_UNKNOWN; import static android.media.RouteListingPreference.Item.SUBTEXT_NONE; import static android.media.RouteListingPreference.Item.SUBTEXT_SUBSCRIPTION_REQUIRED; +import static android.media.RouteListingPreference.Item.SUBTEXT_TRACK_UNSUPPORTED; +import static android.media.RouteListingPreference.Item.SUBTEXT_UNAUTHORIZED; import static com.android.settingslib.media.LocalMediaManager.MediaDeviceState.STATE_SELECTED; @@ -584,12 +588,20 @@ public abstract class MediaDevice implements Comparable { @DoNotInline static String composeSubtext(RouteListingPreference.Item item, Context context) { switch (item.getSubText()) { + case SUBTEXT_ERROR_UNKNOWN: + return context.getString(R.string.media_output_status_unknown_error); case SUBTEXT_SUBSCRIPTION_REQUIRED: return context.getString(R.string.media_output_status_require_premium); case SUBTEXT_DOWNLOADED_CONTENT_ROUTING_DISALLOWED: return context.getString(R.string.media_output_status_not_support_downloads); case SUBTEXT_AD_ROUTING_DISALLOWED: return context.getString(R.string.media_output_status_try_after_ad); + case SUBTEXT_DEVICE_LOW_POWER: + return context.getString(R.string.media_output_status_device_in_low_power_mode); + case SUBTEXT_UNAUTHORIZED: + return context.getString(R.string.media_output_status_unauthorized); + case SUBTEXT_TRACK_UNSUPPORTED: + return context.getString(R.string.media_output_status_track_unsupported); case SUBTEXT_CUSTOM: return (String) item.getCustomSubtextMessage(); }