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

Merge "Remove silky flag from homepage for official release" into sc-dev am: 89cd044bd7

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/14502202

Change-Id: Ic18f30f5f10d2e75d3f9aab119666ecc82091383
This commit is contained in:
Yanting Yang
2021-05-14 18:34:37 +00:00
committed by Automerger Merge Worker
parent 65b5d9706e 89cd044bd7
commit 802af0f016
6 changed files with 101 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/robotests/src/com/android/settings/homepage/TopLevelSettingsTest.java
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);