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

Commit b4a01a44 authored by Shaowei Shen's avatar Shaowei Shen Committed by Automerger Merge Worker
Browse files

Merge "[Output Switcher] Add Dock speaker string in SysUI" into udc-dev am:... 

Merge "[Output Switcher] Add Dock speaker string in SysUI" into udc-dev am: f96266ec am: 270d7f74

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23358305



Change-Id: I2b7ca7cd96705aaaf5faf539a6c5fc83400d03ee
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9eaf436e 270d7f74

packages/SettingsLib/res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -1327,6 +1327,12 @@ 
    <string name="media_transfer_this_device_name" product="default">This phone</string>

    <!-- Name of the tablet device. [CHAR LIMIT=30] -->

    <string name="media_transfer_this_device_name" product="tablet">This tablet</string>

    <!-- Name of the dock device. [CHAR LIMIT=30] -->

    <string name="media_transfer_dock_speaker_device_name">Dock speaker</string>

    <!-- Default name of the external device. [CHAR LIMIT=30] -->

    <string name="media_transfer_external_device_name">External Device</string>

    <!-- Default name of the connected device. [CHAR LIMIT=30] -->

    <string name="media_transfer_default_device_name">Connected device</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] -->

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

+7 −3
Original line number Diff line number Diff line
@@ -70,13 +70,17 @@ public class PhoneMediaDevice extends MediaDevice { 
                name = mContext.getString(R.string.media_transfer_wired_usb_device_name);

                break;

            case TYPE_DOCK:

            case TYPE_HDMI:

                name = mRouteInfo.getName();

                name = mContext.getString(R.string.media_transfer_dock_speaker_device_name);

                break;

            case TYPE_BUILTIN_SPEAKER:

            default:

                name = mContext.getString(R.string.media_transfer_this_device_name);

                break;

            case TYPE_HDMI:

                name = mContext.getString(R.string.media_transfer_external_device_name);

                break;

            default:

                name = mContext.getString(R.string.media_transfer_default_device_name);

                break;

        }

        return name.toString();

    }