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

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

Browse Source
This commit is contained in:
TreeHugger Robot
2021-05-27 02:18:23 +00:00
committed by Android (Google) Code Review
parent 2c8745b58d 098a17ccb2
commit a8e4d51c24
3 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tests/robotests/src/com/android/settings/backup/BackupSettingsHelperTest.java
View File

@@ -35,10 +35,8 @@ import android.content.res.Resources;
import android.os.IBinder; import android.os.IBinder;
import android.os.RemoteException; import android.os.RemoteException;
import android.os.UserHandle; import android.os.UserHandle;
import android.util.FeatureFlagUtils;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
@@ -83,7 +81,6 @@ public class BackupSettingsHelperTest {
when(mBackupManager.getCurrentTransport()).thenReturn("test_transport"); when(mBackupManager.getCurrentTransport()).thenReturn("test_transport");
mBackupSettingsHelper = new BackupSettingsHelper(mContext); mBackupSettingsHelper = new BackupSettingsHelper(mContext);
mUserManager = Shadow.extract(mContext.getSystemService(Context.USER_SERVICE)); mUserManager = Shadow.extract(mContext.getSystemService(Context.USER_SERVICE));
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
} }
@Test @Test

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

@@ -55,7 +55,6 @@ import android.graphics.drawable.Icon;
import android.os.Bundle; import android.os.Bundle;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.UserManager; import android.os.UserManager;
import android.util.FeatureFlagUtils;
import android.util.Pair; import android.util.Pair;
import androidx.fragment.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
@@ -66,7 +65,6 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import com.android.settings.testutils.shadow.ShadowTileUtils; import com.android.settings.testutils.shadow.ShadowTileUtils;
import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settings.testutils.shadow.ShadowUserManager;
@@ -146,7 +144,6 @@ public class DashboardFeatureProviderImplTest {
.thenReturn(new ResolveInfo()); .thenReturn(new ResolveInfo());
mFeatureFactory = FakeFeatureFactory.setupForTest(); mFeatureFactory = FakeFeatureFactory.setupForTest();
mImpl = new DashboardFeatureProviderImpl(mContext); mImpl = new DashboardFeatureProviderImpl(mContext);
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
} }
@Test @Test

3
tests/robotests/src/com/android/settings/fuelgauge/TopLevelBatteryPreferenceControllerTest.java
View File

@@ -32,12 +32,10 @@ import static org.mockito.Mockito.when;
import android.app.Activity; import android.app.Activity;
import android.content.ComponentName; import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.util.FeatureFlagUtils;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.core.FeatureFlags;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
import org.junit.After; import org.junit.After;
@@ -64,7 +62,6 @@ public class TopLevelBatteryPreferenceControllerTest {
mController = new TopLevelBatteryPreferenceController(mContext, "test_key"); mController = new TopLevelBatteryPreferenceController(mContext, "test_key");
mBatterySettingsFeatureProvider = mBatterySettingsFeatureProvider =
mFeatureFactory.batterySettingsFeatureProvider; mFeatureFactory.batterySettingsFeatureProvider;
FeatureFlagUtils.setEnabled(mContext, FeatureFlags.SILKY_HOME, false);
} }
@After @After