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

Set title for Bluetooth Details page to "Stylus" for styluses.

Browse Source 
Bug: 254835745
Test: BluetoothDeviceDetailsFragmentTest
Change-Id: I725877b0bcf44fa7be805e16fb2d695c9d6074dc
This commit is contained in:
Vania Januar
2022-12-29 10:12:10 +00:00
parent 57822a67a8
commit b837d57b02
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java
View File

@@ -341,9 +341,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
@VisibleForTesting @VisibleForTesting
void setTitleForInputDevice() { void setTitleForInputDevice() {
// TODO(b/254835745) once source filter for bt stylus merged if (StylusDevicesController.isDeviceStylus(mInputDevice, mCachedDevice)) {
// && mInputDevice.supportsSource(InputDevice.SOURCE_BLUETOOTH_STYLUS))
if (mInputDevice != null) {
// This will override the default R.string.device_details_title "Device Details" // This will override the default R.string.device_details_title "Device Details"
// that will show on non-stylus bluetooth devices. // that will show on non-stylus bluetooth devices.
// That title is set via the manifest and also from BluetoothDeviceUpdater. // That title is set via the manifest and also from BluetoothDeviceUpdater.

4
tests/robotests/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragmentTest.java
View File

@@ -159,7 +159,9 @@ public class BluetoothDeviceDetailsFragmentTest {
public void getTitle_inputDeviceTitle() { public void getTitle_inputDeviceTitle() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_SHOW_STYLUS_PREFERENCES, FeatureFlagUtils.setEnabled(mContext, FeatureFlagUtils.SETTINGS_SHOW_STYLUS_PREFERENCES,
true); true);
doReturn(mock(InputDevice.class)).when(mFragment).getInputDevice(mContext); InputDevice inputDevice = mock(InputDevice.class);
doReturn(true).when(inputDevice).supportsSource(InputDevice.SOURCE_STYLUS);
doReturn(inputDevice).when(mFragment).getInputDevice(mContext);
mFragment.onAttach(mContext); mFragment.onAttach(mContext);
mFragment.setTitleForInputDevice(); mFragment.setTitleForInputDevice();