diff options
| -rw-r--r-- | core/java/android/widget/SearchView.java | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index 088adbb04803..ad2b4a714b82 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -816,7 +816,15 @@ public class SearchView extends LinearLayout implements CollapsibleActionView { mSearchButton.setVisibility(visCollapsed); updateSubmitButton(hasText); mSearchEditFrame.setVisibility(collapsed ? GONE : VISIBLE); - mCollapsedIcon.setVisibility(mIconifiedByDefault ? GONE : VISIBLE); + + final int iconVisibility; + if (mCollapsedIcon.getDrawable() == null || mIconifiedByDefault) { + iconVisibility = GONE; + } else { + iconVisibility = VISIBLE; + } + mCollapsedIcon.setVisibility(iconVisibility); + updateCloseButton(); updateVoiceButton(!hasText); updateSubmitArea(); |