PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update string"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-10-16 08:43:50 +00:00
committed by Android (Google) Code Review
parent b9cf6af2f0 946c6f0dfe
commit 56aa5f831d
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/values/strings.xml
View File

@@ -329,11 +329,11 @@
<string name="bluetooth_disable_a2dp_hw_offload_dialog_cancel">Cancel</string>
<!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
<string name="connected_device_available_media_title">Available media devices</string>
<string name="connected_device_media_device_title">Media devices</string>
<!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
<string name="connected_device_available_call_title">Available call devices</string>
<string name="connected_device_call_device_title">Call devices</string>
<!-- Title for connected device group [CHAR LIMIT=none]-->
<string name="connected_device_connected_title">Currently connected</string>
<string name="connected_device_other_device_title">Other devices</string>
<!-- Title for connected device group [CHAR LIMIT=none]-->
<string name="connected_device_saved_title">Saved devices</string>
<!-- Summary for preference to add a device [CHAR LIMIT=none]-->

4
res/xml/connected_devices.xml
View File

@@ -28,12 +28,12 @@
<PreferenceCategory
android:key="available_device_list"
android:title="@string/connected_device_available_media_title"
android:title="@string/connected_device_media_device_title"
settings:controller="com.android.settings.connecteddevice.AvailableMediaDeviceGroupController"/>
<PreferenceCategory
android:key="connected_device_list"
android:title="@string/connected_device_connected_title"
android:title="@string/connected_device_other_device_title"
settings:controller="com.android.settings.connecteddevice.ConnectedDeviceGroupController"/>
<com.android.settingslib.RestrictedPreference

4
src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupController.java
View File

@@ -141,11 +141,11 @@ public class AvailableMediaDeviceGroupController extends BasePreferenceControlle
if (isAudioModeOngoingCall(mContext)) {
// in phone call
mPreferenceGroup.
setTitle(mContext.getString(R.string.connected_device_available_call_title));
setTitle(mContext.getString(R.string.connected_device_call_device_title));
} else {
// without phone call
mPreferenceGroup.
setTitle(mContext.getString(R.string.connected_device_available_media_title));
setTitle(mContext.getString(R.string.connected_device_media_device_title));
}
}
}

4
tests/robotests/src/com/android/settings/connecteddevice/AvailableMediaDeviceGroupControllerTest.java
View File

@@ -193,7 +193,7 @@ public class AvailableMediaDeviceGroupControllerTest {
mAvailableMediaDeviceGroupController.onAudioModeChanged();
assertThat(mPreferenceGroup.getTitle()).isEqualTo(
mContext.getText(R.string.connected_device_available_call_title));
mContext.getText(R.string.connected_device_call_device_title));
}
@Test
@@ -202,7 +202,7 @@ public class AvailableMediaDeviceGroupControllerTest {
mAvailableMediaDeviceGroupController.onAudioModeChanged();
assertThat(mPreferenceGroup.getTitle()).isEqualTo(
mContext.getText(R.string.connected_device_available_media_title));
mContext.getText(R.string.connected_device_media_device_title));
}
@Test