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

Merge "Fix R.string.search_menu" into main

Browse Source
This commit is contained in:
Treehugger Robot
2023-08-09 12:54:28 +00:00
committed by Android (Google) Code Review
parent 76707864e5 781ca69f9b
commit 80d3ac14a6
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/search/actionbar/SearchMenuController.java
View File

@@ -86,7 +86,7 @@ public class SearchMenuController implements LifecycleObserver, OnCreateOptionsM
return;
}
final MenuItem searchItem = menu.add(Menu.NONE, MENU_SEARCH, 0 /* order */,
com.android.settingslib.widget.R.string.search_menu);
R.string.search_menu);
searchItem.setIcon(com.android.settingslib.widget.R.drawable.ic_search_24dp);
searchItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);

5
tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java
View File

@@ -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