diff --git a/res/layout/homepage_preference.xml b/res/layout/homepage_preference.xml index c08a74f2418..480340a04dc 100644 --- a/res/layout/homepage_preference.xml +++ b/res/layout/homepage_preference.xml @@ -61,5 +61,15 @@ android:singleLine="true" android:textAppearance="@style/TextAppearance.HomepagePreferenceTitle" android:ellipsize="marquee"/> + + \ No newline at end of file diff --git a/res/xml/top_level_settings_grouped.xml b/res/xml/top_level_settings_grouped.xml index df935d03b28..2b29940d803 100644 --- a/res/xml/top_level_settings_grouped.xml +++ b/res/xml/top_level_settings_grouped.xml @@ -26,6 +26,7 @@ android:key="top_level_network" android:order="-150" android:title="@string/network_dashboard_title" + android:summary="@string/summary_placeholder" settings:controller="com.android.settings.network.TopLevelNetworkEntryPreferenceController"/> + android:title="@string/apps_dashboard_title" + android:summary="@string/app_and_notification_dashboard_summary"/> + android:title="@string/configure_notification_settings" + android:summary="@string/notification_dashboard_summary"/> + android:title="@string/sound_settings" + android:summary="@string/sound_dashboard_summary"/> + android:title="@string/privacy_dashboard_title" + android:summary="@string/privacy_dashboard_summary"/> @@ -132,6 +146,7 @@ android:key="top_level_accounts" android:order="-10" android:title="@string/account_dashboard_title" + android:summary="@string/summary_placeholder" settings:controller="com.android.settings.accounts.TopLevelAccountEntryPreferenceController"/> + android:title="@string/header_category_system" + android:summary="@string/system_dashboard_summary"/> diff --git a/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java b/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java index 174ef0f7a92..152bb6733b1 100644 --- a/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java +++ b/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceController.java @@ -17,11 +17,9 @@ package com.android.settings.accounts; import android.content.Context; -import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; public class TopLevelAccountEntryPreferenceController extends BasePreferenceController { public TopLevelAccountEntryPreferenceController(Context context, String preferenceKey) { @@ -35,10 +33,6 @@ public class TopLevelAccountEntryPreferenceController extends BasePreferenceCont @Override public CharSequence getSummary() { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return null; - } return mContext.getString(R.string.account_dashboard_default_summary); } } diff --git a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java index fac3201e284..fd36bca6338 100644 --- a/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java +++ b/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceController.java @@ -17,11 +17,9 @@ package com.android.settings.connecteddevice; import android.content.Context; -import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; public class TopLevelConnectedDevicesPreferenceController extends BasePreferenceController { @@ -38,11 +36,6 @@ public class TopLevelConnectedDevicesPreferenceController extends BasePreference @Override public CharSequence getSummary() { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return null; - } - return mContext.getText( AdvancedConnectedDeviceController.getConnectedDevicesSummaryResourceId(mContext)); } diff --git a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java index 92f078ec88a..254a6a7646a 100644 --- a/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java +++ b/src/com/android/settings/dashboard/DashboardFeatureProviderImpl.java @@ -261,12 +261,6 @@ public class DashboardFeatureProviderImpl implements DashboardFeatureProvider { } private DynamicDataObserver bindSummaryAndGetObserver(Preference preference, Tile tile) { - // Skip binding homepage tile summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME) - && TextUtils.equals(tile.getCategory(), CategoryKey.CATEGORY_HOMEPAGE)) { - return null; - } - final CharSequence summary = tile.getSummary(mContext); if (summary != null) { preference.setSummary(summary); diff --git a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java index 89d349f44f4..61e5c8474c2 100644 --- a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java +++ b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java @@ -19,14 +19,12 @@ package com.android.settings.deviceinfo; import android.content.Context; import android.os.storage.StorageManager; import android.text.format.Formatter; -import android.util.FeatureFlagUtils; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; import com.android.settingslib.deviceinfo.PrivateStorageInfo; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; import com.android.settingslib.utils.ThreadUtils; @@ -52,11 +50,6 @@ public class TopLevelStoragePreferenceController extends BasePreferenceControlle @Override protected void refreshSummary(Preference preference) { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return; - } - if (preference == null) { return; } diff --git a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java index 3bda7b9c983..83efcc4028f 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java +++ b/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceController.java @@ -17,10 +17,8 @@ package com.android.settings.deviceinfo.aboutphone; import android.content.Context; -import android.util.FeatureFlagUtils; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; import com.android.settings.deviceinfo.DeviceNamePreferenceController; public class TopLevelAboutDevicePreferenceController extends BasePreferenceController { @@ -36,11 +34,6 @@ public class TopLevelAboutDevicePreferenceController extends BasePreferenceContr @Override public CharSequence getSummary() { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return null; - } - final DeviceNamePreferenceController deviceNamePreferenceController = new DeviceNamePreferenceController(mContext, "unused_key"); return deviceNamePreferenceController.getSummary(); diff --git a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java index cd2dd1307a7..73aafe53453 100644 --- a/src/com/android/settings/display/TopLevelDisplayPreferenceController.java +++ b/src/com/android/settings/display/TopLevelDisplayPreferenceController.java @@ -17,11 +17,9 @@ package com.android.settings.display; import android.content.Context; -import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; public class TopLevelDisplayPreferenceController extends BasePreferenceController { @@ -38,11 +36,6 @@ public class TopLevelDisplayPreferenceController extends BasePreferenceControlle @Override public CharSequence getSummary() { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return null; - } - final WallpaperPreferenceController controller = new WallpaperPreferenceController(mContext, "unused_key"); if (controller.isAvailable()) { diff --git a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java index 1912c2fb1e5..99eb05d8116 100644 --- a/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java +++ b/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceController.java @@ -17,7 +17,6 @@ package com.android.settings.fuelgauge; import android.content.Context; -import android.util.FeatureFlagUtils; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -25,7 +24,6 @@ import androidx.preference.PreferenceScreen; import com.android.settings.R; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; import com.android.settings.overlay.FeatureFactory; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; @@ -87,10 +85,6 @@ public class TopLevelBatteryPreferenceController extends BasePreferenceControlle } private CharSequence getSummary(boolean batteryStatusUpdate) { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return null; - } // Display help message if battery is not present. if (!mIsBatteryPresent) { return mContext.getText(R.string.battery_missing_message); diff --git a/src/com/android/settings/location/TopLevelLocationPreferenceController.java b/src/com/android/settings/location/TopLevelLocationPreferenceController.java index fe85c7f42b2..ec58a3422d2 100644 --- a/src/com/android/settings/location/TopLevelLocationPreferenceController.java +++ b/src/com/android/settings/location/TopLevelLocationPreferenceController.java @@ -11,7 +11,6 @@ import android.location.LocationManager; import android.os.UserHandle; import android.os.UserManager; import android.permission.PermissionControllerManager; -import android.util.FeatureFlagUtils; import androidx.annotation.VisibleForTesting; import androidx.preference.Preference; @@ -19,7 +18,6 @@ import androidx.preference.Preference; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; import com.android.settingslib.core.lifecycle.LifecycleObserver; import com.android.settingslib.core.lifecycle.events.OnStart; import com.android.settingslib.core.lifecycle.events.OnStop; @@ -52,11 +50,6 @@ public class TopLevelLocationPreferenceController extends BasePreferenceControll @Override public CharSequence getSummary() { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return null; - } - if (mLocationManager.isLocationEnabled()) { if (mNumTotal == -1) { return mContext.getString(R.string.location_settings_loading_app_permission_stats); diff --git a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java index fe2392b705d..c630cc78507 100644 --- a/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java +++ b/src/com/android/settings/network/TopLevelNetworkEntryPreferenceController.java @@ -20,12 +20,10 @@ import android.content.Context; import android.icu.text.ListFormatter; import android.text.BidiFormatter; import android.text.TextUtils; -import android.util.FeatureFlagUtils; import com.android.settings.R; import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; import com.android.settings.wifi.WifiPrimarySwitchPreferenceController; import java.util.ArrayList; @@ -53,11 +51,6 @@ public class TopLevelNetworkEntryPreferenceController extends BasePreferenceCont @Override public CharSequence getSummary() { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return null; - } - final String wifiSummary = BidiFormatter.getInstance() .unicodeWrap(mContext.getString(R.string.wifi_settings_title)); final String mobileSummary = mContext.getString( diff --git a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java index 349a91d36b0..8fab3c9dbd1 100644 --- a/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java +++ b/src/com/android/settings/security/TopLevelSecurityEntryPreferenceController.java @@ -17,17 +17,11 @@ package com.android.settings.security; import android.content.Context; -import android.hardware.face.FaceManager; -import android.hardware.fingerprint.FingerprintManager; import android.text.TextUtils; -import android.util.FeatureFlagUtils; import androidx.preference.Preference; -import com.android.settings.R; -import com.android.settings.Utils; import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; import com.android.settings.core.SubSettingLauncher; import com.android.settings.overlay.FeatureFactory; @@ -42,26 +36,6 @@ public class TopLevelSecurityEntryPreferenceController extends BasePreferenceCon return AVAILABLE; } - @Override - public CharSequence getSummary() { - // Remove homepage summaries for silky home. - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.SILKY_HOME)) { - return null; - } - - final FingerprintManager fpm = - Utils.getFingerprintManagerOrNull(mContext); - final FaceManager faceManager = - Utils.getFaceManagerOrNull(mContext); - if (faceManager != null && faceManager.isHardwareDetected()) { - return mContext.getText(R.string.security_dashboard_summary_face); - } else if (fpm != null && fpm.isHardwareDetected()) { - return mContext.getText(R.string.security_dashboard_summary); - } else { - return mContext.getText(R.string.security_dashboard_summary_no_fingerprint); - } - } - @Override public boolean handlePreferenceTreeClick(Preference preference) { if (!TextUtils.equals(preference.getKey(), getPreferenceKey())) { diff --git a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java index 1d63cd11295..937e38d668b 100644 --- a/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/accounts/TopLevelAccountEntryPreferenceControllerTest.java @@ -19,10 +19,8 @@ package com.android.settings.accounts; import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.util.FeatureFlagUtils; import com.android.settings.R; -import com.android.settings.core.FeatureFlags; import org.junit.Before; import org.junit.Test; @@ -40,7 +38,6 @@ public class TopLevelAccountEntryPreferenceControllerTest { public void setUp() { mContext = RuntimeEnvironment.application; mController = new TopLevelAccountEntryPreferenceController(mContext, "test_key"); - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); } @Test @@ -48,11 +45,4 @@ public class TopLevelAccountEntryPreferenceControllerTest { assertThat(mController.getSummary()).isEqualTo( mContext.getText(R.string.account_dashboard_default_summary)); } - - @Test - public void getSummary_silkyHomeEnabled_shouldBeNull() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - - assertThat(mController.getSummary()).isNull(); - } } diff --git a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java index b1f9ed17719..14fe4bd19e6 100644 --- a/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/connecteddevice/TopLevelConnectedDevicesPreferenceControllerTest.java @@ -22,10 +22,8 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.util.FeatureFlagUtils; import com.android.settings.R; -import com.android.settings.core.FeatureFlags; import org.junit.Before; import org.junit.Test; @@ -46,7 +44,6 @@ public class TopLevelConnectedDevicesPreferenceControllerTest { public void setUp() { mContext = RuntimeEnvironment.application; mController = new TopLevelConnectedDevicesPreferenceController(mContext, "test_key"); - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); } @Test @@ -67,13 +64,6 @@ public class TopLevelConnectedDevicesPreferenceControllerTest { .isEqualTo(mContext.getText(R.string.settings_label_launcher)); } - @Test - public void getSummary_silkyHomeEnabled_shouldBeNull() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - - assertThat(mController.getSummary()).isNull(); - } - @Implements(AdvancedConnectedDeviceController.class) private static class ShadowAdvancedConnectedDeviceController { diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java index fa1aaa8942e..1fba12ba979 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFeatureProviderImplTest.java @@ -673,33 +673,6 @@ public class DashboardFeatureProviderImplTest { 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)); - } - @Test @Config(qualifiers = "mcc999") public void bindPreference_specificHomepageTile_shouldOverridePosition() { diff --git a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java index d20beabf3a5..988a94b6650 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/aboutphone/TopLevelAboutDevicePreferenceControllerTest.java @@ -23,9 +23,6 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.os.Build; import android.provider.Settings.Global; -import android.util.FeatureFlagUtils; - -import com.android.settings.core.FeatureFlags; import org.junit.Before; import org.junit.Test; @@ -43,7 +40,6 @@ public class TopLevelAboutDevicePreferenceControllerTest { public void setUp() { mContext = RuntimeEnvironment.application; mController = new TopLevelAboutDevicePreferenceController(mContext, "test_key"); - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); } @Test @@ -61,12 +57,4 @@ public class TopLevelAboutDevicePreferenceControllerTest { Global.putString(mContext.getContentResolver(), Global.DEVICE_NAME, "Test"); assertThat(mController.getSummary().toString()).isEqualTo("Test"); } - - @Test - public void getSummary_silkyHomeEnabled_shouldBeNull() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - Global.putString(mContext.getContentResolver(), Global.DEVICE_NAME, "Test"); - - assertThat(mController.getSummary()).isNull(); - } } diff --git a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java index 864d2b925fd..d16a6d29559 100644 --- a/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/TopLevelDisplayPreferenceControllerTest.java @@ -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(); - } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java index f2677ce8fd8..1a3c98f8ba1 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java @@ -22,10 +22,8 @@ import static com.android.settings.core.BasePreferenceController.UNSUPPORTED_ON_ import static com.google.common.truth.Truth.assertThat; import android.content.Context; -import android.util.FeatureFlagUtils; import com.android.settings.R; -import com.android.settings.core.FeatureFlags; import org.junit.Before; import org.junit.Test; @@ -43,7 +41,6 @@ public class TopLevelBatteryPreferenceControllerTest { public void setUp() { mContext = RuntimeEnvironment.application; mController = new TopLevelBatteryPreferenceController(mContext, "test_key"); - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); } @Test @@ -73,16 +70,8 @@ public class TopLevelBatteryPreferenceControllerTest { assertThat(mController.getDashboardLabel(mContext, info, true)).isEqualTo("5% - charging"); } - @Test - public void getSummary_silkyHomeEnabled_shouldBeNull() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - - assertThat(mController.getSummary()).isNull(); - } - @Test public void getSummary_batteryNotPresent_shouldShowWarningMessage() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); mController.mIsBatteryPresent = false; assertThat(mController.getSummary()) diff --git a/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java index f5bc9619acd..68e7f88ddf5 100644 --- a/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/location/TopLevelLocationPreferenceControllerTest.java @@ -20,10 +20,8 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.location.LocationManager; -import android.util.FeatureFlagUtils; import com.android.settings.R; -import com.android.settings.core.FeatureFlags; import org.junit.Before; import org.junit.Test; @@ -43,7 +41,6 @@ public class TopLevelLocationPreferenceControllerTest { mContext = RuntimeEnvironment.application; mController = new TopLevelLocationPreferenceController(mContext, PREFERENCE_KEY); mLocationManager = (LocationManager) mContext.getSystemService(Context.LOCATION_SERVICE); - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); } @Test @@ -86,11 +83,4 @@ public class TopLevelLocationPreferenceControllerTest { R.plurals.location_settings_summary_location_on, LOCATION_APP_COUNT, LOCATION_APP_COUNT)); } - - @Test - public void getSummary_silkyHomeEnabled_shouldBeNull() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - - assertThat(mController.getSummary()).isNull(); - } } \ No newline at end of file diff --git a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java index fc01c6872ba..a3f0c90c1a2 100644 --- a/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/network/TopLevelNetworkEntryPreferenceControllerTest.java @@ -24,9 +24,7 @@ import static org.mockito.Mockito.when; import android.content.Context; import android.os.UserManager; -import android.util.FeatureFlagUtils; -import com.android.settings.core.FeatureFlags; import com.android.settings.testutils.shadow.ShadowRestrictedLockUtilsInternal; import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.wifi.WifiPrimarySwitchPreferenceController; @@ -74,7 +72,6 @@ public class TopLevelNetworkEntryPreferenceControllerTest { mMobileNetworkPreferenceController); ReflectionHelpers.setField(mController, "mTetherPreferenceController", mTetherPreferenceController); - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); } @After @@ -106,11 +103,4 @@ public class TopLevelNetworkEntryPreferenceControllerTest { assertThat(mController.getSummary()).isEqualTo("Wi\u2011Fi and data usage"); } - - @Test - public void getSummary_silkyHomeEnabled_shouldBeNull() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - - assertThat(mController.getSummary()).isNull(); - } } diff --git a/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java deleted file mode 100644 index 05abc40b312..00000000000 --- a/tests/robotests/src/com/android/settings/security/TopLevelSecurityEntryPreferenceControllerTest.java +++ /dev/null @@ -1,143 +0,0 @@ -/* - * Copyright (C) 2017 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.android.settings.security; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.content.pm.PackageManager; -import android.hardware.face.FaceManager; -import android.hardware.fingerprint.FingerprintManager; -import android.util.FeatureFlagUtils; - -import com.android.settings.R; -import com.android.settings.core.FeatureFlags; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Answers; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.robolectric.RobolectricTestRunner; - -@RunWith(RobolectricTestRunner.class) -public class TopLevelSecurityEntryPreferenceControllerTest { - - @Mock(answer = Answers.RETURNS_DEEP_STUBS) - private Context mContext; - @Mock - private FingerprintManager mFingerprintManager; - @Mock - private FaceManager mFaceManager; - private TopLevelSecurityEntryPreferenceController mController; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - when(mContext.getSystemService(Context.FINGERPRINT_SERVICE)) - .thenReturn(mFingerprintManager); - when(mContext.getSystemService(Context.FACE_SERVICE)) - .thenReturn(mFaceManager); - mController = new TopLevelSecurityEntryPreferenceController(mContext, "test_key"); - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); - } - - @Test - public void geSummary_hasFace_hasStaticSummary() { - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) - .thenReturn(true); - when(mFaceManager.isHardwareDetected()).thenReturn(true); - - mController.getSummary(); - - verify(mContext).getText(R.string.security_dashboard_summary_face); - } - - @Test - public void geSummary_hasFingerPrint_hasStaticSummary() { - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) - .thenReturn(false); - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) - .thenReturn(true); - when(mFingerprintManager.isHardwareDetected()).thenReturn(true); - - mController.getSummary(); - - verify(mContext).getText(R.string.security_dashboard_summary); - } - - @Test - public void geSummary_noFpFeature_shouldSetSummaryWithNoBiometrics() { - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) - .thenReturn(false); - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) - .thenReturn(false); - - mController.getSummary(); - - verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint); - } - - @Test - public void geSummary_noFpHardware_shouldSetSummaryWithNoBiometrics() { - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) - .thenReturn(false); - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) - .thenReturn(true); - when(mFingerprintManager.isHardwareDetected()).thenReturn(false); - - mController.getSummary(); - - verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint); - } - - @Test - public void geSummary_noFaceFeature_shouldSetSummaryWithNoBiometrics() { - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) - .thenReturn(false); - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) - .thenReturn(false); - - mController.getSummary(); - - verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint); - } - - @Test - public void geSummary_noFaceHardware_shouldSetSummaryWithNoBiometrics() { - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FACE)) - .thenReturn(true); - when(mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_FINGERPRINT)) - .thenReturn(false); - when(mFaceManager.isHardwareDetected()).thenReturn(false); - - mController.getSummary(); - - verify(mContext).getText(R.string.security_dashboard_summary_no_fingerprint); - } - - @Test - public void getSummary_silkyHomeEnabled_shouldBeNull() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - - assertThat(mController.getSummary()).isNull(); - } -} diff --git a/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java index d4157b85d47..6318c9c6914 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java @@ -30,13 +30,11 @@ import android.content.Context; import android.icu.text.NumberFormat; import android.os.storage.VolumeInfo; import android.text.format.Formatter; -import android.util.FeatureFlagUtils; import androidx.preference.Preference; import androidx.test.core.app.ApplicationProvider; import androidx.test.ext.junit.runners.AndroidJUnit4; -import com.android.settings.core.FeatureFlags; import com.android.settings.testutils.ResourcesUtils; import com.android.settingslib.deviceinfo.StorageManagerVolumeProvider; @@ -72,7 +70,6 @@ public class TopLevelStoragePreferenceControllerTest { when(mStorageManagerVolumeProvider.getVolumes()).thenReturn(mVolumes); mController = spy(new TopLevelStoragePreferenceController(mContext, "test_key")); - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false); } @Test @@ -108,11 +105,4 @@ public class TopLevelStoragePreferenceControllerTest { assertThat(preference.getSummary()).isEqualTo(ResourcesUtils.getResourcesString( mContext, "storage_summary", percentage, freeSpace)); } - - @Test - public void refreshSummary_silkyHomeEnabled_shouldBeNull() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, true); - - assertThat(mController.getSummary()).isNull(); - } }