Merge "Revert "Migrate to use instrumentation classes from settingslib.""

This commit is contained in:
TreeHugger Robot
2018-01-23 01:58:18 +00:00
committed by Android (Google) Code Review
92 changed files with 1249 additions and 176 deletions

View File

@@ -32,11 +32,11 @@ import android.support.v14.preference.SwitchPreference;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.TestConfig;
import com.android.settings.core.instrumentation.MetricsFeatureProvider;
import com.android.settings.search.InlinePayload;
import com.android.settings.search.InlineSwitchPayload;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowSecureSettings;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
import org.junit.Test;