Merge "Revert "Bump up preloading recents on boot up to user unlocked." am:... (478ed50d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recents/Recents.java

+2 −24

Original line number	Diff line number	Diff line
		@@ -18,12 +18,10 @@ package com.android.systemui.recents;

		import android.app.ActivityManager;
		import android.app.UiModeManager;
		import android.content.BroadcastReceiver;
		import android.content.ComponentName;
		import android.content.ContentResolver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.ServiceConnection;
		import android.content.pm.ActivityInfo;
		import android.content.res.Configuration;
		@@ -99,7 +97,7 @@ public class Recents extends SystemUI
		// and does not reside in the home stack.
		private String mOverrideRecentsPackageName;

		private Handler mHandler = new Handler();
		private Handler mHandler;
		private RecentsImpl mImpl;
		private int mDraggingInRecentsCurrentUser;

		@@ -165,20 +163,6 @@ public class Recents extends SystemUI
		}
		};


		private BroadcastReceiver mSystemUserUnlockedReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		if (Intent.ACTION_USER_UNLOCKED.equals(intent.getAction())) {
		int userId = intent.getIntExtra(Intent.EXTRA_USER_HANDLE, UserHandle.USER_NULL);
		if (userId != UserHandle.USER_NULL) {
		mImpl.onUserUnlocked(userId);
		}
		}
		}
		};


		/**
		* Returns the callbacks interface that non-system users can call.
		*/
		@@ -208,7 +192,7 @@ public class Recents extends SystemUI
		sSystemServicesProxy = SystemServicesProxy.getInstance(mContext);
		sTaskLoader = new RecentsTaskLoader(mContext);
		sConfiguration = new RecentsConfiguration(mContext);

		mHandler = new Handler();
		UiModeManager uiModeManager = (UiModeManager) mContext.
		getSystemService(Context.UI_MODE_SERVICE);
		if (uiModeManager.getCurrentModeType() == Configuration.UI_MODE_TYPE_TELEVISION) {
		@@ -238,12 +222,6 @@ public class Recents extends SystemUI
		// For the system user, initialize an instance of the interface that we can pass to the
		// secondary user
		mSystemToUserCallbacks = new RecentsSystemUser(mContext, mImpl);

		// Listen for user-unlocked to kick off preloading recents
		IntentFilter filter = new IntentFilter();
		filter.addAction(Intent.ACTION_USER_UNLOCKED);
		mContext.registerReceiverAsUser(mSystemUserUnlockedReceiver, UserHandle.SYSTEM, filter,
		null /* permission /, null / scheduler */);
		} else {
		// For the secondary user, bind to the primary user's service to get a persistent
		// interface to register its implementation and to later update its state

packages/SystemUI/src/com/android/systemui/recents/RecentsImpl.java

+1 −5

Original line number	Diff line number	Diff line
		@@ -187,7 +187,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
		reloadResources();
		}

		public void onUserUnlocked(int userId) {
		public void onBootCompleted() {
		// When we start, preload the data associated with the previous recent tasks.
		// We can use a new plan since the caches will be the same.
		RecentsTaskLoader loader = Recents.getTaskLoader();
		@@ -200,10 +200,6 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
		loader.loadTasks(mContext, plan, launchOpts);
		}

		public void onBootCompleted() {
		// Do nothing
		}

		public void onConfigurationChanged() {
		Resources res = mContext.getResources();
		reloadResources();