Create a feature flag for Search v2.
Also moved all other flags in a common file so we can track them more easily. Bug: 68825426 Bug: 64938328 Test: rerun robotests Change-Id: I3fc805054cb960bedd965b1b907be759df50b95d
This commit is contained in:
@@ -17,7 +17,6 @@
|
||||
package com.android.settings;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.ArgumentMatchers.nullable;
|
||||
import static org.mockito.Matchers.anyInt;
|
||||
import static org.mockito.Mockito.doReturn;
|
||||
@@ -29,13 +28,11 @@ import static org.mockito.Mockito.when;
|
||||
import android.app.ActivityManager;
|
||||
import android.app.FragmentManager;
|
||||
import android.app.FragmentTransaction;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.graphics.Bitmap;
|
||||
import android.os.Bundle;
|
||||
|
||||
import com.android.settings.search.SearchActivity;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
|
||||
import org.junit.Before;
|
||||
@@ -46,7 +43,6 @@ import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplication;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
|
||||
@@ -97,15 +93,4 @@ public class SettingsActivityTest {
|
||||
|
||||
assertThat((boolean) bundle.get(SettingsActivity.SAVE_KEY_SHOW_HOME_AS_UP)).isTrue();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testOnClick() {
|
||||
doReturn("com.android.settings").when(mActivity).getPackageName();
|
||||
|
||||
mActivity.onClick(null);
|
||||
|
||||
Intent intent = ShadowApplication.getInstance().getNextStartedActivity();
|
||||
assertThat(intent.getComponent()).isEqualTo(
|
||||
new ComponentName("com.android.settings", SearchActivity.class.getName()));
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user