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

Merge "Load suggestions through SettingsIntelligence."

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-19 23:36:38 +00:00
committed by Android (Google) Code Review
parent f2b60f9c17 82cb5a5cc8
commit 530de5be78
14 changed files with 747 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
tests/robotests/src/android/service/settings/suggestions/Suggestion.java
View File

@@ -16,5 +16,104 @@
package android.service.settings.suggestions;
import android.app.PendingIntent;
import android.os.Parcel;
import android.text.TextUtils;
public class Suggestion {
private final String mId;
private final CharSequence mTitle;
private final CharSequence mSummary;
private final PendingIntent mPendingIntent;
/**
* Gets the id for the suggestion object.
*/
public String getId() {
return mId;
}
/**
* Title of the suggestion that is shown to the user.
*/
public CharSequence getTitle() {
return mTitle;
}
/**
* Optional summary describing what this suggestion controls.
*/
public CharSequence getSummary() {
return mSummary;
}
/**
* The Intent to launch when the suggestion is activated.
*/
public PendingIntent getPendingIntent() {
return mPendingIntent;
}
private Suggestion(Builder builder) {
mTitle = builder.mTitle;
mSummary = builder.mSummary;
mPendingIntent = builder.mPendingIntent;
mId = builder.mId;
}
private Suggestion(Parcel in) {
mId = in.readString();
mTitle = in.readCharSequence();
mSummary = in.readCharSequence();
mPendingIntent = in.readParcelable(PendingIntent.class.getClassLoader());
}
/**
* Builder class for {@link Suggestion}.
*/
public static class Builder {
private final String mId;
private CharSequence mTitle;
private CharSequence mSummary;
private PendingIntent mPendingIntent;
public Builder(String id) {
if (TextUtils.isEmpty(id)) {
throw new IllegalArgumentException("Suggestion id cannot be empty");
}
mId = id;
}
/**
* Sets suggestion title
*/
public Builder setTitle(CharSequence title) {
mTitle = title;
return this;
}
/**
* Sets suggestion summary
*/
public Builder setSummary(CharSequence summary) {
mSummary = summary;
return this;
}
/**
* Sets suggestion intent
*/
public Builder setPendingIntent(PendingIntent pendingIntent) {
mPendingIntent = pendingIntent;
return this;
}
/**
* Builds an immutable {@link Suggestion} object.
*/
public Suggestion build() {
return new Suggestion(this /* builder */);
}
}
}

42
tests/robotests/src/com/android/settings/dashboard/DashboardAdapterTest.java
View File

@@ -28,6 +28,7 @@ import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@@ -35,6 +36,7 @@ import android.content.res.Resources;
import android.content.res.TypedArray;
import android.graphics.drawable.Icon;
import android.os.Bundle;
import android.service.settings.suggestions.Suggestion;
import android.support.v7.widget.RecyclerView;
import android.util.DisplayMetrics;
import android.util.Pair;
@@ -557,6 +559,33 @@ public class DashboardAdapterTest {
// should not crash
}
@Test
public void testBindConditionAndSuggestion_v2_shouldSetSuggestionAdapterAndNoCrash() {
mDashboardAdapter = new DashboardAdapter(mContext, null, null, null, null);
final List<Suggestion> suggestions = makeSuggestionsV2("pkg1");
final DashboardCategory category = mock(DashboardCategory.class);
final List<Tile> tiles = new ArrayList<>();
tiles.add(mock(Tile.class));
category.tiles = tiles;
mDashboardAdapter.setSuggestionsV2(suggestions);
final RecyclerView data = mock(RecyclerView.class);
when(data.getResources()).thenReturn(mResources);
when(data.getContext()).thenReturn(mContext);
when(mResources.getDisplayMetrics()).thenReturn(mock(DisplayMetrics.class));
final View itemView = mock(View.class);
when(itemView.findViewById(R.id.data)).thenReturn(data);
final DashboardAdapter.SuggestionAndConditionContainerHolder holder =
new DashboardAdapter.SuggestionAndConditionContainerHolder(itemView);
mDashboardAdapter.onBindConditionAndSuggestion(
holder, DashboardAdapter.SUGGESTION_CONDITION_HEADER_POSITION);
verify(data).setAdapter(any(SuggestionAdapter.class));
// should not crash
}
@Test
public void testBindConditionAndSuggestion_emptySuggestion_shouldSetConditionAdpater() {
final Bundle savedInstance = new Bundle();
@@ -598,6 +627,17 @@ public class DashboardAdapterTest {
return suggestions;
}
private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
final List<Suggestion> suggestions = new ArrayList<>();
for (String pkgName : pkgNames) {
final Suggestion suggestion = new Suggestion.Builder(pkgName)
.setPendingIntent(mock(PendingIntent.class))
.build();
suggestions.add(suggestion);
}
return suggestions;
}
private void setupSuggestions(List<Tile> suggestions) {
mDashboardAdapter.setCategoriesAndSuggestions(null /* category */, suggestions);
final Context context = RuntimeEnvironment.application;
@@ -605,4 +645,6 @@ public class DashboardAdapterTest {
LayoutInflater.from(context).inflate(
R.layout.suggestion_condition_header, new RelativeLayout(context), true));
}
}

130
tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionAdapterTest.java
View File

@@ -15,13 +15,23 @@
*/
package com.android.settings.dashboard.suggestions;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.verify;
import android.app.PendingIntent;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.Icon;
import android.service.settings.suggestions.Suggestion;
import android.view.ContextThemeWrapper;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ContextThemeWrapper;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.FrameLayout;
@@ -31,15 +41,12 @@ import android.widget.TextView;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
import com.android.settings.dashboard.DashboardAdapter;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.drawer.Tile;
import java.util.ArrayList;
import java.util.List;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -50,22 +57,13 @@ import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config;
import org.robolectric.shadows.ShadowApplication;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.verify;
import java.util.ArrayList;
import java.util.List;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
public class SuggestionAdapterTest {
@Mock
private Tile mSuggestion1;
@Mock
private Tile mSuggestion2;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
private SettingsActivity mActivity;
@@ -74,6 +72,8 @@ public class SuggestionAdapterTest {
private DashboardAdapter.DashboardItemHolder mSuggestionHolder;
private List<Tile> mOneSuggestion;
private List<Tile> mTwoSuggestions;
private List<Suggestion> mOneSuggestionV2;
private List<Suggestion> mTwoSuggestionsV2;
@Before
public void setUp() {
@@ -81,39 +81,75 @@ public class SuggestionAdapterTest {
mContext = RuntimeEnvironment.application;
FakeFeatureFactory.setupForTest(mActivity);
mSuggestion1.title = "Test Suggestion 1";
mSuggestion1.icon = mock(Icon.class);
mSuggestion2.title = "Test Suggestion 2";
mSuggestion2.icon = mock(Icon.class);
final Tile suggestion1 = new Tile();
final Tile suggestion2 = new Tile();
final Suggestion suggestion1V2 = new Suggestion.Builder("id1")
.setTitle("Test suggestion 1")
.build();
final Suggestion suggestion2V2 = new Suggestion.Builder("id2")
.setTitle("Test suggestion 2")
.build();
suggestion1.title = "Test Suggestion 1";
suggestion1.icon = mock(Icon.class);
suggestion2.title = "Test Suggestion 2";
suggestion2.icon = mock(Icon.class);
mOneSuggestion = new ArrayList<>();
mOneSuggestion.add(mSuggestion1);
mOneSuggestion.add(suggestion1);
mTwoSuggestions = new ArrayList<>();
mTwoSuggestions.add(mSuggestion1);
mTwoSuggestions.add(mSuggestion2);
mTwoSuggestions.add(suggestion1);
mTwoSuggestions.add(suggestion2);
mOneSuggestionV2 = new ArrayList<>();
mOneSuggestionV2.add(suggestion1V2);
mTwoSuggestionsV2 = new ArrayList<>();
mTwoSuggestionsV2.add(suggestion1V2);
mTwoSuggestionsV2.add(suggestion2V2);
}
@Test
public void getItemCount_shouldReturnListSize() {
mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion,
null /* suggestionV2 */, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
mSuggestionAdapter = new SuggestionAdapter(mContext, mTwoSuggestions, new ArrayList<>());
mSuggestionAdapter = new SuggestionAdapter(mContext, mTwoSuggestions,
null /* suggestionV2 */, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
}
@Test
public void getItemCount_v2_shouldReturnListSize() {
mSuggestionAdapter = new SuggestionAdapter(mContext, null /* suggestions */,
mOneSuggestionV2, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(1);
mSuggestionAdapter = new SuggestionAdapter(mContext, null /* suggestions */,
mTwoSuggestionsV2, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemCount()).isEqualTo(2);
}
@Test
public void getItemViewType_shouldReturnSuggestionTile() {
mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion,
null /* suggestionV2 */, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemViewType(0))
.isEqualTo(R.layout.suggestion_tile);
.isEqualTo(R.layout.suggestion_tile);
}
@Test
public void getItemViewType_v2_shouldReturnSuggestionTile() {
mSuggestionAdapter = new SuggestionAdapter(mContext, null /* suggestions */,
mOneSuggestionV2, new ArrayList<>());
assertThat(mSuggestionAdapter.getItemViewType(0))
.isEqualTo(R.layout.suggestion_tile);
}
@Test
public void onBindViewHolder_shouldSetListener() {
final View view = spy(LayoutInflater.from(mContext).inflate(
R.layout.suggestion_tile, new LinearLayout(mContext), true));
R.layout.suggestion_tile, new LinearLayout(mContext), true));
mSuggestionHolder = new DashboardAdapter.DashboardItemHolder(view);
mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion, new ArrayList<>());
mSuggestionAdapter = new SuggestionAdapter(mContext, mOneSuggestion,
null /* suggestionV2 */, new ArrayList<>());
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
@@ -127,7 +163,7 @@ public class SuggestionAdapterTest {
TextView textView = new TextView(RuntimeEnvironment.application);
doReturn(textView).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
packages.get(0).remoteViews = remoteViews;
setupSuggestions(mActivity, packages);
setupSuggestions(mActivity, packages, null);
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
@@ -150,7 +186,7 @@ public class SuggestionAdapterTest {
layout.addView(primary);
doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
packages.get(0).remoteViews = remoteViews;
setupSuggestions(mActivity, packages);
setupSuggestions(mActivity, packages, null /* suggestionV2 */);
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
mSuggestionHolder.itemView.performClick();
@@ -163,6 +199,18 @@ public class SuggestionAdapterTest {
verify(mActivity).startSuggestion(any(Intent.class));
}
@Test
public void onBindViewHolder_v2_itemViewShouldHandleClick()
throws PendingIntent.CanceledException {
final List<Suggestion> packages = makeSuggestionsV2("pkg1");
setupSuggestions(mActivity, null /* suggestionV1 */ , packages);
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
mSuggestionHolder.itemView.performClick();
verify(packages.get(0).getPendingIntent()).send();
}
@Test
public void onBindViewHolder_viewsShouldClearOnRebind() {
Context context =
@@ -176,7 +224,7 @@ public class SuggestionAdapterTest {
layout.addView(primary);
doReturn(layout).when(remoteViews).apply(any(Context.class), any(ViewGroup.class));
packages.get(0).remoteViews = remoteViews;
setupSuggestions(mActivity, packages);
setupSuggestions(mActivity, packages, null /* suggestionV2 */);
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
mSuggestionAdapter.onBindViewHolder(mSuggestionHolder, 0);
@@ -185,8 +233,10 @@ public class SuggestionAdapterTest {
assertThat(itemView.getChildCount()).isEqualTo(1);
}
private void setupSuggestions(Context context, List<Tile> suggestions) {
mSuggestionAdapter = new SuggestionAdapter(context, suggestions, new ArrayList<>());
private void setupSuggestions(Context context, List<Tile> suggestions,
List<Suggestion> suggestionsV2) {
mSuggestionAdapter = new SuggestionAdapter(context, suggestions, suggestionsV2,
new ArrayList<>());
mSuggestionHolder = mSuggestionAdapter.onCreateViewHolder(
new FrameLayout(RuntimeEnvironment.application),
mSuggestionAdapter.getItemViewType(0));
@@ -204,4 +254,14 @@ public class SuggestionAdapterTest {
return suggestions;
}
private List<Suggestion> makeSuggestionsV2(String... pkgNames) {
final List<Suggestion> suggestions = new ArrayList<>();
for (String pkgName : pkgNames) {
final Suggestion suggestion = new Suggestion.Builder(pkgName)
.setPendingIntent(mock(PendingIntent.class))
.build();
suggestions.add(suggestion);
}
return suggestions;
}
}

38
tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionControllerMixinTest.java
View File

@@ -17,14 +17,15 @@
package com.android.settings.dashboard.suggestions;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import android.app.LoaderManager;
import android.content.Context;
import android.util.FeatureFlagUtils;
import com.android.settings.TestConfig;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.After;
@@ -38,13 +39,14 @@ import org.robolectric.annotation.Config;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
shadows = {
SettingsShadowSystemProperties.class,
ShadowSuggestionController.class
})
public class SuggestionControllerMixinTest {
@Mock
private Context mContext;
@Mock
private SuggestionControllerMixin.SuggestionControllerHost mHost;
private Lifecycle mLifecycle;
private SuggestionControllerMixin mMixin;
@@ -53,33 +55,16 @@ public class SuggestionControllerMixinTest {
MockitoAnnotations.initMocks(this);
mLifecycle = new Lifecycle();
when(mContext.getApplicationContext()).thenReturn(mContext);
SettingsShadowSystemProperties.set(
FeatureFlagUtils.FFLAG_PREFIX + SuggestionControllerMixin.FEATURE_FLAG, "true");
}
@After
public void tearDown() {
ShadowSuggestionController.reset();
SettingsShadowSystemProperties.clear();
}
@Test
public void systemPropertySet_verifyIsEnabled() {
SettingsShadowSystemProperties.set(
FeatureFlagUtils.FFLAG_PREFIX + SuggestionControllerMixin.FEATURE_FLAG, "true");
assertThat(SuggestionControllerMixin.isEnabled()).isTrue();
}
@Test
public void systemPropertyNotSet_verifyIsDisabled() {
SettingsShadowSystemProperties.set(
FeatureFlagUtils.FFLAG_PREFIX + SuggestionControllerMixin.FEATURE_FLAG, "false");
assertThat(SuggestionControllerMixin.isEnabled()).isFalse();
}
@Test
public void goThroughLifecycle_onStartStop_shouldStartStopService() {
mMixin = new SuggestionControllerMixin(mContext, mLifecycle);
public void goThroughLifecycle_onStartStop_shouldStartStopController() {
mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
mLifecycle.onStart();
assertThat(ShadowSuggestionController.sStartCalled).isTrue();
@@ -90,10 +75,13 @@ public class SuggestionControllerMixinTest {
@Test
public void onServiceConnected_shouldGetSuggestion() {
mMixin = new SuggestionControllerMixin(mContext, mLifecycle);
final LoaderManager loaderManager = mock(LoaderManager.class);
when(mHost.getLoaderManager()).thenReturn(loaderManager);
mMixin = new SuggestionControllerMixin(mContext, mHost, mLifecycle);
mMixin.onServiceConnected();
assertThat(ShadowSuggestionController.sGetSuggestionCalled).isTrue();
verify(loaderManager).restartLoader(SuggestionLoader.LOADER_ID_SUGGESTIONS,
null /* args */, mMixin /* callback */);
}
}

30
tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImplTest.java
View File

@@ -35,6 +35,7 @@ import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.hardware.fingerprint.FingerprintManager;
import android.provider.Settings.Secure;
import android.util.FeatureFlagUtils;
import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -54,10 +55,12 @@ import com.android.settings.gestures.SwipeToNotificationSettings;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.SettingsShadowResources;
import com.android.settings.testutils.shadow.SettingsShadowSystemProperties;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.suggestions.SuggestionParser;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -76,7 +79,10 @@ import java.util.List;
@Config(
manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
shadows = {ShadowSecureSettings.class, SettingsShadowResources.class}
shadows = {ShadowSecureSettings.class,
SettingsShadowResources.class,
SettingsShadowSystemProperties.class
}
)
public class SuggestionFeatureProviderImplTest {
@@ -122,6 +128,11 @@ public class SuggestionFeatureProviderImplTest {
mProvider = new SuggestionFeatureProviderImpl(mContext);
}
@After
public void tearDown() {
SettingsShadowSystemProperties.clear();
}
@Test
public void isSuggestionCompleted_doubleTapPower_trueWhenNotAvailable() {
SettingsShadowResources.overrideResource(
@@ -288,6 +299,23 @@ public class SuggestionFeatureProviderImplTest {
assertThat(mProvider.isSuggestionEnabled(mContext)).isTrue();
}
@Test
public void isSuggestionV2Enabled_isNotLowMemoryDevice_sysPropOn_shouldReturnTrue() {
when(mActivityManager.isLowRamDevice()).thenReturn(false);
SettingsShadowSystemProperties.set(
FeatureFlagUtils.FFLAG_PREFIX + mProvider.FEATURE_FLAG_SUGGESTIONS_V2, "true");
assertThat(mProvider.isSuggestionV2Enabled(mContext)).isTrue();
}
@Test
public void isSuggestionV2Enabled_isNotLowMemoryDevice_sysPropOff_shouldReturnTrue() {
when(mActivityManager.isLowRamDevice()).thenReturn(false);
SettingsShadowSystemProperties.set(
FeatureFlagUtils.FFLAG_PREFIX + mProvider.FEATURE_FLAG_SUGGESTIONS_V2, "false");
assertThat(mProvider.isSuggestionV2Enabled(mContext)).isFalse();
}
@Test
public void dismissSuggestion_noParserOrSuggestion_noop() {
mProvider.dismissSuggestion(mContext, null, null);