Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Set icon frame to invisible when iconSpaceReserved is set." into oc-dev am: 544cf7793f

Browse Source 
am: 17b995d042

Change-Id: I9300448d8a60399e839dbf20bb5fea5afd7b291b
This commit is contained in:
Fan Zhang
2017-04-25 10:05:13 +00:00
committed by android-build-merger
parent e6623e5b2f 17b995d042
commit 33342dfd12
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/java/android/preference/Preference.java
View File

@@ -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) {