New countryIfOriginLabel
And display this label as fallback when Regulatory Image is missing. Bug: 329378943 Test: manual - on SIMs Test: unit test Change-Id: I0b8851da20face9ca444b3e6456a4a662b944b65 Merged-In: I0b8851da20face9ca444b3e6456a4a662b944b65
This commit is contained in:
@@ -68,7 +68,7 @@ abstract class FeatureFactory {
|
||||
/**
|
||||
* Retrieves implementation for Hardware Info feature.
|
||||
*/
|
||||
abstract val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider
|
||||
open val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider? = null
|
||||
|
||||
/** Implementation for [SupportFeatureProvider]. */
|
||||
open val supportFeatureProvider: SupportFeatureProvider? = null
|
||||
|
||||
@@ -45,8 +45,6 @@ import com.android.settings.core.instrumentation.SettingsMetricsFeatureProvider
|
||||
import com.android.settings.dashboard.DashboardFeatureProviderImpl
|
||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider
|
||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl
|
||||
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProvider
|
||||
import com.android.settings.deviceinfo.hardwareinfo.HardwareInfoFeatureProviderImpl
|
||||
import com.android.settings.display.DisplayFeatureProvider
|
||||
import com.android.settings.display.DisplayFeatureProviderImpl
|
||||
import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl
|
||||
@@ -81,9 +79,6 @@ open class FeatureFactoryImpl : FeatureFactory() {
|
||||
ContextualCardFeatureProviderImpl(appContext)
|
||||
}
|
||||
|
||||
override val hardwareInfoFeatureProvider: HardwareInfoFeatureProvider =
|
||||
HardwareInfoFeatureProviderImpl
|
||||
|
||||
override val metricsFeatureProvider by lazy { SettingsMetricsFeatureProvider() }
|
||||
|
||||
override val powerUsageFeatureProvider by lazy { PowerUsageFeatureProviderImpl(appContext) }
|
||||
|
||||
Reference in New Issue
Block a user