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

Commit 94bc4f22 authored by Winson's avatar Winson
Browse files

Only updating the header if valid bounds are generated.

Bug: 28059153
Change-Id: Icbc35b4600421f75ae1193e7ccf18dce0b17c3e1
parent d72c315d
Loading
Loading
Loading
Loading
+18 −16
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
package com.android.systemui.recents;

import static android.app.ActivityManager.StackId.FREEFORM_WORKSPACE_STACK_ID;
import static android.view.View.MeasureSpec;

import android.app.ActivityManager;
import android.app.ActivityOptions;
@@ -36,7 +37,6 @@ import android.util.Log;
import android.util.MutableBoolean;
import android.view.AppTransitionAnimationSpec;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewConfiguration;

import com.android.internal.logging.MetricsLogger;
@@ -608,13 +608,14 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
            mDummyStackView.setTasks(stack, false /* allowNotifyStackChanges */);

            Rect taskViewBounds = stackLayout.getUntransformedTaskViewBounds();
            if (!taskViewBounds.isEmpty()) {
                int taskViewWidth = taskViewBounds.width();
                synchronized (mHeaderBarLock) {
                    if (mHeaderBar.getMeasuredWidth() != taskViewWidth ||
                            mHeaderBar.getMeasuredHeight() != mTaskBarHeight) {
                        mHeaderBar.measure(
                        View.MeasureSpec.makeMeasureSpec(taskViewWidth, View.MeasureSpec.EXACTLY),
                        View.MeasureSpec.makeMeasureSpec(mTaskBarHeight, View.MeasureSpec.EXACTLY));
                                MeasureSpec.makeMeasureSpec(taskViewWidth, MeasureSpec.EXACTLY),
                                MeasureSpec.makeMeasureSpec(mTaskBarHeight, MeasureSpec.EXACTLY));
                    }
                    mHeaderBar.layout(0, 0, taskViewWidth, mTaskBarHeight);
                }
@@ -628,6 +629,7 @@ public class RecentsImpl implements ActivityOptions.OnAnimationFinishedListener
                }
            }
        }
    }

    /**
     * Given the stable insets and the rect for our window, calculates the insets that affect our