Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f7164c5 authored by Fan Zhang's avatar Fan Zhang
Browse files

Add SuggestionFeatureProvider interface. 

The feature provider will contain all logic for suggestions.

Test: RunSettingsRoboTests
Change-Id: I45a0dcdc101d97acb07babd531db50b80bb3b308
parent 1d0e6c8c

src/com/android/settings/dashboard/SuggestionFeatureProvider.java

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License

 */



package com.android.settings.dashboard;



import android.content.Context;



/** Interface should be implemented if you have added new suggestions */

public interface SuggestionFeatureProvider {



    /**

     * Returns true if smart suggestion should be used instead of xml based SuggestionParser.

     */

    boolean isSmartSuggestionEnabled(Context context);



}
 
 No newline at end of file

src/com/android/settings/dashboard/SuggestionFeatureProviderImpl.java

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.settings.dashboard;



import android.content.Context;



public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider {



    @Override

    public boolean isSmartSuggestionEnabled(Context context) {

        return false;

    }



}

src/com/android/settings/overlay/FeatureFactory.java

+3 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 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.localepicker.LocaleFeatureProvider;
@@ -67,6 +68,8 @@ public abstract class FeatureFactory { 
        return sFactory;

    }



    public abstract SuggestionFeatureProvider getSuggestionFeatureProvider();



    public abstract SupportFeatureProvider getSupportFeatureProvider(Context context);



    public abstract MetricsFeatureProvider getMetricsFeatureProvider();

src/com/android/settings/overlay/FeatureFactoryImpl.java

+13 −2
Original line number Diff line number Diff line
@@ -30,16 +30,18 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider; 
import com.android.settings.core.instrumentation.MetricsFeatureProviderImpl;

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;

import com.android.settings.fuelgauge.PowerUsageFeatureProvider;

import com.android.settings.localepicker.LocaleFeatureProvider;

import com.android.settings.localepicker.LocaleFeatureProviderImpl;

import com.android.settings.security.SecurityFeatureProvider;

import com.android.settings.security.SecurityFeatureProviderImpl;

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.vpn2.ConnectivityManagerWrapperImpl;



/**
@@ -55,6 +57,7 @@ public class FeatureFactoryImpl extends FeatureFactory { 
    private EnterprisePrivacyFeatureProvider mEnterprisePrivacyFeatureProvider;

    private SearchFeatureProvider mSearchFeatureProvider;

    private SecurityFeatureProvider mSecurityFeatureProvider;

    private SuggestionFeatureProvider mSuggestionFeatureProvider;



    @Override

    public SupportFeatureProvider getSupportFeatureProvider(Context context) {
@@ -136,4 +139,12 @@ public class FeatureFactoryImpl extends FeatureFactory { 
        }

        return mSecurityFeatureProvider;

    }



    @Override

    public SuggestionFeatureProvider getSuggestionFeatureProvider() {

        if (mSuggestionFeatureProvider == null) {

            mSuggestionFeatureProvider = new SuggestionFeatureProviderImpl();

        }

        return mSuggestionFeatureProvider;

    }

}

tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 
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.localepicker.LocaleFeatureProvider;
@@ -49,6 +50,7 @@ public class FakeFeatureFactory extends FeatureFactory { 
    public final SearchFeatureProvider searchFeatureProvider;

    public final SurveyFeatureProvider surveyFeatureProvider;

    public final SecurityFeatureProvider securityFeatureProvider;

    public final SuggestionFeatureProvider suggestionsFeatureProvider;



    /**

     * Call this in {@code @Before} method of the test class to use fake factory.
@@ -81,6 +83,12 @@ public class FakeFeatureFactory extends FeatureFactory { 
        searchFeatureProvider = mock(SearchFeatureProvider.class);

        surveyFeatureProvider = mock(SurveyFeatureProvider.class);

        securityFeatureProvider = mock(SecurityFeatureProvider.class);

        suggestionsFeatureProvider = mock(SuggestionFeatureProvider.class);

    }



    @Override

    public SuggestionFeatureProvider getSuggestionFeatureProvider() {

        return suggestionsFeatureProvider;

    }



    @Override