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

Merge "Add the USB device parameter to usb stylus feature preference provider." into udc-qpr-dev am: 85de68a968 am: ec9b0a08ae

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24282035

Change-Id: Id480cb6f6a0920c37a5bf8a8c4de68ce33225a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Vania Januar
2023-08-14 17:32:16 +00:00
committed by Automerger Merge Worker
parent c82df409d8 ec9b0a08ae
commit eb83c22f62
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/connecteddevice/stylus/StylusFeatureProvider.java
View File

@@ -41,7 +41,8 @@ public interface StylusFeatureProvider {
* the list will contain only the preference showing the current firmware version. * the list will contain only the preference showing the current firmware version.
* *
* @param context The context * @param context The context
* @param usbDevice The USB device for which to generate preferences.
*/ */
@Nullable @Nullable
List<Preference> getUsbFirmwareUpdatePreferences(Context context); List<Preference> getUsbFirmwareUpdatePreferences(Context context, UsbDevice usbDevice);
} }

2
src/com/android/settings/connecteddevice/stylus/StylusFeatureProviderImpl.java
View File

@@ -32,7 +32,7 @@ public class StylusFeatureProviderImpl implements StylusFeatureProvider {
} }
@Override @Override
public List<Preference> getUsbFirmwareUpdatePreferences(Context context) { public List<Preference> getUsbFirmwareUpdatePreferences(Context context, UsbDevice usbDevice) {
return null; return null;
} }
} }

2
src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareController.java
View File

@@ -88,7 +88,7 @@ public class StylusUsbFirmwareController extends BasePreferenceController
StylusFeatureProvider featureProvider = StylusFeatureProvider featureProvider =
FeatureFactory.getFeatureFactory().getStylusFeatureProvider(); FeatureFactory.getFeatureFactory().getStylusFeatureProvider();
List<Preference> preferences = List<Preference> preferences =
featureProvider.getUsbFirmwareUpdatePreferences(mContext); featureProvider.getUsbFirmwareUpdatePreferences(mContext, mStylusUsbDevice);
if (preferences != null) { if (preferences != null) {
mPreference = new PreferenceCategory(mContext); mPreference = new PreferenceCategory(mContext);

2
tests/robotests/src/com/android/settings/connecteddevice/stylus/StylusUsbFirmwareControllerTest.java
View File

@@ -157,7 +157,7 @@ public class StylusUsbFirmwareControllerTest {
when(mFeatureFactory.getStylusFeatureProvider() when(mFeatureFactory.getStylusFeatureProvider()
.isUsbFirmwareUpdateEnabled(any())).thenReturn(true); .isUsbFirmwareUpdateEnabled(any())).thenReturn(true);
when(mFeatureFactory.getStylusFeatureProvider() when(mFeatureFactory.getStylusFeatureProvider()
.getUsbFirmwareUpdatePreferences(any())) .getUsbFirmwareUpdatePreferences(any(), any()))
.thenReturn(Collections.singletonList(mock(Preference.class))); .thenReturn(Collections.singletonList(mock(Preference.class)));
} }
} }