Merge "Fix R.string.search_menu" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
80d3ac14a6
@@ -33,6 +33,7 @@ import android.view.MenuItem;
|
||||
|
||||
import androidx.fragment.app.FragmentActivity;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.InstrumentedFragment;
|
||||
import com.android.settings.testutils.shadow.ShadowUtils;
|
||||
|
||||
@@ -71,7 +72,7 @@ public class SearchMenuControllerTest {
|
||||
|
||||
when(mHost.getActivity()).thenReturn(mActivity);
|
||||
when(mMenu.add(Menu.NONE, MENU_SEARCH, 0 /* order */,
|
||||
com.android.settingslib.widget.R.string.search_menu))
|
||||
R.string.search_menu))
|
||||
.thenReturn(mock(MenuItem.class));
|
||||
}
|
||||
|
||||
@@ -81,7 +82,7 @@ public class SearchMenuControllerTest {
|
||||
mHost.getSettingsLifecycle().onCreateOptionsMenu(mMenu, null /* inflater */);
|
||||
|
||||
verify(mMenu).add(Menu.NONE, MENU_SEARCH, 0 /* order */,
|
||||
com.android.settingslib.widget.R.string.search_menu);
|
||||
R.string.search_menu);
|
||||
}
|
||||
|
||||
@Test
|
||||
|
Reference in New Issue
Block a user