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

Merge "Enable suggestion v2 experiment"

Browse Source
This commit is contained in:
TreeHugger Robot
2017-10-31 02:55:03 +00:00
committed by Android (Google) Code Review
parent 33ad251a38 f9e985d018
commit 9fb5426315
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java
View File

@@ -92,7 +92,7 @@ public class SuggestionFeatureProviderImpl implements SuggestionFeatureProvider
} }
private static boolean isV2Enabled() { private static boolean isV2Enabled() {
return FeatureFlagUtils.isEnabled(FEATURE_FLAG_SUGGESTIONS_V2); return FeatureFlagUtils.isEnabled(FEATURE_FLAG_SUGGESTIONS_V2) || true;
} }
@Override @Override

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

@@ -132,13 +132,6 @@ public class SuggestionFeatureProviderImplTest {
assertThat(mProvider.isSuggestionEnabled(mContext)).isFalse(); assertThat(mProvider.isSuggestionEnabled(mContext)).isFalse();
} }
@Test
public void isSuggestionEnabled_isNotLowMemoryDevice_shouldReturnTrue() {
when(mActivityManager.isLowRamDevice()).thenReturn(false);
assertThat(mProvider.isSuggestionEnabled(mContext)).isTrue();
}
@Test @Test
public void isSuggestionV2Enabled_isNotLowMemoryDevice_sysPropOn_shouldReturnTrue() { public void isSuggestionV2Enabled_isNotLowMemoryDevice_sysPropOn_shouldReturnTrue() {
when(mActivityManager.isLowRamDevice()).thenReturn(false); when(mActivityManager.isLowRamDevice()).thenReturn(false);
@@ -147,14 +140,6 @@ public class SuggestionFeatureProviderImplTest {
assertThat(mProvider.isSuggestionV2Enabled(mContext)).isTrue(); 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 @Test
public void dismissSuggestion_noParserOrSuggestion_noop() { public void dismissSuggestion_noParserOrSuggestion_noop() {
mProvider.dismissSuggestion(mContext, null, (Tile) null); mProvider.dismissSuggestion(mContext, null, (Tile) null);