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

Remove logic for adding a search icon to action bar.

Browse Source 
No longer used given that we don't show the search icon on any page.
The main settings page now has the search bar.

Change-Id: I9535028298739467e7fa9c75d1a2fb2b2fa3251b
Fixes: 62230804
Bug: 37477506
Test: robotests
This commit is contained in:
Andrew Sapperstein
2017-06-25 13:51:08 -07:00
parent 74a350f9c9
commit a2dd9978d4
6 changed files with 7 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
tests/robotests/src/com/android/settings/SettingsActivityTest.java
View File

@@ -67,15 +67,10 @@ public class SettingsActivityTest {
private Bitmap mBitmap;
private SettingsActivity mActivity;
private FakeFeatureFactory mFeatureFactory;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
FakeFeatureFactory.setupForTest(mContext);
mFeatureFactory = (FakeFeatureFactory) FakeFeatureFactory.getFactory(mContext);
mActivity = spy(new SettingsActivity());
doReturn(mBitmap).when(mActivity).getBitmapFromXmlResource(anyInt());
}
@@ -98,26 +93,6 @@ public class SettingsActivityTest {
verify(mTaskDescription).setIcon(nullable(Bitmap.class));
}
@Test
public void testCreateOptionsMenu_setsUpSearch() {
ReflectionHelpers.setField(mActivity, "mSearchFeatureProvider",
mFeatureFactory.getSearchFeatureProvider());
mActivity.mDisplaySearch = true;
mActivity.onCreateOptionsMenu(null);
verify(mFeatureFactory.getSearchFeatureProvider()).setUpSearchMenu(nullable(Menu.class),
nullable(Activity.class));
}
@Test
public void testSaveState_DisplaySearchSaved() {
mActivity.mDisplaySearch = true;
Bundle bundle = new Bundle();
mActivity.saveState(bundle);
assertThat((boolean) bundle.get(SettingsActivity.SAVE_KEY_SHOW_SEARCH)).isTrue();
}
@Test
public void testSaveState_EnabledHomeSaved() {
mActivity.mDisplayHomeAsUpEnabled = true;
@@ -127,24 +102,6 @@ public class SettingsActivityTest {
assertThat((boolean) bundle.get(SettingsActivity.SAVE_KEY_SHOW_HOME_AS_UP)).isTrue();
}
@Test
public void testRestoreState_DisplaySearchRestored() {
Bundle bundle = new Bundle();
bundle.putBoolean(SettingsActivity.SAVE_KEY_SHOW_SEARCH, true);
mActivity.onRestoreInstanceState(bundle);
assertThat(mActivity.mDisplaySearch).isTrue();
}
@Test
public void testRestoreState_EnabledHomeRestored() {
Bundle bundle = new Bundle();
bundle.putBoolean(SettingsActivity.SAVE_KEY_SHOW_SEARCH, true);
mActivity.onRestoreInstanceState(bundle);
assertThat(mActivity.mDisplaySearch).isTrue();
}
@Test
public void testOnClick() {
doReturn("com.android.settings").when(mActivity).getPackageName();