diff options
author | Kenny Guy <kennyguy@google.com> | 2014-06-12 13:00:26 +0100 |
---|---|---|
committer | Kenny Guy <kennyguy@google.com> | 2014-06-23 13:56:05 +0100 |
commit | 242bbe1b72e4978dde8a662d164cd186305e14a7 (patch) | |
tree | ff6b46ff813270cac053a4a390845a5fe6fb65ec /src/com/android/launcher3/compat/UserManagerCompatVL.java | |
parent | 9c599c2aae239aebf77350dea000e594d6162e39 (diff) | |
download | android_packages_apps_Trebuchet-242bbe1b72e4978dde8a662d164cd186305e14a7.tar.gz android_packages_apps_Trebuchet-242bbe1b72e4978dde8a662d164cd186305e14a7.tar.bz2 android_packages_apps_Trebuchet-242bbe1b72e4978dde8a662d164cd186305e14a7.zip |
Remove reflection now we are building against L
Remove reflection and update changed renamed L APIs
now that branch has L sdk.
Change-Id: I223c6528487110eb328e2e229bbcbefb701e0c20
Diffstat (limited to 'src/com/android/launcher3/compat/UserManagerCompatVL.java')
-rw-r--r-- | src/com/android/launcher3/compat/UserManagerCompatVL.java | 43 |
1 files changed, 17 insertions, 26 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index 8d3ca8577..e071a8f71 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -22,9 +22,8 @@ import android.graphics.drawable.Drawable; import android.os.UserHandle; import android.os.UserManager; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class UserManagerCompatVL extends UserManagerCompatV17 { @@ -34,35 +33,27 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { } public List<UserHandleCompat> getUserProfiles() { - Method method = ReflectUtils.getMethod(mUserManager.getClass(), "getUserProfiles"); - if (method != null) { - List<UserHandle> users = (List<UserHandle>) ReflectUtils.invokeMethod( - mUserManager, method); - if (users != null) { - ArrayList<UserHandleCompat> compatUsers = new ArrayList<UserHandleCompat>( - users.size()); - for (UserHandle user : users) { - compatUsers.add(UserHandleCompat.fromUser(user)); - } - return compatUsers; - } + List<UserHandle> users = mUserManager.getUserProfiles(); + if (users == null) { + return Collections.EMPTY_LIST; } - // Fall back to non L version. - return super.getUserProfiles(); + ArrayList<UserHandleCompat> compatUsers = new ArrayList<UserHandleCompat>( + users.size()); + for (UserHandle user : users) { + compatUsers.add(UserHandleCompat.fromUser(user)); + } + return compatUsers; } public Drawable getBadgedDrawableForUser(Drawable unbadged, UserHandleCompat user) { - Method method = ReflectUtils.getMethod(mUserManager.getClass(), "getBadgedDrawableForUser", - Drawable.class, UserHandle.class); - if (method != null) { - Drawable d = (Drawable) ReflectUtils.invokeMethod(mUserManager, method, unbadged, - user.getUser()); - if (d != null) { - return d; - } + return mUserManager.getBadgedDrawableForUser(unbadged, user.getUser()); + } + + public String getBadgedLabelForUser(String label, UserHandleCompat user) { + if (user == null) { + return label; } - // Fall back to non L version. - return super.getBadgedDrawableForUser(unbadged, user); + return mUserManager.getBadgedLabelForUser(label, user.getUser()); } } |