Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33342dfd authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

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

am: 17b995d0

Change-Id: I9300448d8a60399e839dbf20bb5fea5afd7b291b
parents e6623e5b 17b995d0

core/java/android/preference/Preference.java

+7 −3
Original line number Diff line number Diff line
@@ -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) {