Merge "[ADI][69/N] Add Learn More link with relevant URL" into main (a571c371) · Commits · e / os / android_frameworks_base

packages/PackageInstaller/res/values/strings_v2.xml

+16 −7

Original line number	Diff line number	Diff line
		@@ -151,10 +151,13 @@
		<!-- Message presented in a dialog box when the verifier blocked an app from being installed. [CHAR LIMIT=none]-->
		<string name="cannot_install_app_blocked_summary"><p>This app was blocked. To help keep your
		device and data safe, only apps from verified developers can be installed.</p>
		</string>
		<a href="https://g.co/android/developer">Learn more about developer
		verification</a></string>
		<!-- Message presented in a dialog box when the verifier blocked an app from being updated. [CHAR LIMIT=none]-->
		<string name="cannot_update_app_blocked_summary"><p>This app was not updated. To help keep your
		device and data safe, only updates from verified developers can be installed.</p>
		<a href="https://g.co/android/developer">Learn more about developer
		verification</a>
		</string>
		<!-- Message presented in a dialog box when verification failed due to problems with the network during installation. [CHAR LIMIT=none]-->
		<string name="cannot_install_verification_no_internet_summary"><p>This app was not installed.
		@@ -162,35 +165,41 @@
		<p>An internet connection is required to verify the app developer.
		Check your connection, then try installing again.
		</p>
		</string>
		<a href="https://g.co/android/developer">Learn more about developer
		verification</a></string>
		<!-- Message presented in a dialog box when verification failed due to problems with the network during update. [CHAR LIMIT=none]-->
		<string name="cannot_update_verification_no_internet_summary"><p>This app was not updated.
		Updates from unverified developers may be unsafe.</p>
		<p>An internet connection is required to verify the app developer.
		Check your connection, then try updating again.
		</p>
		</string>
		<a href="https://g.co/android/developer">Learn more about developer
		verification</a></string>

		<!-- Message presented in a dialog box when verification failed due to internal failures during installation. [CHAR LIMIT=none]-->
		<string name="cannot_install_verification_unavailable_summary"><p>There was a problem verifying
		this app\'s developer. Apps from unverified developers may be unsafe,
		so the app was not installed.</p>
		</string>
		<a href="https://g.co/android/developer">Learn more about developer
		verification</a></string>
		<!-- Message presented in a dialog box when verification failed due to problems with the network during update. [CHAR LIMIT=none]-->
		<string name="cannot_update_verification_unavailable_summary"><p>There was a problem verifying
		this app\'s developer. Updates from unverified developers may be unsafe,
		so the app was not updated.</p>
		</string>
		<a href="https://g.co/android/developer">Learn more about developer
		verification</a></string>
		<!-- Message presented in a dialog box when verification failed due to internal failures during installation for fail closed policy. [CHAR LIMIT=none]-->
		<string name="cannot_install_verification_unavailable_fail_closed_summary"><p>This app was blocked
		because there was a problem verifying the developer. To help keep your device and data safe,
		only apps from verified developers can be installed.</p>
		</string>
		<a href="https://g.co/android/developer">Learn more about developer
		verification</a></string>
		<!-- Message presented in a dialog box when verification failed due to internal failures during update for fail closed policy. [CHAR LIMIT=none]-->
		<string name="cannot_update_verification_unavailable_fail_closed_summary"><p>This app was not updated
		because there was a problem verifying the developer. To help keep your device and data safe,
		only updates from verified developers can be installed.</p>
		</string>
		<a href="https://g.co/android/developer">Learn more about developer
		verification</a></string>

		<string name="more_details_expanded_install_summary">If you install without verifying, keep in
		mind apps from unverified developers may put your device and data at risk.</string>

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,7 @@ import android.content.pm.ResolveInfo;
		import android.graphics.Typeface;
		import android.os.Bundle;
		import android.text.Html;
		import android.text.method.LinkMovementMethod;
		import android.util.Log;
		import android.view.View;
		import android.view.accessibility.AccessibilityNodeInfo;
		@@ -204,6 +205,9 @@ public class InstallationFragment extends DialogFragment {
		mCustomViewPanel.setPadding(paddingHorizontal, paddingTop,
		paddingHorizontal, paddingBottom);

		// Reset the movement method to avoid unexpected issue
		mCustomMessageTextView.setMovementMethod(null);

		switch (installStage.getStageCode()) {
		case InstallStage.STAGE_ABORTED -> {
		updateInstallAbortedUI(mDialog, (InstallAborted) installStage);
		@@ -713,6 +717,7 @@ public class InstallationFragment extends DialogFragment {
		dialog.setTitle(titleResId);
		mCustomMessageTextView.setText(
		Html.fromHtml(getString(msgResId), Html.FROM_HTML_MODE_LEGACY));
		mCustomMessageTextView.setMovementMethod(LinkMovementMethod.getInstance());

		// Set negative button
		Button negativeButton = UiUtil.getAlertDialogNegativeButton(dialog);
		@@ -763,6 +768,7 @@ public class InstallationFragment extends DialogFragment {
		dialog.setTitle(titleResId);
		mCustomMessageTextView.setText(
		Html.fromHtml(getString(msgResId), Html.FROM_HTML_MODE_LEGACY));
		mCustomMessageTextView.setMovementMethod(LinkMovementMethod.getInstance());

		// Set negative button
		Button negativeButton = UiUtil.getAlertDialogNegativeButton(dialog);