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

Merge "Remove context from userFeatureProvider" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-02 10:18:09 +00:00
committed by Android (Google) Code Review
parent a789e9214e 515c0b8e3a
commit b042f81e34
7 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListPreferenceController.java
View File

@@ -72,7 +72,7 @@ public class EnterpriseSetDefaultAppsListPreferenceController extends
final FeatureFactory factory = FeatureFactory.getFeatureFactory(); final FeatureFactory factory = FeatureFactory.getFeatureFactory();
mApplicationFeatureProvider = factory.getApplicationFeatureProvider(); mApplicationFeatureProvider = factory.getApplicationFeatureProvider();
mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider(context); mEnterprisePrivacyFeatureProvider = factory.getEnterprisePrivacyFeatureProvider(context);
mUserFeatureProvider = factory.getUserFeatureProvider(context); mUserFeatureProvider = factory.getUserFeatureProvider();
buildAppList(); buildAppList();
} }

2
src/com/android/settings/enterprise/EnterpriseSetDefaultAppsPreferenceController.java
View File

@@ -39,7 +39,7 @@ public class EnterpriseSetDefaultAppsPreferenceController
super(context); super(context);
final FeatureFactory factory = FeatureFactory.getFeatureFactory(); final FeatureFactory factory = FeatureFactory.getFeatureFactory();
mApplicationFeatureProvider = factory.getApplicationFeatureProvider(); mApplicationFeatureProvider = factory.getApplicationFeatureProvider();
mUserFeatureProvider = factory.getUserFeatureProvider(context); mUserFeatureProvider = factory.getUserFeatureProvider();
} }
@Override @Override

2
src/com/android/settings/overlay/FeatureFactory.kt
View File

@@ -93,7 +93,7 @@ abstract class FeatureFactory {
abstract val searchFeatureProvider: SearchFeatureProvider abstract val searchFeatureProvider: SearchFeatureProvider
abstract fun getSurveyFeatureProvider(context: Context): SurveyFeatureProvider? abstract fun getSurveyFeatureProvider(context: Context): SurveyFeatureProvider?
abstract val securityFeatureProvider: SecurityFeatureProvider abstract val securityFeatureProvider: SecurityFeatureProvider
abstract fun getUserFeatureProvider(context: Context): UserFeatureProvider abstract val userFeatureProvider: UserFeatureProvider
abstract val slicesFeatureProvider: SlicesFeatureProvider abstract val slicesFeatureProvider: SlicesFeatureProvider
abstract val accountFeatureProvider: AccountFeatureProvider abstract val accountFeatureProvider: AccountFeatureProvider
abstract val panelFeatureProvider: PanelFeatureProvider abstract val panelFeatureProvider: PanelFeatureProvider

4
src/com/android/settings/overlay/FeatureFactoryImpl.kt
View File

@@ -79,8 +79,6 @@ open class FeatureFactoryImpl : FeatureFactory() {
) )
} }
private val userFeatureProvider by lazy { UserFeatureProviderImpl(appContext) }
private val contextualCardFeatureProvider by lazy { private val contextualCardFeatureProvider by lazy {
ContextualCardFeatureProviderImpl(appContext) ContextualCardFeatureProviderImpl(appContext)
} }
@@ -130,7 +128,7 @@ open class FeatureFactoryImpl : FeatureFactory() {
SuggestionFeatureProviderImpl() SuggestionFeatureProviderImpl()
} }
override fun getUserFeatureProvider(context: Context) = userFeatureProvider override val userFeatureProvider by lazy { UserFeatureProviderImpl(appContext) }
override val slicesFeatureProvider by lazy { SlicesFeatureProviderImpl() } override val slicesFeatureProvider by lazy { SlicesFeatureProviderImpl() }

3
tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -213,8 +213,9 @@ public class FakeFeatureFactory extends FeatureFactory {
return securityFeatureProvider; return securityFeatureProvider;
} }
@NotNull
@Override @Override
public UserFeatureProvider getUserFeatureProvider(Context context) { public UserFeatureProvider getUserFeatureProvider() {
return userFeatureProvider; return userFeatureProvider;
} }

5
tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt
View File

@@ -104,9 +104,8 @@ class FakeFeatureFactory : FeatureFactory() {
override val securityFeatureProvider: SecurityFeatureProvider override val securityFeatureProvider: SecurityFeatureProvider
get() = TODO("Not yet implemented") get() = TODO("Not yet implemented")
override fun getUserFeatureProvider(context: Context): UserFeatureProvider { override val userFeatureProvider: UserFeatureProvider
TODO("Not yet implemented") get() = TODO("Not yet implemented")
}
override val slicesFeatureProvider: SlicesFeatureProvider override val slicesFeatureProvider: SlicesFeatureProvider
get() = TODO("Not yet implemented") get() = TODO("Not yet implemented")

3
tests/unit/src/com/android/settings/testutils/FakeFeatureFactory.java
View File

@@ -212,8 +212,9 @@ public class FakeFeatureFactory extends FeatureFactory {
return securityFeatureProvider; return securityFeatureProvider;
} }
@NotNull
@Override @Override
public UserFeatureProvider getUserFeatureProvider(Context context) { public UserFeatureProvider getUserFeatureProvider() {
return userFeatureProvider; return userFeatureProvider;
} }