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

Merge "Add summary back to the homepage" into sc-dev

Browse Source
This commit is contained in:
Yanting Yang
2021-05-07 09:00:32 +00:00
committed by Android (Google) Code Review
parent 7dd05a8c05 d1312e8e6e
commit c37abc9edb
22 changed files with 33 additions and 344 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java
View File

@@ -31,10 +31,8 @@ import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
import android.util.FeatureFlagUtils;
import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import org.junit.Before;
import org.junit.Test;
@@ -65,7 +63,6 @@ public class TopLevelDisplayPreferenceControllerTest {
when(mContext.getString(R.string.config_wallpaper_picker_class)).thenReturn("cls");
mController = new TopLevelDisplayPreferenceController(mContext, "test_key");
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
}
@Test
@@ -112,11 +109,4 @@ public class TopLevelDisplayPreferenceControllerTest {
assertThat(mController.getSummary())
.isEqualTo(mContext.getText(R.string.display_dashboard_nowallpaper_summary));
}
@Test
public void getSummary_silkyHomeEnabled_shouldBeNull() {
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true);
assertThat(mController.getSummary()).isNull();
}
}