Loading res/values/strings.xml +2 −0 Original line number Diff line number Diff line Loading @@ -431,6 +431,8 @@ <string name="connected_device_previously_connected_title">Previously connected devices</string> <!-- Preference screen title for Bluetooth preference to open paired but no connection list [CHAR LIMIT=none]--> <string name="connected_device_previously_connected_screen_title">Previously connected</string> <!-- Toast text for hint user bluetooth is turned on [CHAR LIMIT=none]--> <string name="connected_device_bluetooth_turned_on_toast">Bluetooth turned on</string> <!-- Date & time settings screen title --> <string name="date_and_time">Date & time</string> Loading src/com/android/settings/bluetooth/BluetoothPairingDetail.java +9 −0 Original line number Diff line number Diff line Loading @@ -22,6 +22,7 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; import android.widget.Toast; import androidx.annotation.VisibleForTesting; import android.util.Log; Loading Loading @@ -166,6 +167,9 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme public void onBluetoothStateChanged(int bluetoothState) { super.onBluetoothStateChanged(bluetoothState); updateContent(bluetoothState); if (bluetoothState == BluetoothAdapter.STATE_ON) { showBluetoothTurnedOnToast(); } } @Override Loading Loading @@ -205,4 +209,9 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme return KEY_AVAIL_DEVICES; } @VisibleForTesting void showBluetoothTurnedOnToast() { Toast.makeText(getContext(), R.string.connected_device_bluetooth_turned_on_toast, Toast.LENGTH_SHORT).show(); } } tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +9 −0 Original line number Diff line number Diff line Loading @@ -192,4 +192,13 @@ public class BluetoothPairingDetailTest { // Verify that clean up only happen once at initialization verify(mAvailableDevicesCategory, times(1)).removeAll(); } @Test public void onBluetoothStateChanged_whenTurnedOnBTShowToast() { doNothing().when(mFragment).updateContent(anyInt()); mFragment.onBluetoothStateChanged(BluetoothAdapter.STATE_ON); verify(mFragment).showBluetoothTurnedOnToast(); } } Loading
res/values/strings.xml +2 −0 Original line number Diff line number Diff line Loading @@ -431,6 +431,8 @@ <string name="connected_device_previously_connected_title">Previously connected devices</string> <!-- Preference screen title for Bluetooth preference to open paired but no connection list [CHAR LIMIT=none]--> <string name="connected_device_previously_connected_screen_title">Previously connected</string> <!-- Toast text for hint user bluetooth is turned on [CHAR LIMIT=none]--> <string name="connected_device_bluetooth_turned_on_toast">Bluetooth turned on</string> <!-- Date & time settings screen title --> <string name="date_and_time">Date & time</string> Loading
src/com/android/settings/bluetooth/BluetoothPairingDetail.java +9 −0 Original line number Diff line number Diff line Loading @@ -22,6 +22,7 @@ import android.bluetooth.BluetoothAdapter; import android.bluetooth.BluetoothDevice; import android.content.Context; import android.os.Bundle; import android.widget.Toast; import androidx.annotation.VisibleForTesting; import android.util.Log; Loading Loading @@ -166,6 +167,9 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme public void onBluetoothStateChanged(int bluetoothState) { super.onBluetoothStateChanged(bluetoothState); updateContent(bluetoothState); if (bluetoothState == BluetoothAdapter.STATE_ON) { showBluetoothTurnedOnToast(); } } @Override Loading Loading @@ -205,4 +209,9 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme return KEY_AVAIL_DEVICES; } @VisibleForTesting void showBluetoothTurnedOnToast() { Toast.makeText(getContext(), R.string.connected_device_bluetooth_turned_on_toast, Toast.LENGTH_SHORT).show(); } }
tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingDetailTest.java +9 −0 Original line number Diff line number Diff line Loading @@ -192,4 +192,13 @@ public class BluetoothPairingDetailTest { // Verify that clean up only happen once at initialization verify(mAvailableDevicesCategory, times(1)).removeAll(); } @Test public void onBluetoothStateChanged_whenTurnedOnBTShowToast() { doNothing().when(mFragment).updateContent(anyInt()); mFragment.onBluetoothStateChanged(BluetoothAdapter.STATE_ON); verify(mFragment).showBluetoothTurnedOnToast(); } }