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

Commit 1aabb442 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge "Use compound drawable instead of image span." into nyc-dev 

am: 91f80006

* commit '91f80006':
  Use compound drawable instead of image span.
parents b562aaaa 91f80006

packages/SettingsLib/src/com/android/settingslib/RestrictedLockUtils.java

+5 −2
Original line number Diff line number Diff line
@@ -651,8 +651,11 @@ public class RestrictedLockUtils { 
            final int disabledColor = context.getColor(R.color.disabled_text_color);

            sb.setSpan(new ForegroundColorSpan(disabledColor), 0, sb.length(),

                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

            final ImageSpan image = new RestrictedLockImageSpan(context);

            sb.append(" ", image, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);

            textView.setCompoundDrawables(null, null, getRestrictedPadlock(context), null);

            textView.setCompoundDrawablePadding(context.getResources().getDimensionPixelSize(

                    R.dimen.restricted_icon_padding));

        } else {

            textView.setCompoundDrawables(null, null, null, null);

        }

        textView.setText(sb);

    }