Merge changes I3ea38f83,Iee1525d3 into main (0c93656c) · Commits · e / os / android_frameworks_base

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

+66 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.content.DialogInterface;
		import android.content.res.ColorStateList;
		import android.content.res.Resources;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.Button;

		import androidx.annotation.NonNull;
		@@ -35,6 +36,9 @@ import com.android.packageinstaller.v2.model.PackageUtil;
		import com.google.android.material.button.MaterialButton;
		import com.google.android.material.dialog.MaterialAlertDialogBuilder;

		import java.util.ArrayList;
		import java.util.List;

		/**
		* The utility of UI components.
		*/
		@@ -207,6 +211,8 @@ public class UiUtil {
		context.getColor(R.color.onPrimaryColor)));
		materialButton.setStrokeColor(
		ColorStateList.valueOf(context.getColor(android.R.color.transparent)));
		materialButton.setRippleColor(ColorStateList.valueOf(
		context.getColor(R.color.m3_button_ripple_color_selector)));
		}
		}

		@@ -227,6 +233,8 @@ public class UiUtil {
		ColorStateList.valueOf(context.getColor(R.color.primaryColor)));
		materialButton.setStrokeColor(
		ColorStateList.valueOf(context.getColor(R.color.outlineVariantColor)));
		materialButton.setRippleColor(ColorStateList.valueOf(
		context.getColor(R.color.m3_button_ripple_color_selector)));
		}
		}

		@@ -247,6 +255,64 @@ public class UiUtil {
		ColorStateList.valueOf(context.getColor(R.color.primaryColor)));
		materialButton.setStrokeColor(
		ColorStateList.valueOf(context.getColor(android.R.color.transparent)));
		materialButton.setRippleColor(ColorStateList.valueOf(
		context.getColor(R.color.m3_text_button_ripple_color_selector)));
		}
		}

		/**
		* Update the button bar layout if needed
		*/
		public static void updateButtonBarLayoutIfNeeded(@NonNull Context context,
		@NonNull Dialog dialog) {
		// Don't need to handle the material alertdialog case. It has already been handled.
		if (PackageUtil.isMaterialDesignEnabled(context)) {
		return;
		}
		final Button positiveButton = getAlertDialogPositiveButton(dialog);
		if (positiveButton == null) {
		return;
		}

		final ViewGroup parent = (ViewGroup) positiveButton.getParent();
		final List<Integer> visibleButtonIndexList = new ArrayList<>();
		final List<Integer> nonButtonChildIndexList = new ArrayList<>();

		// Get the count of the visible buttons and the non-button children.
		for (int i = 0, count = parent.getChildCount(); i < count; i++) {
		View child = parent.getChildAt(i);
		if (child instanceof Button) {
		if (child.getVisibility() == View.VISIBLE) {
		visibleButtonIndexList.add(i);
		}
		} else {
		// The width of the layoutParams of the space children is 0 and the weight is 1,
		// don't change the visibility of them
		if (child.getLayoutParams().width != 0) {
		nonButtonChildIndexList.add(i);
		}
		}
		}

		final int firstVisibleButtonIndex = visibleButtonIndexList.isEmpty()
		? -1 : visibleButtonIndexList.getFirst();
		final int lastVisibleButtonIndex = visibleButtonIndexList.isEmpty()
		? -1 : visibleButtonIndexList.getLast();
		// Set the visibility of the non-button children except the space children
		for (int i = 0, count = nonButtonChildIndexList.size(); i < count; i++) {
		final int currentChildIndex = nonButtonChildIndexList.get(i);
		if (visibleButtonIndexList.size() <= 1) {
		parent.getChildAt(currentChildIndex).setVisibility(View.GONE);
		} else {
		if (currentChildIndex < firstVisibleButtonIndex) {
		parent.getChildAt(currentChildIndex).setVisibility(View.GONE);
		} else if (currentChildIndex > firstVisibleButtonIndex
		&& currentChildIndex < lastVisibleButtonIndex) {
		parent.getChildAt(currentChildIndex).setVisibility(View.VISIBLE);
		} else {
		parent.getChildAt(currentChildIndex).setVisibility(View.GONE);
		}
		}
		}
		}
		}

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

+3 −13

Original line number	Diff line number	Diff line
		@@ -153,6 +153,7 @@ public class InstallationFragment extends DialogFragment {

		// Get the current install stage
		final InstallStage installStage = getCurrentInstallStage();
		this.setCancelable(true);

		// show the title and reset the paddings of the custom message textview
		if (mTitleTemplate != null) {
		@@ -188,6 +189,8 @@ public class InstallationFragment extends DialogFragment {
		updateUserActionRequiredUI(mDialog, (InstallUserActionRequired) installStage);
		}
		}

		UiUtil.updateButtonBarLayoutIfNeeded(requireContext(), mDialog);
		}

		private void updateInstallAbortedUI(Dialog dialog, InstallAborted installStage) {
		@@ -220,9 +223,6 @@ public class InstallationFragment extends DialogFragment {
		installStage.getActivityResultCode(), installStage.getResultIntent());
		});
		}

		// Cancelable is false
		this.setCancelable(false);
		}

		private void updateInstallFailedUI(Dialog dialog, InstallFailed installStage) {
		@@ -297,8 +297,6 @@ public class InstallationFragment extends DialogFragment {
		mInstallActionListener.onNegativeResponse(installStage.getStageCode());
		});
		}

		this.setCancelable(true);
		}

		private void updateInstallInstallingUI(Dialog dialog, InstallInstalling installStage) {
		@@ -424,8 +422,6 @@ public class InstallationFragment extends DialogFragment {
		mInstallActionListener.onNegativeResponse(installStage.getStageCode());
		});
		}

		this.setCancelable(true);
		}

		private void updateUserActionRequiredUI(Dialog dialog, InstallUserActionRequired installStage) {
		@@ -481,8 +477,6 @@ public class InstallationFragment extends DialogFragment {
		mInstallActionListener.onNegativeResponse(installStage.getStageCode());
		});
		}

		this.setCancelable(true);
		}

		private void updateAnonymousSourceUI(Dialog dialog, InstallUserActionRequired installStage) {
		@@ -529,8 +523,6 @@ public class InstallationFragment extends DialogFragment {
		mInstallActionListener.onNegativeResponse(installStage.getStageCode());
		});
		}

		this.setCancelable(true);
		}

		private void updateInstallConfirmationUI(Dialog dialog,
		@@ -603,8 +595,6 @@ public class InstallationFragment extends DialogFragment {
		mInstallActionListener.onNegativeResponse(installStage.getStageCode());
		});
		}

		this.setCancelable(true);
		}

		/**

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -139,6 +139,8 @@ public class UnarchiveFragment extends DialogFragment {
		updateUserActionRequiredUI(mDialog, (UnarchiveUserActionRequired) unarchiveStage);
		}
		}

		UiUtil.updateButtonBarLayoutIfNeeded(requireContext(), mDialog);
		}

		private void updateUnarchiveErrorUI(Dialog dialog, UnarchiveError unarchiveStage) {

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -126,6 +126,8 @@ public class UninstallationFragment extends DialogFragment {
		updateUserActionRequiredUI(mDialog, (UninstallUserActionRequired) uninstallStage);
		}
		}

		UiUtil.updateButtonBarLayoutIfNeeded(requireContext(), mDialog);
		}

		private void updateUninstallAbortedUI(Dialog dialog, UninstallAborted uninstallStage) {