diff options
author | Dharmesh Mokani <mokani@google.com> | 2014-08-08 20:02:43 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-08 20:02:43 +0000 |
commit | 597a8ec85ce6dab28e110f63bbd44b270675304b (patch) | |
tree | 10f13134c53afc056fbd2a76c2ea4aa2dac86b11 | |
parent | 382d8606869c777fedc570494dfe6a698e5a1edd (diff) | |
parent | 6075170b838bfe7a040bbff25c2c22859b7d6ee5 (diff) | |
download | android_packages_apps_Trebuchet-597a8ec85ce6dab28e110f63bbd44b270675304b.tar.gz android_packages_apps_Trebuchet-597a8ec85ce6dab28e110f63bbd44b270675304b.tar.bz2 android_packages_apps_Trebuchet-597a8ec85ce6dab28e110f63bbd44b270675304b.zip |
am 6075170b: Changes corresponding to framework changes.
* commit '6075170b838bfe7a040bbff25c2c22859b7d6ee5':
Changes corresponding to framework changes.
-rw-r--r-- | src/com/android/launcher3/compat/UserManagerCompatVL.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index da7b116d3..ad6f78e08 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -32,6 +32,7 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { super(context); } + @Override public List<UserHandleCompat> getUserProfiles() { List<UserHandle> users = mUserManager.getUserProfiles(); if (users == null) { @@ -45,16 +46,17 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { return compatUsers; } + @Override public Drawable getBadgedDrawableForUser(Drawable unbadged, UserHandleCompat user) { - return mUserManager.getBadgedDrawableForUser(unbadged, user.getUser()); + return mUserManager.getBadgedIconForUser(unbadged, user.getUser()); } + @Override public CharSequence getBadgedLabelForUser(CharSequence label, UserHandleCompat user) { if (user == null) { return label; } - // TODO Remove casts when API has made it from lmp-dev -> sdk - return (CharSequence) mUserManager.getBadgedLabelForUser((String) label, user.getUser()); + return mUserManager.getBadgedLabelForUser(label, user.getUser()); } } |