From 781ca69f9bb3da42d9eeabe954a3f9e45beae5d4 Mon Sep 17 00:00:00 2001 From: Chaohui Wang Date: Wed, 9 Aug 2023 20:04:48 +0800 Subject: [PATCH] Fix R.string.search_menu It's belong to namespace com.android.settingslib.search instead of com.android.settingslib.widget Fix: 295106566 Test: manual - on Developer Option page Change-Id: I6f66509ebc89094f96e08860c2d034b3b22c3b50 --- .../settings/search/actionbar/SearchMenuController.java | 2 +- .../settings/search/actionbar/SearchMenuControllerTest.java | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/settings/search/actionbar/SearchMenuController.java b/src/com/android/settings/search/actionbar/SearchMenuController.java index a2613e1975f..dbaa5de017f 100644 --- a/src/com/android/settings/search/actionbar/SearchMenuController.java +++ b/src/com/android/settings/search/actionbar/SearchMenuController.java @@ -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); diff --git a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java index b899e3a8459..eb6ad0cb137 100644 --- a/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java +++ b/tests/robotests/src/com/android/settings/search/actionbar/SearchMenuControllerTest.java @@ -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