Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 781ca69f authored by Chaohui Wang's avatar Chaohui Wang
Browse files

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
parent 33d480ed

src/com/android/settings/search/actionbar/SearchMenuController.java

+1 −1
Original line number Diff line number Diff line
@@ -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);

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

+3 −2
Original line number Diff line number Diff line
@@ -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