Merge "Update string for Connected devices page." (af632ab6) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+9 −6

Original line number	Diff line number	Diff line
		@@ -4271,12 +4271,12 @@
		<string name="print_settings">Printing</string>

		<!-- Print setting summary in settings screen [CHAR LIMIT=50] -->
		<string name="print_settings_summary_no_service">No print service</string>
		<string name="print_settings_summary_no_service">Off</string>

		<!-- Print setting summary in settings screen [CHAR LIMIT=50] -->
		<plurals name="print_settings_summary">
		<item quantity="one">1 print service</item>
		<item quantity="other"><xliff:g id="count">%1$d</xliff:g> print services</item>
		<item quantity="one">1 print service on</item>
		<item quantity="other"><xliff:g id="count">%1$d</xliff:g> print services on</item>
		</plurals>

		<!-- Title for print service settings screen [CHAR LIMIT=25] -->
		@@ -7260,7 +7260,7 @@
		<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
		select what the USB connection for this device should be used for. This choice
		is for charging only. -->
		<string name="usb_use_charging_only">Charge this device</string>
		<string name="usb_use_charging_only">Charging this device</string>
		<!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
		user select what the USB connection for this device should be used for. This choice
		is for charging only. -->
		@@ -7268,7 +7268,7 @@
		<!-- Title of one of the choices in a dialog (with title defined in usb_use) that lets the user
		select what the USB connection for this device should be used for. This choice
		is for powering the other device only. -->
		<string name="usb_use_power_only">Supply power</string>
		<string name="usb_use_power_only">Supplying power</string>
		<!-- Decription of one of the choices in a dialog (with title defined in usb_use) that lets the
		user select what the USB connection for this device should be used for. This choice
		is for powering the other device. -->
		@@ -7971,9 +7971,12 @@
		<!-- Title of screen controlling which apps have access to send premium SMS messages [CHAR LIMIT=60] -->
		<string name="premium_sms_access">Premium SMS access</string>

		<!-- Bluetooth is disabled. -->
		<!-- Summary for Bluetooth when disabled. [CHAR LIMIT=NONE] -->
		<string name="bluetooth_disabled">Not visible to other devices</string>

		<!-- Summary for Bluetooth when connected. [CHAR LIMIT=NONE] -->
		<string name="bluetooth_connected_summary">Connected to </string>

		<!-- [CHAR LIMIT=60] Name of dev option called "System UI demo mode" -->
		<string name="demo_mode">System UI demo mode</string>

src/com/android/settings/bluetooth/BluetoothSummaryUpdater.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -98,13 +98,13 @@ public final class BluetoothSummaryUpdater extends SummaryUpdater implements Blu
		}
		switch (mConnectionState) {
		case BluetoothAdapter.STATE_CONNECTED:
		return mContext.getString(R.string.bluetooth_connected);
		return mContext.getString(R.string.bluetooth_connected_summary);
		case BluetoothAdapter.STATE_CONNECTING:
		return mContext.getString(R.string.bluetooth_connecting);
		case BluetoothAdapter.STATE_DISCONNECTING:
		return mContext.getString(R.string.bluetooth_disconnecting);
		default:
		return mContext.getString(R.string.bluetooth_disconnected);
		return mContext.getString(R.string.disconnected);
		}
		}

tests/robotests/src/com/android/settings/bluetooth/BluetoothSummaryUpdaterTest.java

+10 −5

Original line number	Diff line number	Diff line
		@@ -86,7 +86,8 @@ public class BluetoothSummaryUpdaterTest {
		public void register_true_shouldSendSummaryChange() {
		mSummaryUpdater.register(true);

		verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_connected));
		verify(mListener).onSummaryChanged(
		mContext.getString(R.string.bluetooth_connected_summary));
		}

		@Test
		@@ -102,7 +103,8 @@ public class BluetoothSummaryUpdaterTest {
		mSummaryUpdater.register(true);
		mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_ON);

		verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_connected));
		verify(mListener).onSummaryChanged(
		mContext.getString(R.string.bluetooth_connected_summary));
		}

		@Test
		@@ -111,7 +113,8 @@ public class BluetoothSummaryUpdaterTest {
		mSummaryUpdater.register(true);
		mSummaryUpdater.onBluetoothStateChanged(BluetoothAdapter.STATE_TURNING_ON);

		verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disconnected));
		verify(mListener).onSummaryChanged(
		mContext.getString(R.string.disconnected));
		}

		@Test
		@@ -128,7 +131,8 @@ public class BluetoothSummaryUpdaterTest {
		mSummaryUpdater.onConnectionStateChanged(null /* device */,
		BluetoothAdapter.STATE_CONNECTED);

		verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_connected));
		verify(mListener).onSummaryChanged(
		mContext.getString(R.string.bluetooth_connected_summary));
		}

		@Test
		@@ -137,7 +141,8 @@ public class BluetoothSummaryUpdaterTest {
		mSummaryUpdater.onConnectionStateChanged(null /* device */,
		BluetoothAdapter.STATE_CONNECTED);

		verify(mListener).onSummaryChanged(mContext.getString(R.string.bluetooth_disconnected));
		verify(mListener).onSummaryChanged(
		mContext.getString(R.string.disconnected));
		}

		@Test