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

Commit 19d62382 authored by Winson Chung's avatar Winson Chung
Browse files

Ensuring that the start delay matches the transition delay. (Bug 16987565) 

- Also ensure that the empty text is normal weight

Change-Id: I3227a62fcb39910a402b13f42a6cb9e418f992aa
parent 48f0b485

packages/SystemUI/res/layout/recents_empty.xml

+1 −1
Original line number Diff line number Diff line
@@ -23,6 +23,6 @@ 
    android:textSize="16sp"

    android:textColor="#ffffffff"

    android:text="@string/recents_empty_message"

    android:fontFamily="sans-serif-light"

    android:fontFamily="sans-serif"

    android:background="#80000000"

    android:visibility="gone" />
 
 No newline at end of file

packages/SystemUI/res/values/config.xml

+4 −1
Original line number Diff line number Diff line
@@ -134,10 +134,13 @@ 
    <integer name="recents_animate_task_exit_to_home_duration">225</integer>

    <!-- The min animation duration for animating the task bar out. -->

    <integer name="recents_animate_task_bar_exit_duration">125</integer>

    <!-- The animation delay for animating the first task in. This should roughly be the animation

     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">275</integer>

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

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

    <integer name="recents_animate_task_enter_from_home_stagger_delay">10</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/RecentsConfiguration.java

+6 −3
Original line number Diff line number Diff line
@@ -74,8 +74,9 @@ public class RecentsConfiguration { 
    public float taskStackOverscrollPct;



    /** Task view animation and styles */

    public int taskViewEnterFromHomeDuration;

    public int taskViewEnterFromHomeDelay;

    public int taskViewEnterFromHomeDuration;

    public int taskViewEnterFromHomeStaggerDelay;

    public int taskViewExitToHomeDuration;

    public int taskViewRemoveAnimDuration;

    public int taskViewRemoveAnimTranslationXPx;
@@ -209,10 +210,12 @@ public class RecentsConfiguration { 
        taskStackTopPaddingPx = res.getDimensionPixelSize(R.dimen.recents_stack_top_padding);



        // Task view animation and styles

        taskViewEnterFromHomeDuration =

                res.getInteger(R.integer.recents_animate_task_enter_from_home_duration);

        taskViewEnterFromHomeDelay =

                res.getInteger(R.integer.recents_animate_task_enter_from_home_delay);

        taskViewEnterFromHomeDuration =

                res.getInteger(R.integer.recents_animate_task_enter_from_home_duration);

        taskViewEnterFromHomeStaggerDelay =

                res.getInteger(R.integer.recents_animate_task_enter_from_home_stagger_delay);

        taskViewExitToHomeDuration =

                res.getInteger(R.integer.recents_animate_task_exit_to_home_duration);

        taskViewRemoveAnimDuration =

packages/SystemUI/src/com/android/systemui/recents/views/TaskView.java

+3 −3
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 
                float scaledWindowInsetTop = (int) (taskScale * windowInsetTop);

                float scaledTranslationY = taskRect.top + transform.translationY -

                        (scaledWindowInsetTop + scaledYOffset);

                startDelay = mConfig.taskViewEnterFromHomeDelay;

                startDelay = mConfig.taskViewEnterFromHomeStaggerDelay;



                // Animate the top clip

                mViewBounds.animateClipTop(windowInsetTop, duration,
@@ -410,8 +410,8 @@ public class TaskView extends FrameLayout implements Task.TaskCallbacks, 
        } else if (mConfig.launchedFromHome) {

            // Animate the tasks up

            int frontIndex = (ctx.currentStackViewCount - ctx.currentStackViewIndex - 1);

            int delay = mConfig.taskBarEnterAnimDelay +

                    frontIndex * mConfig.taskViewEnterFromHomeDelay;

            int delay = mConfig.taskViewEnterFromHomeDelay +

                    frontIndex * mConfig.taskViewEnterFromHomeStaggerDelay;

            if (Constants.DebugFlags.App.EnableShadows) {

                animate().translationZ(transform.translationZ);

            }