Add a stylus controller to Bluetooth Device Details.
Feature is currently flagged behing SETTINGS_SHOW_STYLUS_PREFERENCES. Bug: 251201006 Test: SettingsRoboTests StylusDevicesControllerTest DD: go/stylus-connected-devices-doc Change-Id: I438b7fe5ca1c94f9dfb506c8918d0e6cb005ca33
This commit is contained in:
@@ -23,12 +23,15 @@ import android.app.settings.SettingsEnums;
|
||||
import android.bluetooth.BluetoothDevice;
|
||||
import android.content.Context;
|
||||
import android.content.res.TypedArray;
|
||||
import android.hardware.input.InputManager;
|
||||
import android.net.Uri;
|
||||
import android.os.Bundle;
|
||||
import android.os.UserManager;
|
||||
import android.provider.DeviceConfig;
|
||||
import android.text.TextUtils;
|
||||
import android.util.FeatureFlagUtils;
|
||||
import android.util.Log;
|
||||
import android.view.InputDevice;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuInflater;
|
||||
@@ -37,9 +40,11 @@ import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.ViewTreeObserver;
|
||||
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.connecteddevice.stylus.StylusDevicesController;
|
||||
import com.android.settings.core.SettingsUIDeviceConfig;
|
||||
import com.android.settings.dashboard.RestrictedDashboardFragment;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
@@ -72,6 +77,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
||||
CachedBluetoothDevice getDevice(String deviceAddress);
|
||||
|
||||
LocalBluetoothManager getManager(Context context);
|
||||
|
||||
UserManager getUserManager();
|
||||
}
|
||||
|
||||
@@ -85,6 +91,9 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
||||
@VisibleForTesting
|
||||
CachedBluetoothDevice mCachedDevice;
|
||||
|
||||
@Nullable
|
||||
InputDevice mInputDevice;
|
||||
|
||||
private UserManager mUserManager;
|
||||
|
||||
public BluetoothDeviceDetailsFragment() {
|
||||
@@ -118,6 +127,21 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
||||
return getSystemService(UserManager.class);
|
||||
}
|
||||
|
||||
@Nullable
|
||||
@VisibleForTesting
|
||||
InputDevice getInputDevice(Context context) {
|
||||
InputManager im = context.getSystemService(InputManager.class);
|
||||
|
||||
for (int deviceId : im.getInputDeviceIds()) {
|
||||
String btAddress = im.getInputDeviceBluetoothAddress(deviceId);
|
||||
|
||||
if (btAddress != null && btAddress.equals(mDeviceAddress)) {
|
||||
return im.getInputDevice(deviceId);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
public static BluetoothDeviceDetailsFragment newInstance(String deviceAddress) {
|
||||
Bundle args = new Bundle(1);
|
||||
args.putString(KEY_DEVICE_ADDRESS, deviceAddress);
|
||||
@@ -132,6 +156,12 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
||||
mManager = getLocalBluetoothManager(context);
|
||||
mCachedDevice = getCachedDevice(mDeviceAddress);
|
||||
mUserManager = getUserManager();
|
||||
|
||||
if (FeatureFlagUtils.isEnabled(context,
|
||||
FeatureFlagUtils.SETTINGS_SHOW_STYLUS_PREFERENCES)) {
|
||||
mInputDevice = getInputDevice(context);
|
||||
}
|
||||
|
||||
super.onAttach(context);
|
||||
if (mCachedDevice == null) {
|
||||
// Close this page if device is null with invalid device mac address
|
||||
@@ -191,6 +221,12 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
||||
}
|
||||
};
|
||||
|
||||
@Override
|
||||
public void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setTitleForInputDevice();
|
||||
}
|
||||
|
||||
@Override
|
||||
public View onCreateView(LayoutInflater inflater, ViewGroup container,
|
||||
Bundle savedInstanceState) {
|
||||
@@ -269,6 +305,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
||||
mCachedDevice, lifecycle));
|
||||
controllers.add(new BluetoothDetailsMacAddressController(context, this, mCachedDevice,
|
||||
lifecycle));
|
||||
controllers.add(new StylusDevicesController(context, mInputDevice, lifecycle));
|
||||
controllers.add(new BluetoothDetailsRelatedToolsController(context, this, mCachedDevice,
|
||||
lifecycle));
|
||||
controllers.add(new BluetoothDetailsPairOtherController(context, this, mCachedDevice,
|
||||
@@ -289,4 +326,16 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
||||
resolvedAttributes.recycle();
|
||||
return width;
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
void setTitleForInputDevice() {
|
||||
// TODO(b/254835745) once source filter for bt stylus merged
|
||||
// && mInputDevice.supportsSource(InputDevice.SOURCE_BLUETOOTH_STYLUS))
|
||||
if (mInputDevice != null) {
|
||||
// This will override the default R.string.device_details_title "Device Details"
|
||||
// that will show on non-stylus bluetooth devices.
|
||||
// That title is set via the manifest and also from BluetoothDeviceUpdater.
|
||||
getActivity().setTitle(getContext().getString(R.string.stylus_device_details_title));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user