Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9265bdf authored by Santiago Seifert's avatar Santiago Seifert
Browse files

Add missing SettingsLib strings 

For the following RouteListingPreference constants
- SUBTEXT_ERROR_UNKNOWN
- SUBTEXT_DEVICE_LOW_POWER
- SUBTEXT_UNAUTHORIZED
- SUBTEXT_TRACK_UNSUPPORTED

Bug: 266923039
Test: atest MediaOutputAdapterTest MediaOutputControllerTest MediaOutputBaseDialogTest MediaOutputDialogTest
Change-Id: I0c7d910d4f3e9a05b8fdbfe8b9d86fbb4a9f9cf9
parent 7f9d899a

packages/SettingsLib/res/values/strings.xml

+8 −1
Original line number Diff line number Diff line
@@ -1315,13 +1315,20 @@ 
    <string name="media_transfer_this_device_name" product="tablet">This tablet</string>

    <!-- Name of the phone device with an active remote session. [CHAR LIMIT=30] -->

    <string name="media_transfer_this_phone">This phone</string>

    <!-- Sub status indicates device is not available due to an unknown error. [CHAR LIMIT=NONE] -->

    <string name="media_output_status_unknown_error">Unavailable due to unknown error</string>

    <!-- Sub status indicates device need premium account. [CHAR LIMIT=NONE] -->

    <string name="media_output_status_require_premium">Upgrade account to switch</string>

    <!-- Sub status indicates device not support download content. [CHAR LIMIT=NONE] -->

    <string name="media_output_status_not_support_downloads">Can\’t play downloads here</string>

    <!-- Sub status indicates device need to wait after ad. [CHAR LIMIT=NONE] -->

    <string name="media_output_status_try_after_ad">Try again after the ad</string>



    <!-- Sub status indicates device is in low-power mode. [CHAR LIMIT=NONE] -->

    <string name="media_output_status_device_in_low_power_mode">Device in low power mode</string>

    <!-- Sub status indicates the device does not authorize the user. [CHAR LIMIT=NONE] -->

    <string name="media_output_status_unauthorized">Requires authorization</string>

    <!-- Sub status indicates the device does not support the current media track. [CHAR LIMIT=NONE] -->

    <string name="media_output_status_track_unsupported">Current media track not supported</string>



    <!-- Warning message to tell user is have problem during profile connect, it need to turn off device and back on. [CHAR_LIMIT=NONE] -->

    <string name="profile_connect_timeout_subtext">Problem connecting. Turn device off &amp; back on</string>

packages/SettingsLib/src/com/android/settingslib/media/MediaDevice.java

+12 −0
Original line number Diff line number Diff line
@@ -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<MediaDevice> { 
        @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();

            }