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

Stylus updater in ConnectedDevicesGroupController.

Browse Source 
This updater is responsible for listening to USI stylus
battery usage, and bluetooth stylus connection, to determine
whether to show the USI stylus preference on the Connected devices
page.

Adds an entrypoint to the StylusUsiDetailsFragment that shows
details for USI styluses.

Bug: 250909304
Test: StylusDeviceUpdaterTest
Change-Id: I6ae6b6ef880b3b3cd7430d4d35d471b14283369f
This commit is contained in:
Vania Januar
2022-10-28 12:27:46 +01:00
parent 850f857ce5
commit dc2980d220
8 changed files with 608 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/com/android/settings/connecteddevice/ConnectedDeviceGroupController.java
View File

@@ -17,6 +17,9 @@ package com.android.settings.connecteddevice;
import android.content.Context;
import android.content.pm.PackageManager;
import android.hardware.input.InputManager;
import android.util.FeatureFlagUtils;
import android.view.InputDevice;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
@@ -26,6 +29,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
import com.android.settings.connecteddevice.dock.DockUpdater;
import com.android.settings.connecteddevice.stylus.StylusDeviceUpdater;
import com.android.settings.connecteddevice.usb.ConnectedUsbDeviceUpdater;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
@@ -51,11 +55,14 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
private ConnectedUsbDeviceUpdater mConnectedUsbDeviceUpdater;
private DockUpdater mConnectedDockUpdater;
private StylusDeviceUpdater mStylusDeviceUpdater;
private final PackageManager mPackageManager;
private final InputManager mInputManager;
public ConnectedDeviceGroupController(Context context) {
super(context, KEY);
mPackageManager = context.getPackageManager();
mInputManager = context.getSystemService(InputManager.class);
}
@Override
@@ -69,7 +76,13 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
mConnectedUsbDeviceUpdater.registerCallback();
}
mConnectedDockUpdater.registerCallback();
if (mConnectedDockUpdater != null) {
mConnectedDockUpdater.registerCallback();
}
if (mStylusDeviceUpdater != null) {
mStylusDeviceUpdater.registerCallback();
}
}
@Override
@@ -82,7 +95,13 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
mConnectedUsbDeviceUpdater.unregisterCallback();
}
mConnectedDockUpdater.unregisterCallback();
if (mConnectedDockUpdater != null) {
mConnectedDockUpdater.unregisterCallback();
}
if (mStylusDeviceUpdater != null) {
mStylusDeviceUpdater.unregisterCallback();
}
}
@Override
@@ -103,8 +122,15 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
mConnectedUsbDeviceUpdater.initUsbPreference(context);
}
mConnectedDockUpdater.setPreferenceContext(context);
mConnectedDockUpdater.forceUpdate();
if (mConnectedDockUpdater != null) {
mConnectedDockUpdater.setPreferenceContext(context);
mConnectedDockUpdater.forceUpdate();
}
if (mStylusDeviceUpdater != null) {
mStylusDeviceUpdater.setPreferenceContext(context);
mStylusDeviceUpdater.forceUpdate();
}
}
}
@@ -112,6 +138,7 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
public int getAvailabilityStatus() {
return (hasBluetoothFeature()
|| hasUsbFeature()
|| hasUsiStylusFeature()
|| mConnectedDockUpdater != null)
? AVAILABLE_UNSEARCHABLE
: UNSUPPORTED_ON_DEVICE;
@@ -141,11 +168,13 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
@VisibleForTesting
void init(BluetoothDeviceUpdater bluetoothDeviceUpdater,
ConnectedUsbDeviceUpdater connectedUsbDeviceUpdater,
DockUpdater connectedDockUpdater) {
DockUpdater connectedDockUpdater,
StylusDeviceUpdater connectedStylusDeviceUpdater) {
mBluetoothDeviceUpdater = bluetoothDeviceUpdater;
mConnectedUsbDeviceUpdater = connectedUsbDeviceUpdater;
mConnectedDockUpdater = connectedDockUpdater;
mStylusDeviceUpdater = connectedStylusDeviceUpdater;
}
public void init(DashboardFragment fragment) {
@@ -160,7 +189,10 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
hasUsbFeature()
? new ConnectedUsbDeviceUpdater(context, fragment, this)
: null,
connectedDockUpdater);
connectedDockUpdater,
hasUsiStylusFeature()
? new StylusDeviceUpdater(context, fragment, this)
: null);
}
private boolean hasBluetoothFeature() {
@@ -171,4 +203,21 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
return mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_ACCESSORY)
|| mPackageManager.hasSystemFeature(PackageManager.FEATURE_USB_HOST);
}
private boolean hasUsiStylusFeature() {
if (!FeatureFlagUtils.isEnabled(mContext,
FeatureFlagUtils.SETTINGS_SHOW_STYLUS_PREFERENCES)) {
return false;
}
for (int deviceId : mInputManager.getInputDeviceIds()) {
InputDevice device = mInputManager.getInputDevice(deviceId);
if (device != null
&& device.supportsSource(InputDevice.SOURCE_STYLUS)
&& !device.isExternal()) {
return true;
}
}
return false;
}
}