diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2015-09-10 16:34:09 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2015-09-10 17:22:17 -0700 |
commit | ea9ad5cead9ad894fb670476bb5381198cdcf2de (patch) | |
tree | fcf23a25aadc660bd2dbb8b5178da454e8a00f08 /src/com/android/launcher3/compat/UserManagerCompatVL.java | |
parent | 5845d3dbea53d513466c98b301eb49e96fe5d6a3 (diff) | |
parent | 4abaf133546b0c950edc82594985e9da50d9c1dd (diff) | |
download | android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.tar.gz android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.tar.bz2 android_packages_apps_Trebuchet-ea9ad5cead9ad894fb670476bb5381198cdcf2de.zip |
Merge remote-tracking branch 'origin/ub-launcher3-burnaby' into mnc-dev
Conflicts:
Android.mk
Change-Id: I05429e418a25b94e7669e002d39bc70806396b8e
Diffstat (limited to 'src/com/android/launcher3/compat/UserManagerCompatVL.java')
-rw-r--r-- | src/com/android/launcher3/compat/UserManagerCompatVL.java | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/src/com/android/launcher3/compat/UserManagerCompatVL.java b/src/com/android/launcher3/compat/UserManagerCompatVL.java index dd7a72617..dc3ec3cd8 100644 --- a/src/com/android/launcher3/compat/UserManagerCompatVL.java +++ b/src/com/android/launcher3/compat/UserManagerCompatVL.java @@ -24,9 +24,14 @@ 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.Utilities; +import com.android.launcher3.util.LongArrayMap; + import java.util.ArrayList; import java.util.Collections; +import java.util.HashMap; import java.util.List; @TargetApi(Build.VERSION_CODES.LOLLIPOP) @@ -43,7 +48,32 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { } @Override + public void enableAndResetCache() { + synchronized (this) { + mUsers = new LongArrayMap<>(); + mUserToSerialMap = new HashMap<>(); + List<UserHandle> users = mUserManager.getUserProfiles(); + if (users != null) { + for (UserHandle user : users) { + long serial = mUserManager.getSerialNumberForUser(user); + UserHandleCompat userCompat = UserHandleCompat.fromUser(user); + mUsers.put(serial, userCompat); + mUserToSerialMap.put(userCompat, serial); + } + } + } + } + + @Override public List<UserHandleCompat> getUserProfiles() { + synchronized (this) { + if (mUsers != null) { + List<UserHandleCompat> users = new ArrayList<>(); + users.addAll(mUserToSerialMap.keySet()); + return users; + } + } + List<UserHandle> users = mUserManager.getUserProfiles(); if (users == null) { return Collections.emptyList(); @@ -71,7 +101,9 @@ public class UserManagerCompatVL extends UserManagerCompatV17 { @Override public long getUserCreationTime(UserHandleCompat user) { - // TODO: Use system API once available. + if (Utilities.ATLEAST_MARSHMALLOW) { + return mUserManager.getUserCreationTime(user.getUser()); + } SharedPreferences prefs = mContext.getSharedPreferences( LauncherAppState.getSharedPreferencesKey(), Context.MODE_PRIVATE); String key = USER_CREATION_TIME_KEY + getSerialNumberForUser(user); |