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

Add ranking to SuggestionFeatureProvider interface.

Browse Source 
Test: RunSettingsRoboTests
Fixes: b/35363662

Change-Id: Ib786e6b2733e2b151f73fb68e174a21aedb2b20a
This commit is contained in:
Soroosh Mariooryad
2017-02-14 16:40:31 -08:00
parent 25d8049bb2
commit e457e35ec0
10 changed files with 46 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/overlay/FeatureFactory.java
View File

@@ -24,13 +24,13 @@ import com.android.settings.R;
import com.android.settings.applications.ApplicationFeatureProvider;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.SuggestionFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.gestures.AssistGestureFeatureProvider;
import com.android.settings.localepicker.LocaleFeatureProvider;
import com.android.settings.security.SecurityFeatureProvider;
import com.android.settings.search2.SearchFeatureProvider;
import com.android.settings.suggestions.SuggestionFeatureProvider;
/**
* Abstract class for creating feature controllers. Allows OEM implementations to define their own
@@ -71,7 +71,7 @@ public abstract class FeatureFactory {
public abstract AssistGestureFeatureProvider getAssistGestureFeatureProvider();
public abstract SuggestionFeatureProvider getSuggestionFeatureProvider();
public abstract SuggestionFeatureProvider getSuggestionFeatureProvider(Context context);
public abstract SupportFeatureProvider getSupportFeatureProvider(Context context);

8
src/com/android/settings/overlay/FeatureFactoryImpl.java
View File

@@ -30,8 +30,6 @@ import com.android.settings.applications.PackageManagerWrapperImpl;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProvider;
import com.android.settings.dashboard.DashboardFeatureProviderImpl;
import com.android.settings.dashboard.SuggestionFeatureProvider;
import com.android.settings.dashboard.SuggestionFeatureProviderImpl;
import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
@@ -45,6 +43,8 @@ import com.android.settings.search2.SearchFeatureProvider;
import com.android.settings.search2.SearchFeatureProviderImpl;
import com.android.settings.security.SecurityFeatureProvider;
import com.android.settings.security.SecurityFeatureProviderImpl;
import com.android.settings.suggestions.SuggestionFeatureProvider;
import com.android.settings.suggestions.SuggestionFeatureProviderImpl;
import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
/**
@@ -150,9 +150,9 @@ public class FeatureFactoryImpl extends FeatureFactory {
}
@Override
public SuggestionFeatureProvider getSuggestionFeatureProvider() {
public SuggestionFeatureProvider getSuggestionFeatureProvider(Context context) {
if (mSuggestionFeatureProvider == null) {
mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl();
mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl(context);
}
return mSuggestionFeatureProvider;
}