Merge "Ensure that we don't show excluded tasks when we are not in that task... (d092fc70) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/values/config.xml

+3 −6

Original line number	Original line	Diff line number	Diff line
	@@ -161,12 +161,9 @@
	duration of the transition in to recents from home. -->		duration of the transition in to recents from home. -->
	<integer name="recents_animate_task_enter_from_home_delay">150</integer>		<integer name="recents_animate_task_enter_from_home_delay">150</integer>
	<!-- The min animation duration for animating the task in when transitioning from home. -->		<!-- The min animation duration for animating the task in when transitioning from home. -->
	<integer name="recents_animate_task_enter_from_home_duration">200</integer>		<integer name="recents_animate_task_enter_from_home_duration">250</integer>
	<!-- The total animation stagger delay when entering from home. -->		<!-- The animation stagger to apply to each task animation when transitioning from home. -->
	<integer name="recents_animate_task_enter_from_home_stagger_delay">110</integer>		<integer name="recents_animate_task_enter_from_home_stagger_delay">12</integer>
	<!-- The total animation duration added to the last card when entering from home.
	This value is partialy also added to the previous tasks -->
	<integer name="recents_animate_task_enter_from_home_stagger_duration">72</integer>
	<!-- The short duration when animating in/out the lock to app button. -->		<!-- The short duration when animating in/out the lock to app button. -->
	<integer name="recents_animate_lock_to_app_button_short_duration">150</integer>		<integer name="recents_animate_lock_to_app_button_short_duration">150</integer>
	<!-- The long duration when animating in/out the lock to app button. -->		<!-- The long duration when animating in/out the lock to app button. -->

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

+3 −3

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

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -37,6 +37,8 @@ public class Constants {
	public static final boolean EnableTaskBarTouchEvents = true;		public static final boolean EnableTaskBarTouchEvents = true;
	// Enables app-info pane on long-pressing the icon		// Enables app-info pane on long-pressing the icon
	public static final boolean EnableDevAppInfoOnLongPress = true;		public static final boolean EnableDevAppInfoOnLongPress = true;
			// Enables debug mode
			public static final boolean EnableDebugMode = false;
	// Enables the search bar layout		// Enables the search bar layout
	public static final boolean EnableSearchLayout = true;		public static final boolean EnableSearchLayout = true;
	// Enables the thumbnail alpha on the front-most task		// Enables the thumbnail alpha on the front-most task

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

+10 −8

Original line number	Original line	Diff line number	Diff line
	@@ -182,14 +182,6 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView

	/** Updates the set of recent tasks */		/** Updates the set of recent tasks */
	void updateRecentsTasks(Intent launchIntent) {		void updateRecentsTasks(Intent launchIntent) {
	// Load all the tasks
	RecentsTaskLoader loader = RecentsTaskLoader.getInstance();
	SpaceNode root = loader.reload(this, Constants.Values.RecentsTaskLoader.PreloadFirstTasksCount);
	ArrayList<TaskStack> stacks = root.getStacks();
	if (!stacks.isEmpty()) {
	mRecentsView.setTaskStacks(root.getStacks());
	}

	// Update the configuration based on the launch intent		// Update the configuration based on the launch intent
	boolean fromSearchHome = launchIntent.getBooleanExtra(		boolean fromSearchHome = launchIntent.getBooleanExtra(
	AlternateRecentsComponent.EXTRA_FROM_SEARCH_HOME, false);		AlternateRecentsComponent.EXTRA_FROM_SEARCH_HOME, false);
	@@ -203,6 +195,16 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView
	AlternateRecentsComponent.EXTRA_FROM_TASK_ID, -1);		AlternateRecentsComponent.EXTRA_FROM_TASK_ID, -1);
	mConfig.launchedWithAltTab = launchIntent.getBooleanExtra(		mConfig.launchedWithAltTab = launchIntent.getBooleanExtra(
	AlternateRecentsComponent.EXTRA_TRIGGERED_FROM_ALT_TAB, false);		AlternateRecentsComponent.EXTRA_TRIGGERED_FROM_ALT_TAB, false);

			// Load all the tasks
			RecentsTaskLoader loader = RecentsTaskLoader.getInstance();
			SpaceNode root = loader.reload(this,
			Constants.Values.RecentsTaskLoader.PreloadFirstTasksCount,
			mConfig.launchedFromHome);
			ArrayList<TaskStack> stacks = root.getStacks();
			if (!stacks.isEmpty()) {
			mRecentsView.setTaskStacks(root.getStacks());
			}
	mConfig.launchedWithNoRecentTasks = !root.hasTasks();		mConfig.launchedWithNoRecentTasks = !root.hasTasks();

	// Create the home intent runnable		// Create the home intent runnable

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

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -220,8 +220,6 @@ public class RecentsConfiguration {
	res.getInteger(R.integer.recents_animate_task_enter_from_home_duration);		res.getInteger(R.integer.recents_animate_task_enter_from_home_duration);
	taskViewEnterFromHomeStaggerDelay =		taskViewEnterFromHomeStaggerDelay =
	res.getInteger(R.integer.recents_animate_task_enter_from_home_stagger_delay);		res.getInteger(R.integer.recents_animate_task_enter_from_home_stagger_delay);
	taskViewEnterFromHomeStaggerDuration =
	res.getInteger(R.integer.recents_animate_task_enter_from_home_stagger_duration);
	taskViewExitToHomeDuration =		taskViewExitToHomeDuration =
	res.getInteger(R.integer.recents_animate_task_exit_to_home_duration);		res.getInteger(R.integer.recents_animate_task_exit_to_home_duration);
	taskViewRemoveAnimDuration =		taskViewRemoveAnimDuration =

Original line number	Original line	Diff line number	Diff line
	@@ -189,7 +189,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta
	void showRelativeAffiliatedTask(boolean showNextTask) {		void showRelativeAffiliatedTask(boolean showNextTask) {
	RecentsTaskLoader loader = RecentsTaskLoader.getInstance();		RecentsTaskLoader loader = RecentsTaskLoader.getInstance();
	TaskStack stack = loader.getTaskStack(mSystemServicesProxy, mContext.getResources(),		TaskStack stack = loader.getTaskStack(mSystemServicesProxy, mContext.getResources(),
	-1, -1, false, null, null);		-1, -1, false, true, null, null);
	// Return early if there are no tasks		// Return early if there are no tasks
	if (stack.getTaskCount() == 0) return;		if (stack.getTaskCount() == 0) return;

	@@ -444,7 +444,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta
	// Get the stack of tasks that we are animating into		// Get the stack of tasks that we are animating into
	RecentsTaskLoader loader = RecentsTaskLoader.getInstance();		RecentsTaskLoader loader = RecentsTaskLoader.getInstance();
	TaskStack stack = loader.getTaskStack(mSystemServicesProxy, mContext.getResources(),		TaskStack stack = loader.getTaskStack(mSystemServicesProxy, mContext.getResources(),
	runningTaskId, -1, false, null, null);		runningTaskId, -1, false, isTopTaskHome, null, null);
	if (stack.getTaskCount() == 0) {		if (stack.getTaskCount() == 0) {
	return null;		return null;
	}		}
	@@ -485,7 +485,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta
	// which can differ depending on the number of items in the list.		// which can differ depending on the number of items in the list.
	SystemServicesProxy ssp = mSystemServicesProxy;		SystemServicesProxy ssp = mSystemServicesProxy;
	List<ActivityManager.RecentTaskInfo> recentTasks =		List<ActivityManager.RecentTaskInfo> recentTasks =
	ssp.getRecentTasks(3, UserHandle.CURRENT.getIdentifier());		ssp.getRecentTasks(3, UserHandle.CURRENT.getIdentifier(), isTopTaskHome);
	boolean useThumbnailTransition = !isTopTaskHome;		boolean useThumbnailTransition = !isTopTaskHome;
	boolean hasRecentTasks = !recentTasks.isEmpty();		boolean hasRecentTasks = !recentTasks.isEmpty();