aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-02 17:06:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Revert Cls stopping now-master running on googlefood"

Browse Source 
This reverts commit 7bc272a11b.

Conflicts:
	src/com/android/launcher3/BubbleTextView.java

Change-Id: Id1fb2e1249e72658ce5477165c9bcacba9de2b04
This commit is contained in:
Kenny Guy
2014-06-30 12:30:31 +01:00
parent 40c5ed3039
commit c2bd8101b8
22 changed files with 174 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/launcher3/compat/UserManagerCompatVL.java
View File

@@ -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());
}
}