Create suggestion state provider.
- The provider now handles isSuggestionComplete check - Remove SuggestionChecks class. Bug: 65065268 Test: robotests Change-Id: Id45d67d4a5146cc023f7fad7bb292b4c1c14a782
This commit is contained in:
@@ -2936,6 +2936,15 @@
|
|||||||
</intent-filter>
|
</intent-filter>
|
||||||
</provider>
|
</provider>
|
||||||
|
|
||||||
|
<provider
|
||||||
|
android:name=".dashboard.suggestions.SuggestionStateProvider"
|
||||||
|
android:authorities="com.android.settings.suggestions.status"
|
||||||
|
android:exported="true">
|
||||||
|
<intent-filter>
|
||||||
|
<action android:name="com.android.settings.action.SUGGESTION_STATE_PROVIDER" />
|
||||||
|
</intent-filter>
|
||||||
|
</provider>
|
||||||
|
|
||||||
<activity android:name="Settings$OverlaySettingsActivity"
|
<activity android:name="Settings$OverlaySettingsActivity"
|
||||||
android:label="@string/draw_overlay"
|
android:label="@string/draw_overlay"
|
||||||
android:taskAffinity="">
|
android:taskAffinity="">
|
||||||
|
@@ -40,7 +40,6 @@ import com.android.settings.dashboard.conditional.FocusRecyclerView.FocusListene
|
|||||||
import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;
|
import com.android.settings.dashboard.suggestions.SuggestionControllerMixin;
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionDismissController;
|
import com.android.settings.dashboard.suggestions.SuggestionDismissController;
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
|
||||||
import com.android.settings.dashboard.suggestions.SuggestionsChecks;
|
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
import com.android.settings.widget.ActionBarShadowController;
|
import com.android.settings.widget.ActionBarShadowController;
|
||||||
import com.android.settingslib.drawer.CategoryKey;
|
import com.android.settingslib.drawer.CategoryKey;
|
||||||
@@ -73,7 +72,6 @@ public class DashboardSummary extends InstrumentedFragment
|
|||||||
private ConditionManager mConditionManager;
|
private ConditionManager mConditionManager;
|
||||||
private SuggestionParser mSuggestionParser;
|
private SuggestionParser mSuggestionParser;
|
||||||
private LinearLayoutManager mLayoutManager;
|
private LinearLayoutManager mLayoutManager;
|
||||||
private SuggestionsChecks mSuggestionsChecks;
|
|
||||||
private SuggestionControllerMixin mSuggestionControllerMixin;
|
private SuggestionControllerMixin mSuggestionControllerMixin;
|
||||||
private DashboardFeatureProvider mDashboardFeatureProvider;
|
private DashboardFeatureProvider mDashboardFeatureProvider;
|
||||||
private SuggestionFeatureProvider mSuggestionFeatureProvider;
|
private SuggestionFeatureProvider mSuggestionFeatureProvider;
|
||||||
@@ -112,7 +110,6 @@ public class DashboardSummary extends InstrumentedFragment
|
|||||||
if (mSuggestionFeatureProvider.isSuggestionEnabled(activity)) {
|
if (mSuggestionFeatureProvider.isSuggestionEnabled(activity)) {
|
||||||
mSuggestionParser = new SuggestionParser(activity,
|
mSuggestionParser = new SuggestionParser(activity,
|
||||||
mSuggestionFeatureProvider.getSharedPrefs(activity), R.xml.suggestion_ordering);
|
mSuggestionFeatureProvider.getSharedPrefs(activity), R.xml.suggestion_ordering);
|
||||||
mSuggestionsChecks = new SuggestionsChecks(getContext());
|
|
||||||
}
|
}
|
||||||
if (DEBUG_TIMING) {
|
if (DEBUG_TIMING) {
|
||||||
Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime) + " ms");
|
Log.d(TAG, "onCreate took " + (System.currentTimeMillis() - startTime) + " ms");
|
||||||
@@ -295,7 +292,7 @@ public class DashboardSummary extends InstrumentedFragment
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated in favor of the real SuggestionLoader.
|
* @deprecated in favor of {@link #mSuggestionControllerMixin}.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
private class SuggestionLoader extends AsyncTask<Void, Void, List<Tile>> {
|
private class SuggestionLoader extends AsyncTask<Void, Void, List<Tile>> {
|
||||||
@@ -318,7 +315,8 @@ public class DashboardSummary extends InstrumentedFragment
|
|||||||
}
|
}
|
||||||
for (int i = 0; i < suggestions.size(); i++) {
|
for (int i = 0; i < suggestions.size(); i++) {
|
||||||
Tile suggestion = suggestions.get(i);
|
Tile suggestion = suggestions.get(i);
|
||||||
if (mSuggestionsChecks.isSuggestionComplete(suggestion)) {
|
if (mSuggestionFeatureProvider.isSuggestionComplete(context,
|
||||||
|
suggestion.intent.getComponent())) {
|
||||||
suggestions.remove(i--);
|
suggestions.remove(i--);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -344,7 +342,7 @@ public class DashboardSummary extends InstrumentedFragment
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @deprecated in favor of SuggestionControllerMixin.
|
* @deprecated in favor of {@link #mSuggestionControllerMixin}.
|
||||||
*/
|
*/
|
||||||
@Deprecated
|
@Deprecated
|
||||||
@VisibleForTesting
|
@VisibleForTesting
|
||||||
|
@@ -0,0 +1,94 @@
|
|||||||
|
/*
|
||||||
|
* 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.suggestions;
|
||||||
|
|
||||||
|
import static android.content.Intent.EXTRA_COMPONENT_NAME;
|
||||||
|
|
||||||
|
import android.content.ComponentName;
|
||||||
|
import android.content.ContentProvider;
|
||||||
|
import android.content.ContentValues;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.database.Cursor;
|
||||||
|
import android.net.Uri;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.support.annotation.VisibleForTesting;
|
||||||
|
import android.util.Log;
|
||||||
|
|
||||||
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
|
|
||||||
|
public class SuggestionStateProvider extends ContentProvider {
|
||||||
|
|
||||||
|
private static final String TAG = "SugstStatusProvider";
|
||||||
|
|
||||||
|
@VisibleForTesting
|
||||||
|
static final String METHOD_GET_SUGGESTION_STATE = "getSuggestionState";
|
||||||
|
@VisibleForTesting
|
||||||
|
static final String EXTRA_CANDIDATE_ID = "candidate_id";
|
||||||
|
private static final String RESULT_IS_COMPLETE = "candidate_is_complete";
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean onCreate() {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Cursor query(Uri uri, String[] projection, String selection, String[] selectionArgs,
|
||||||
|
String sortOrder) {
|
||||||
|
throw new UnsupportedOperationException("query operation not supported currently.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String getType(Uri uri) {
|
||||||
|
throw new UnsupportedOperationException("getType operation not supported currently.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Uri insert(Uri uri, ContentValues values) {
|
||||||
|
throw new UnsupportedOperationException("insert operation not supported currently.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int delete(Uri uri, String selection, String[] selectionArgs) {
|
||||||
|
throw new UnsupportedOperationException("delete operation not supported currently.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public int update(Uri uri, ContentValues values, String selection, String[] selectionArgs) {
|
||||||
|
throw new UnsupportedOperationException("update operation not supported currently.");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Bundle call(String method, String arg, Bundle extras) {
|
||||||
|
final Bundle bundle = new Bundle();
|
||||||
|
if (METHOD_GET_SUGGESTION_STATE.equals(method)) {
|
||||||
|
final String id = extras.getString(EXTRA_CANDIDATE_ID);
|
||||||
|
final ComponentName cn = extras.getParcelable(EXTRA_COMPONENT_NAME);
|
||||||
|
final boolean isComplete;
|
||||||
|
if (cn == null) {
|
||||||
|
isComplete = true;
|
||||||
|
} else {
|
||||||
|
final Context context = getContext();
|
||||||
|
isComplete = FeatureFactory.getFactory(context)
|
||||||
|
.getSuggestionFeatureProvider(context)
|
||||||
|
.isSuggestionComplete(context, cn);
|
||||||
|
}
|
||||||
|
Log.d(TAG, "Suggestion " + id + " complete: " + isComplete);
|
||||||
|
bundle.putBoolean(RESULT_IS_COMPLETE, isComplete);
|
||||||
|
}
|
||||||
|
return bundle;
|
||||||
|
}
|
||||||
|
}
|
@@ -1,46 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.suggestions;
|
|
||||||
|
|
||||||
import android.content.ComponentName;
|
|
||||||
import android.content.Context;
|
|
||||||
|
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
|
||||||
import com.android.settingslib.drawer.Tile;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The Home of all stupidly dynamic Settings Suggestions checks.
|
|
||||||
*/
|
|
||||||
public class SuggestionsChecks {
|
|
||||||
|
|
||||||
private static final String TAG = "SuggestionsChecks";
|
|
||||||
private final Context mContext;
|
|
||||||
|
|
||||||
public SuggestionsChecks(Context context) {
|
|
||||||
mContext = context.getApplicationContext();
|
|
||||||
}
|
|
||||||
|
|
||||||
public boolean isSuggestionComplete(Tile suggestion) {
|
|
||||||
ComponentName component = suggestion.intent.getComponent();
|
|
||||||
|
|
||||||
final SuggestionFeatureProvider provider =
|
|
||||||
FeatureFactory.getFactory(mContext).getSuggestionFeatureProvider(mContext);
|
|
||||||
|
|
||||||
return provider.isSuggestionComplete(mContext, component);
|
|
||||||
}
|
|
||||||
|
|
||||||
}
|
|
@@ -0,0 +1,94 @@
|
|||||||
|
/*
|
||||||
|
* 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.suggestions;
|
||||||
|
|
||||||
|
import static android.content.Intent.EXTRA_COMPONENT_NAME;
|
||||||
|
import static org.mockito.Matchers.any;
|
||||||
|
import static org.mockito.Mockito.verify;
|
||||||
|
|
||||||
|
import android.content.ComponentName;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import com.android.settings.TestConfig;
|
||||||
|
import com.android.settings.testutils.FakeFeatureFactory;
|
||||||
|
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Answers;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.Robolectric;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||||
|
public class SuggestionStateProviderTest {
|
||||||
|
|
||||||
|
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||||
|
private Context mContext;
|
||||||
|
|
||||||
|
private SuggestionStateProvider mProvider;
|
||||||
|
private FakeFeatureFactory mFeatureFactory;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mFeatureFactory = FakeFeatureFactory.setupForTest(mContext);
|
||||||
|
|
||||||
|
mProvider = Robolectric.setupContentProvider(SuggestionStateProvider.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expected = UnsupportedOperationException.class)
|
||||||
|
public void query_shouldCrash() {
|
||||||
|
mProvider.query(null, null, null, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expected = UnsupportedOperationException.class)
|
||||||
|
public void getType_shouldCrash() {
|
||||||
|
mProvider.getType(null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expected = UnsupportedOperationException.class)
|
||||||
|
public void insert_shouldCrash() {
|
||||||
|
mProvider.insert(null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expected = UnsupportedOperationException.class)
|
||||||
|
public void delete_shouldCrash() {
|
||||||
|
mProvider.delete(null, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test(expected = UnsupportedOperationException.class)
|
||||||
|
public void update_shouldCrash() {
|
||||||
|
mProvider.update(null, null, null, null);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void getSuggestionState_shouldQueryFeatureProvider() {
|
||||||
|
final Bundle extras = new Bundle();
|
||||||
|
extras.putString(SuggestionStateProvider.EXTRA_CANDIDATE_ID, "ID");
|
||||||
|
extras.putParcelable(EXTRA_COMPONENT_NAME, new ComponentName("pkg", "cls"));
|
||||||
|
|
||||||
|
mProvider.call(SuggestionStateProvider.METHOD_GET_SUGGESTION_STATE, "foobar", extras);
|
||||||
|
|
||||||
|
verify(mFeatureFactory.suggestionsFeatureProvider)
|
||||||
|
.isSuggestionComplete(any(Context.class), any(ComponentName.class));
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user