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

Commit b2c69878 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Merge "Fix robotests." into oc-dr1-dev am: db72caf3 

am: 8e1c3b9b

Change-Id: I2990a108691e8123df1eeefc50f650d0b8d318a6
parents 2b3ce727 8e1c3b9b

src/com/android/settings/search/SearchFragment.java

+5 −4
Original line number Diff line number Diff line
@@ -184,10 +184,11 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O 
        mSearchView.requestFocus();



        // Updating internal views inside SearchView was the easiest way to get this too look right.

        // We null-check here so that tests pass since the robotests can't find the internal views.

        TextView searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);

        if (searchText != null) {

            searchText.setTextColor(getContext().getColorStateList(

        // Instead of grabbing the TextView directly, we grab it as a view and do an instanceof

        // check. This ensures if we return, say, a LinearLayout in the tests, they won't fail.

        View searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);

        if (searchText instanceof TextView) {

            ((TextView) searchText).setTextColor(getContext().getColorStateList(

                    com.android.internal.R.color.text_color_primary));

        }

        View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame);