Merge "Remove silky flag from homepage for official release" into sc-dev

This commit is contained in:
Yanting Yang
2021-05-14 18:13:29 +00:00
committed by Android (Google) Code Review
6 changed files with 101 additions and 305 deletions

View File

@@ -28,13 +28,11 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.util.FeatureFlagUtils;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.Before;
@@ -65,19 +63,6 @@ public class TopLevelSettingsTest {
assertThat(mSettings.shouldForceRoundedIcon()).isTrue();
}
@Test
public void getPreferenceScreenResId_silkyHomeDisabled_defaultSettings() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(R.xml.top_level_settings);
}
@Test
public void getPreferenceScreenResId_silkyHomeEnabled_groupedSettings() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
assertThat(mSettings.getPreferenceScreenResId()).isEqualTo(
R.xml.top_level_settings_grouped);
}
@Test
public void onCreatePreferences_shouldTintPreferenceIcon() {
final Preference preference = new Preference(mContext);