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

Remove subtitles for the homepage IA

Browse Source 
Remove the summary of the homepage IA if silky home enabled.

Fixes: 170933968
Test: robotest & visual with turning on/off silky home
Change-Id: I502b6590cece9b80e9923109fe0582cc4d9a1c56
This commit is contained in:
Yanting Yang
2020-10-15 16:46:20 +08:00
parent 886fe1e6ab
commit 9aa4a5463f
21 changed files with 260 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java
View File

@@ -55,6 +55,7 @@ import android.graphics.drawable.Icon;
import android.os.Bundle;
import android.os.UserHandle;
import android.os.UserManager;
import android.util.FeatureFlagUtils;
import android.util.Pair;
import androidx.fragment.app.FragmentActivity;
@@ -65,6 +66,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowTileUtils;
import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -75,6 +77,7 @@ import com.android.settingslib.drawer.ProviderTile;
import com.android.settingslib.drawer.Tile;
import com.android.settingslib.drawer.TileUtils;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -146,6 +149,13 @@ public class DashboardFeatureProviderImplTest {
mImpl = new DashboardFeatureProviderImpl(mContext);
}
@After
public void tearDown() {
if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
}
@Test
public void shouldHoldAppContext() {
assertThat(mImpl.mContext).isEqualTo(mContext.getApplicationContext());
@@ -670,4 +680,31 @@ public class DashboardFeatureProviderImplTest {
assertThat(argument.getValue().getIdentifier()).isEqualTo(0);
verify(mActivity, never()).getSupportFragmentManager();
}
@Test
public void bindPreference_silkyHomeEnabled_shouldNotBindHomepageTileSummary() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_HOMEPAGE);
mImpl.bindPreferenceToTileAndGetObservers(mActivity, mForceRoundedIcon,
MetricsEvent.VIEW_UNKNOWN, preference, tile, null /*key */,
Preference.DEFAULT_ORDER);
assertThat(preference.getSummary()).isNull();
}
@Test
public void bindPreference_silkyHomeEnabled_shouldBindSubpageTileSummary() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
final Preference preference = new Preference(RuntimeEnvironment.application);
final Tile tile = new ActivityTile(mActivityInfo, CategoryKey.CATEGORY_SYSTEM);
mImpl.bindPreferenceToTileAndGetObservers(mActivity, mForceRoundedIcon,
MetricsEvent.VIEW_UNKNOWN, preference, tile, null /*key */,
Preference.DEFAULT_ORDER);
assertThat(preference.getSummary()).isEqualTo(
mContext.getText(R.string.about_settings_summary));
}
}