Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9cb5c4e3 authored by Winson Chung's avatar Winson Chung
Browse files

Ensure that we don't show excluded tasks when we are not in that task (Bug 17657618) 

- Fix regression with launching an affiliated task due to clipping changes (Bug 17755902)
- Tweaking previous changes to home transition
- Disable the debug mode option
parent 51a400eb

packages/SystemUI/res/values/config.xml

+3 −6
Original line number Diff line number Diff line
@@ -161,12 +161,9 @@ 
     duration of the transition in to recents from home. -->

    <integer name="recents_animate_task_enter_from_home_delay">150</integer>

    <!-- The min animation duration for animating the task in when transitioning from home. -->

    <integer name="recents_animate_task_enter_from_home_duration">200</integer>

    <!-- The total animation stagger delay when entering from home. -->

    <integer name="recents_animate_task_enter_from_home_stagger_delay">110</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>

    <integer name="recents_animate_task_enter_from_home_duration">250</integer>

    <!-- The animation stagger to apply to each task animation when transitioning from home. -->

    <integer name="recents_animate_task_enter_from_home_stagger_delay">12</integer>

    <!-- The short duration when animating in/out the lock to app button. -->

    <integer name="recents_animate_lock_to_app_button_short_duration">150</integer>

    <!-- The long duration when animating in/out the lock to app button. -->

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

+3 −3
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta 
    void showRelativeAffiliatedTask(boolean showNextTask) {

        RecentsTaskLoader loader = RecentsTaskLoader.getInstance();

        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

        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

        RecentsTaskLoader loader = RecentsTaskLoader.getInstance();

        TaskStack stack = loader.getTaskStack(mSystemServicesProxy, mContext.getResources(),

                runningTaskId, -1, false, null, null);

                runningTaskId, -1, false, isTopTaskHome, null, null);

        if (stack.getTaskCount() == 0) {

            return null;

        }
@@ -485,7 +485,7 @@ public class AlternateRecentsComponent implements ActivityOptions.OnAnimationSta 
        // which can differ depending on the number of items in the list.

        SystemServicesProxy ssp = mSystemServicesProxy;

        List<ActivityManager.RecentTaskInfo> recentTasks =

                ssp.getRecentTasks(3, UserHandle.CURRENT.getIdentifier());

                ssp.getRecentTasks(3, UserHandle.CURRENT.getIdentifier(), isTopTaskHome);

        boolean useThumbnailTransition = !isTopTaskHome;

        boolean hasRecentTasks = !recentTasks.isEmpty();

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

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ public class Constants { 
            public static final boolean EnableTaskBarTouchEvents = true;

            // Enables app-info pane on long-pressing the icon

            public static final boolean EnableDevAppInfoOnLongPress = true;

            // Enables debug mode

            public static final boolean EnableDebugMode = false;

            // Enables the search bar layout

            public static final boolean EnableSearchLayout = true;

            // Enables the thumbnail alpha on the front-most task

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

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


    /** Updates the set of recent tasks */

    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

        boolean fromSearchHome = launchIntent.getBooleanExtra(

                AlternateRecentsComponent.EXTRA_FROM_SEARCH_HOME, false);
@@ -203,6 +195,16 @@ public class RecentsActivity extends Activity implements RecentsView.RecentsView 
                AlternateRecentsComponent.EXTRA_FROM_TASK_ID, -1);

        mConfig.launchedWithAltTab = launchIntent.getBooleanExtra(

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



        // Create the home intent runnable

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

+0 −2
Original line number Diff line number Diff line
@@ -220,8 +220,6 @@ public class RecentsConfiguration { 
                res.getInteger(R.integer.recents_animate_task_enter_from_home_duration);

        taskViewEnterFromHomeStaggerDelay =

                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 =

                res.getInteger(R.integer.recents_animate_task_exit_to_home_duration);

        taskViewRemoveAnimDuration =