From 51e4a66446e5f3e957014c5a93a654c447236978 Mon Sep 17 00:00:00 2001 From: Andrew Sapperstein Date: Thu, 29 Jun 2017 15:38:55 -0700 Subject: [PATCH] Fix robotests. Change-Id: Ia0615bfdd303a19b145ead44979a03ccdd29bf41 Fixes: 63141368 Test: robotest --- src/com/android/settings/search/SearchFragment.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/android/settings/search/SearchFragment.java b/src/com/android/settings/search/SearchFragment.java index 7fb72575fc4..aec140aeb15 100644 --- a/src/com/android/settings/search/SearchFragment.java +++ b/src/com/android/settings/search/SearchFragment.java @@ -183,10 +183,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);