diff options
| -rw-r--r-- | core/java/android/preference/Preference.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/core/java/android/preference/Preference.java b/core/java/android/preference/Preference.java index 7496cb28f046..2179bd45e303 100644 --- a/core/java/android/preference/Preference.java +++ b/core/java/android/preference/Preference.java @@ -17,8 +17,6 @@ package android.preference; import android.annotation.CallSuper; -import com.android.internal.util.CharSequences; - import android.annotation.DrawableRes; import android.annotation.LayoutRes; import android.annotation.Nullable; @@ -42,6 +40,8 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import com.android.internal.util.CharSequences; + import java.util.ArrayList; import java.util.List; import java.util.Set; @@ -650,7 +650,11 @@ public class Preference implements Comparable<Preference> { final View imageFrame = view.findViewById(com.android.internal.R.id.icon_frame); if (imageFrame != null) { - imageFrame.setVisibility(mIcon != null ? View.VISIBLE : View.GONE); + if (mIcon != null) { + imageFrame.setVisibility(View.VISIBLE); + } else { + imageFrame.setVisibility(mIconSpaceReserved ? View.INVISIBLE : View.GONE); + } } if (mShouldDisableView) { |