Merge "USB firmware update for stylus in Stylus USI Device Details" into main

This commit is contained in:
Vania Januar
2023-07-18 09:16:13 +00:00
committed by Android (Google) Code Review
13 changed files with 597 additions and 1 deletions

View File

@@ -23,6 +23,7 @@ import com.android.settings.applications.ApplicationFeatureProvider
import com.android.settings.biometrics.face.FaceFeatureProvider
import com.android.settings.biometrics2.factory.BiometricsRepositoryProvider
import com.android.settings.bluetooth.BluetoothFeatureProvider
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider
import com.android.settings.dashboard.DashboardFeatureProvider
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider
@@ -145,6 +146,11 @@ abstract class FeatureFactory {
*/
abstract val keyboardSettingsFeatureProvider: KeyboardSettingsFeatureProvider
/**
* Retrieves implementation for stylus feature.
*/
abstract val stylusFeatureProvider: StylusFeatureProvider
companion object {
private var _factory: FeatureFactory? = null

View File

@@ -33,6 +33,8 @@ import com.android.settings.biometrics2.factory.BiometricsRepositoryProviderImpl
import com.android.settings.bluetooth.BluetoothFeatureProvider
import com.android.settings.bluetooth.BluetoothFeatureProviderImpl
import com.android.settings.connecteddevice.dock.DockUpdaterFeatureProviderImpl
import com.android.settings.connecteddevice.stylus.StylusFeatureProvider
import com.android.settings.connecteddevice.stylus.StylusFeatureProviderImpl
import com.android.settings.core.instrumentation.SettingsMetricsFeatureProvider
import com.android.settings.dashboard.DashboardFeatureProviderImpl
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider
@@ -173,4 +175,8 @@ open class FeatureFactoryImpl : FeatureFactory() {
override val keyboardSettingsFeatureProvider: KeyboardSettingsFeatureProvider by lazy {
KeyboardSettingsFeatureProviderImpl()
}
override val stylusFeatureProvider: StylusFeatureProvider by lazy {
StylusFeatureProviderImpl()
}
}