Merge "Fix RestartDialog Regression" into main

package com.android.wm.shell.compatui;

import static android.provider.Settings.Secure.LAUNCHER_TASKBAR_EDUCATION_SHOWING;

import static android.window.TaskConstants.TASK_CHILD_LAYER_COMPAT_UI;

import android.annotation.Nullable;

import android.app.TaskInfo;

import android.content.Context;

import android.graphics.Rect;

import android.provider.Settings;

import android.util.Pair;

import android.view.LayoutInflater;

import android.view.View;

    @Override

    protected boolean eligibleToShowLayout() {

        // We don't show this dialog if the user has explicitly selected so clicking on a checkbox.

        return mRequestRestartDialog && !isTaskbarEduShowing() && (mLayout != null

        return mRequestRestartDialog && (mLayout != null

                || mCompatUIConfiguration.shouldShowRestartDialogAgain(getLastTaskInfo()));

    }

        return getWindowLayoutParams(/* width= */ taskBounds.width(), /* height= */

                taskBounds.height());

    }

    @VisibleForTesting

    boolean isTaskbarEduShowing() {

        return Settings.Secure.getInt(mContext.getContentResolver(),

                LAUNCHER_TASKBAR_EDUCATION_SHOWING, /* def= */ 0) == 1;

    }

}