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

Clean up FeatureFactory.getFeature()

Browse Source 
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
This commit is contained in:
Chaohui Wang
2023-08-04 15:42:43 +08:00
parent 0062308347
commit 8e2ae547d6
220 changed files with 282 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/search/SearchFeatureProvider.java
View File

@@ -136,10 +136,10 @@ public interface SearchFeatureProvider {
/** Start the search activity. */
private static void startSearchActivity(
Context context, FragmentActivity activity, int pageId, Intent intent) {
FeatureFactory.getFactory(context).getSlicesFeatureProvider()
FeatureFactory.getFeatureFactory().getSlicesFeatureProvider()
.indexSliceDataAsync(context);
FeatureFactory.getFactory(context).getMetricsFeatureProvider()
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
.logSettingsTileClick(KEY_HOMEPAGE_SEARCH_BAR, pageId);
final Bundle bundle = ActivityOptions.makeSceneTransitionAnimation(activity).toBundle();

4
src/com/android/settings/search/SearchResultTrampoline.java
View File

@@ -54,7 +54,7 @@ public class SearchResultTrampoline extends Activity {
final ComponentName callingActivity = getCallingActivity();
// First make sure caller has privilege to launch a search result page.
FeatureFactory.getFactory(this)
FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider()
.verifyLaunchSearchResultPageCaller(this, callingActivity);
// Didn't crash, proceed and launch the result as a subsetting.
@@ -141,7 +141,7 @@ public class SearchResultTrampoline extends Activity {
private boolean isSettingsIntelligence(ComponentName callingActivity) {
return callingActivity != null && TextUtils.equals(
callingActivity.getPackageName(),
FeatureFactory.getFactory(this).getSearchFeatureProvider()
FeatureFactory.getFeatureFactory().getSearchFeatureProvider()
.getSettingsIntelligencePkgName(this));
}
}

4
src/com/android/settings/search/actionbar/SearchMenuController.java
View File

@@ -91,7 +91,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
searchItem.setOnMenuItemClickListener(target -> {
final Intent intent = FeatureFactory.getFactory(activity)
final Intent intent = FeatureFactory.getFeatureFactory()
.getSearchFeatureProvider()
.buildSearchIntent(activity, mPageId);
@@ -100,7 +100,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
return true;
}
FeatureFactory.getFactory(activity).getMetricsFeatureProvider()
FeatureFactory.getFeatureFactory().getMetricsFeatureProvider()
.action(activity, SettingsEnums.ACTION_SEARCH_RESULTS);
mHost.startActivityForResult(intent, SearchFeatureProvider.REQUEST_CODE);
return true;