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

Merge "Creating a cache of users to avoid multiple calls to UserManager" into ub-launcher3-burnaby

Browse Source
This commit is contained in:
Sunny Goyal
2015-08-05 19:22:56 +00:00
committed by Android (Google) Code Review
parent 0ad3306684 823fd50902
commit 7ca3250a10
8 changed files with 80 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/launcher3/LauncherAppState.java
View File

@@ -20,11 +20,13 @@ import android.app.SearchManager;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.os.UserManager;
import android.util.Log;
import com.android.launcher3.accessibility.LauncherAccessibilityDelegate;
import com.android.launcher3.compat.LauncherAppsCompat;
import com.android.launcher3.compat.PackageInstallerCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.util.Thunk;
import java.lang.ref.WeakReference;
@@ -100,6 +102,7 @@ public class LauncherAppState {
filter.addAction(LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED);
sContext.registerReceiver(mModel, filter);
UserManagerCompat.getInstance(sContext).enableAndResetCache();
}
/**

1
src/com/android/launcher3/LauncherModel.java
View File

@@ -1288,6 +1288,7 @@ public class LauncherModel extends BroadcastReceiver
}
} else if (LauncherAppsCompat.ACTION_MANAGED_PROFILE_ADDED.equals(action)
|| LauncherAppsCompat.ACTION_MANAGED_PROFILE_REMOVED.equals(action)) {
UserManagerCompat.getInstance(context).enableAndResetCache();
forceReload();
}
}

25
src/com/android/launcher3/compat/UserManagerCompat.java
View File

@@ -28,16 +28,29 @@ public abstract class UserManagerCompat {
protected UserManagerCompat() {
}
private static final Object sInstanceLock = new Object();
private static UserManagerCompat sInstance;
public static UserManagerCompat getInstance(Context context) {
if (Utilities.isLmpOrAbove()) {
return new UserManagerCompatVL(context);
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
return new UserManagerCompatV17(context);
} else {
return new UserManagerCompatV16();
synchronized (sInstanceLock) {
if (sInstance == null) {
if (Utilities.isLmpOrAbove()) {
sInstance = new UserManagerCompatVL(context.getApplicationContext());
} else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
sInstance = new UserManagerCompatV17(context.getApplicationContext());
} else {
sInstance = new UserManagerCompatV16();
}
}
return sInstance;
}
}
/**
* Creates a cache for users.
*/
public abstract void enableAndResetCache();
public abstract List<UserHandleCompat> getUserProfiles();
public abstract long getSerialNumberForUser(UserHandleCompat user);
public abstract UserHandleCompat getUserForSerialNumber(long serialNumber);

4
src/com/android/launcher3/compat/UserManagerCompatV16.java
View File

@@ -53,4 +53,8 @@ public class UserManagerCompatV16 extends UserManagerCompat {
public long getUserCreationTime(UserHandleCompat user) {
return 0;
}
@Override
public void enableAndResetCache() {
}
}

24
src/com/android/launcher3/compat/UserManagerCompatV17.java
View File

@@ -21,8 +21,12 @@ import android.content.Context;
import android.os.Build;
import android.os.UserManager;
import com.android.launcher3.util.LongArrayMap;
@TargetApi(Build.VERSION_CODES.JELLY_BEAN_MR1)
public class UserManagerCompatV17 extends UserManagerCompatV16 {
protected LongArrayMap<UserHandleCompat> mUsers;
protected UserManager mUserManager;
UserManagerCompatV17(Context context) {
@@ -30,11 +34,31 @@ public class UserManagerCompatV17 extends UserManagerCompatV16 {
}
public long getSerialNumberForUser(UserHandleCompat user) {
synchronized (this) {
if (mUsers != null) {
int index = mUsers.indexOfValue(user);
return (index >= 0) ? mUsers.keyAt(index) : 0;
}
}
return mUserManager.getSerialNumberForUser(user.getUser());
}
public UserHandleCompat getUserForSerialNumber(long serialNumber) {
synchronized (this) {
if (mUsers != null) {
return mUsers.get(serialNumber);
}
}
return UserHandleCompat.fromUser(mUserManager.getUserForSerialNumber(serialNumber));
}
@Override
public void enableAndResetCache() {
synchronized (this) {
mUsers = new LongArrayMap<UserHandleCompat>();
UserHandleCompat myUser = UserHandleCompat.myUserHandle();
mUsers.put(mUserManager.getSerialNumberForUser(myUser.getUser()), myUser);
}
}
}

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

@@ -24,7 +24,10 @@ import android.content.pm.PackageManager;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.os.UserHandle;
import com.android.launcher3.LauncherAppState;
import com.android.launcher3.util.LongArrayMap;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -42,8 +45,32 @@ public class UserManagerCompatVL extends UserManagerCompatV17 {
mContext = context;
}
@Override
public void enableAndResetCache() {
synchronized (this) {
mUsers = new LongArrayMap<UserHandleCompat>();
List<UserHandle> users = mUserManager.getUserProfiles();
if (users != null) {
for (UserHandle user : users) {
mUsers.put(mUserManager.getSerialNumberForUser(user),
UserHandleCompat.fromUser(user));
}
}
}
}
@Override
public List<UserHandleCompat> getUserProfiles() {
synchronized (this) {
if (mUsers != null) {
List<UserHandleCompat> users = new ArrayList<>();
for (UserHandleCompat user : mUsers) {
users.add(user);
}
return users;
}
}
List<UserHandle> users = mUserManager.getUserProfiles();
if (users == null) {
return Collections.emptyList();

22
src/com/android/launcher3/model/AbstractUserComparator.java
View File

@@ -22,14 +22,12 @@ import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.compat.UserManagerCompat;
import java.util.Comparator;
import java.util.HashMap;
/**
* A comparator to arrange items based on user profiles.
*/
public abstract class AbstractUserComparator<T extends ItemInfo> implements Comparator<T> {
private HashMap<UserHandleCompat, Long> mUserSerialCache = new HashMap<>();
private final UserManagerCompat mUserManager;
private final UserHandleCompat mMyUser;
@@ -43,25 +41,9 @@ public abstract class AbstractUserComparator<T extends ItemInfo> implements Comp
if (mMyUser.equals(lhs.user)) {
return -1;
} else {
Long aUserSerial = getAndCacheUserSerial(lhs.user);
Long bUserSerial = getAndCacheUserSerial(rhs.user);
Long aUserSerial = mUserManager.getSerialNumberForUser(lhs.user);
Long bUserSerial = mUserManager.getSerialNumberForUser(rhs.user);
return aUserSerial.compareTo(bUserSerial);
}
}
/**
* Returns the user serial for this user, using a cached serial if possible.
*/
private Long getAndCacheUserSerial(UserHandleCompat user) {
Long userSerial = mUserSerialCache.get(user);
if (userSerial == null) {
userSerial = mUserManager.getSerialNumberForUser(user);
mUserSerialCache.put(user, userSerial);
}
return userSerial;
}
public void clearUserCache() {
mUserSerialCache.clear();
}
}

2
src/com/android/launcher3/model/AppNameComparator.java
View File

@@ -68,8 +68,6 @@ public class AppNameComparator {
* Returns a locale-aware comparator that will alphabetically order a list of applications.
*/
public Comparator<ItemInfo> getAppInfoComparator() {
// Clear the user serial cache so that we get serials as needed in the comparator
mAppInfoComparator.clearUserCache();
return mAppInfoComparator;
}