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

Merge "Fix robotests." into oc-dr1-dev

Browse Source 
am: db72caf3ea

Change-Id: I8893ca932f1cfcb20d72609eaf994bc7ddb9f143
This commit is contained in:
Andrew Sapperstein
2017-06-29 23:35:26 +00:00
committed by android-build-merger
parent 34c96fff5c db72caf3ea
commit 8e1c3b9b1b
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/search/SearchFragment.java
View File

@@ -183,10 +183,11 @@ public class SearchFragment extends InstrumentedFragment implements SearchView.O
mSearchView.requestFocus(); mSearchView.requestFocus();
// Updating internal views inside SearchView was the easiest way to get this too look right. // 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. // Instead of grabbing the TextView directly, we grab it as a view and do an instanceof
TextView searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text); // check. This ensures if we return, say, a LinearLayout in the tests, they won't fail.
if (searchText != null) { View searchText = mSearchView.findViewById(com.android.internal.R.id.search_src_text);
searchText.setTextColor(getContext().getColorStateList( if (searchText instanceof TextView) {
((TextView) searchText).setTextColor(getContext().getColorStateList(
com.android.internal.R.color.text_color_primary)); com.android.internal.R.color.text_color_primary));
} }
View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame); View editFrame = mSearchView.findViewById(com.android.internal.R.id.search_edit_frame);