am 00e827c7: am 5fcaab43: am ea9ad5ce: Merge remote-tracking branch \'origin/ub-launcher3-burnaby\' into mnc-dev

* commit '00e827c70cb4213ee05140157006a37d12662448': (76 commits)
  Restoring provider behavior for reloading app on old devices   > For older devices, launcher will only reload in case of inserts with specific query parameters   > For older devices, launcehr will notify content observers of any internal inserts   > Chaning TAG for Launcher provider as max logging tag is only 23 characters
  Removing items which are on invalid screen
  Preventing null pointer crash when opening a folder
  Revert workaround for move to default screen on home intent.
  Fixing NPE in recycler view scroll bar.
  Adding workaround for regression caused by ag/752175
  Adding gradle script for Android Studio
  Override the overscroll color for the widget rows.
  Adding graphic for all apps empty search screen.
  Using GET_UNINSTALLED_PACKAGES flag when getting packageInfo for a managed profile app
  Revert "Adding viewId for the QSB"
  Adding viewId for the QSB
  Fixing issue with missing scroll bar after fast-scrolling and searching.
  Fixing an issue where you would inadvertently start fastscrolling.
  Pending bind callbacks should be cleared before starting the loader, similar to startBinding
  Fixing widgets container inactive scroll bar color.
  Making the detached scrollbar catch up faster to the actual scroll position.
  Updating theme to use the light theme by default, instead of wallpaper theme   > This allows us to use all the goodness of material theme   > Cursor in folder edit text is no longer 1px wide
  Updating the target sdk to launcher
  Using the usermanager api to get creation time
  ...

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);