Change getBadgedLabelForUser to use CharSequence (237aecd1) · Commits · e / os / android_frameworks_base

api/current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -22705,7 +22705,7 @@ package android.os {
		public class UserManager {
		method public android.os.Bundle getApplicationRestrictions(java.lang.String);
		method public android.graphics.drawable.Drawable getBadgedDrawableForUser(android.graphics.drawable.Drawable, android.os.UserHandle);
		method public java.lang.String getBadgedLabelForUser(java.lang.String, android.os.UserHandle);
		method public java.lang.CharSequence getBadgedLabelForUser(java.lang.CharSequence, android.os.UserHandle);
		method public long getSerialNumberForUser(android.os.UserHandle);
		method public int getUserCount();
		method public android.os.UserHandle getUserForSerialNumber(long);

+10 −1

Original line number	Diff line number	Diff line
		@@ -772,7 +772,7 @@ public class UserManager {
		* @return A label that combines the original label and a badge as
		* determined by the system.
		*/
		public String getBadgedLabelForUser(String label, UserHandle user) {
		public CharSequence getBadgedLabelForUser(CharSequence label, UserHandle user) {
		UserInfo userInfo = getUserIfProfile(user.getIdentifier());
		if (userInfo != null && userInfo.isManagedProfile()) {
		return Resources.getSystem().getString(
		@@ -781,6 +781,15 @@ public class UserManager {
		return label;
		}

		/**
		* Kept during L development to simplify updating unbundled apps.
		* TODO: Remove after 2014-08-04
		* @hide
		*/
		public String getBadgedLabelForUser(String label, UserHandle user) {
		return (String) getBadgedLabelForUser((CharSequence) label, user);
		}

		/**
		* If the target user is a managed profile of the calling user or the caller
		* is itself a managed profile, then this returns a drawable to use as a small