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

Commit 51210042 authored by Ivan Chiang's avatar Ivan Chiang
Browse files

[PM] Support material AlertDialog (10/N) 

Use MaterialAlertDialog in InstallFailed dialogs

Flag: android.content.pm.use_pia_v2
Test: manual
Bug: 274120822
Change-Id: I38d210628bdf33cc14a4d01441e4af5a4d4ca44a
parent 20b52faf

packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/UiUtil.java

+28 −15
Original line number Diff line number Diff line
@@ -20,11 +20,13 @@ import android.app.AlertDialog; 
import android.app.Dialog;

import android.content.Context;

import android.content.DialogInterface;

import android.content.res.Resources;

import android.view.View;

import android.widget.Button;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.annotation.StringRes;



import com.android.packageinstaller.R;

import com.android.packageinstaller.v2.model.PackageUtil;
@@ -89,7 +91,8 @@ public class UiUtil { 
     * system AlertDialog.

     */

    public static Dialog getAlertDialog(@NonNull Context context, @NonNull String title,

            @NonNull View contentView, int positiveBtnTextResId, int negativeBtnTextResId,

            @NonNull View contentView, @StringRes int positiveBtnTextResId,

            @StringRes int negativeBtnTextResId,

            @Nullable DialogInterface.OnClickListener positiveBtnListener,

            @Nullable DialogInterface.OnClickListener negativeBtnListener) {

        return getAlertDialog(context, title, contentView, positiveBtnTextResId,
@@ -116,12 +119,18 @@ public class UiUtil { 
     * system AlertDialog.

     */

    public static Dialog getAlertDialog(@NonNull Context context,

            @NonNull String title, @NonNull View contentView, int positiveBtnTextResId,

            int negativeBtnTextResId, @Nullable DialogInterface.OnClickListener positiveBtnListener,

            @NonNull String title, @NonNull View contentView, @StringRes int positiveBtnTextResId,

            @StringRes int negativeBtnTextResId,

            @Nullable DialogInterface.OnClickListener positiveBtnListener,

            @Nullable DialogInterface.OnClickListener negativeBtnListener, int themeResId) {

        return getAlertDialog(context, title, contentView, context.getString(positiveBtnTextResId),

                context.getString(negativeBtnTextResId), positiveBtnListener, negativeBtnListener,

                themeResId);

        final String positiveBtnText =

                positiveBtnTextResId == Resources.ID_NULL ? null : context.getString(

                        positiveBtnTextResId);

        final String negativeBtnText =

                negativeBtnTextResId == Resources.ID_NULL ? null : context.getString(

                        negativeBtnTextResId);

        return getAlertDialog(context, title, contentView, positiveBtnText, negativeBtnText,

                positiveBtnListener, negativeBtnListener, themeResId);

    }



    /**
@@ -129,24 +138,28 @@ public class UiUtil { 
     * system AlertDialog.

     */

    public static Dialog getAlertDialog(@NonNull Context context,

            @NonNull String title, @NonNull View contentView, @NonNull String positiveBtnText,

            @NonNull String title, @NonNull View contentView, @Nullable String positiveBtnText,

            @NonNull String negativeBtnText,

            @Nullable DialogInterface.OnClickListener positiveBtnListener,

            @Nullable DialogInterface.OnClickListener negativeBtnListener, int themeResId) {

        if (PackageUtil.isMaterialDesignEnabled(context)) {

            return new MaterialAlertDialogBuilder(context, themeResId)

            MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(context, themeResId)

                    .setTitle(title)

                    .setView(contentView)

                    .setPositiveButton(positiveBtnText, positiveBtnListener)

                    .setNegativeButton(negativeBtnText, negativeBtnListener)

                    .create();

                    .setNegativeButton(negativeBtnText, negativeBtnListener);

            if (positiveBtnText != null) {

                builder.setPositiveButton(positiveBtnText, positiveBtnListener);

            }

            return builder.create();

        } else {

            return new AlertDialog.Builder(context, themeResId)

            AlertDialog.Builder builder = new AlertDialog.Builder(context, themeResId)

                    .setTitle(title)

                    .setView(contentView)

                    .setPositiveButton(positiveBtnText, positiveBtnListener)

                    .setNegativeButton(negativeBtnText, negativeBtnListener)

                    .create();

                    .setNegativeButton(negativeBtnText, negativeBtnListener);

            if (positiveBtnText != null) {

                builder.setPositiveButton(positiveBtnText, positiveBtnListener);

            }

            return builder.create();

        }

    }

}

packages/PackageInstaller/src/com/android/packageinstaller/v2/ui/fragments/InstallFailedFragment.java

+24 −23
Original line number Diff line number Diff line
@@ -23,12 +23,12 @@ import static com.android.packageinstaller.v2.model.PackageUtil.ARGS_RESULT_INTE 
import static com.android.packageinstaller.v2.model.PackageUtil.ARGS_SHOULD_RETURN_RESULT;

import static com.android.packageinstaller.v2.model.PackageUtil.ARGS_STATUS_CODE;



import android.app.AlertDialog;

import android.app.Dialog;

import android.content.Context;

import android.content.DialogInterface;

import android.content.Intent;

import android.content.pm.PackageInstaller;

import android.content.res.Resources;

import android.os.Bundle;

import android.util.Log;

import android.view.View;
@@ -43,6 +43,7 @@ import com.android.packageinstaller.R; 
import com.android.packageinstaller.v2.model.InstallFailed;

import com.android.packageinstaller.v2.model.PackageUtil.AppSnippet;

import com.android.packageinstaller.v2.ui.InstallActionListener;

import com.android.packageinstaller.v2.ui.UiUtil;



/**

 * Dialog to show when the installation failed. Depending on the failure code, an appropriate
@@ -93,62 +94,62 @@ public class InstallFailedFragment extends DialogFragment { 


        Log.i(LOG_TAG, "Creating " + LOG_TAG + "\n" + mDialogData);



        View dialogView = getLayoutInflater().inflate(R.layout.install_fragment_layout, null);

        View dialogView = getLayoutInflater().inflate(

                UiUtil.getInstallationLayoutResId(requireContext()), null);

        dialogView.requireViewById(R.id.custom_message).setVisibility(View.VISIBLE);

        dialogView.requireViewById(R.id.app_snippet).setVisibility(View.VISIBLE);

        ((ImageView) dialogView.requireViewById(R.id.app_icon))

            .setImageDrawable(mDialogData.getAppIcon());

        ((TextView) dialogView.requireViewById(R.id.app_label)).setText(mDialogData.getAppLabel());





        AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(requireContext())

                .setView(dialogView)

                .setNegativeButton(R.string.button_close,

                    (dialogInt, which) -> mInstallActionListener.onNegativeResponse(

                        mDialogData.getStageCode()));

        setDialogStringsFromErrorCode(mDialogData.getLegacyCode(), dialogBuilder, dialogView);



        return dialogBuilder.create();

        return getDialog(mDialogData.getLegacyCode(), dialogView);

    }



    /**

     * Set corresponding dialog title and message for the failure statusCode.

     * Get the dialog with corresponding dialog title and message for the failure statusCode.

     *

     * @param statusCode The status code from the package installer.

     */

    private void setDialogStringsFromErrorCode(int statusCode, AlertDialog.Builder builder,

                                               View dialogView) {

    private Dialog getDialog(int statusCode, View dialogView) {

        Log.i(LOG_TAG, "Installation status code: " + statusCode);



        TextView customMessage = dialogView.requireViewById(R.id.custom_message);

        final TextView customMessage = dialogView.requireViewById(R.id.custom_message);

        int titleResId = R.string.title_install_failed_not_installed;

        int positiveButtonResId = Resources.ID_NULL;

        DialogInterface.OnClickListener positiveButtonListener = null;

        switch (statusCode) {

            case PackageInstaller.STATUS_FAILURE_BLOCKED -> {

                customMessage.setText(R.string.message_install_failed_blocked);

                builder.setTitle(R.string.title_install_failed_blocked);

                titleResId = R.string.title_install_failed_blocked;

            }

            case PackageInstaller.STATUS_FAILURE_CONFLICT -> {

                customMessage.setText(R.string.message_install_failed_conflict);

                builder.setTitle(R.string.title_cant_install_app);

                titleResId = R.string.title_cant_install_app;

            }

            case PackageInstaller.STATUS_FAILURE_INCOMPATIBLE -> {

                customMessage.setText(R.string.message_install_failed_incompatible);

                builder.setTitle(R.string.title_install_failed_incompatible);

                titleResId = R.string.title_install_failed_incompatible;

            }

            case PackageInstaller.STATUS_FAILURE_INVALID -> {

                customMessage.setText(R.string.message_install_failed_invalid);

                builder.setTitle(R.string.title_cant_install_app);

                titleResId = R.string.title_cant_install_app;

            }

            case PackageInstaller.STATUS_FAILURE_STORAGE -> {

                customMessage.setText(R.string.message_install_failed_less_storage);

                builder.setTitle(R.string.title_install_failed_less_storage)

                        .setPositiveButton(R.string.button_manage_apps, (dialog, which) ->

                            mInstallActionListener.sendManageAppsIntent());

                titleResId = R.string.title_install_failed_less_storage;

                positiveButtonResId = R.string.button_manage_apps;

                positiveButtonListener = (dialog, which) ->

                            mInstallActionListener.sendManageAppsIntent();

            }

            default -> {

                customMessage.setVisibility(View.GONE);

                builder.setTitle(R.string.title_install_failed_not_installed);

            }

        }



        return UiUtil.getAlertDialog(requireContext(), getString(titleResId), dialogView,

                positiveButtonResId, R.string.button_close, positiveButtonListener,

                (dialogInt, which) -> mInstallActionListener.onNegativeResponse(

                        mDialogData.getStageCode()));

    }



    @Override