From 7d0d858136df1c72f8d817d5bc7cd8e027b83012 Mon Sep 17 00:00:00 2001 From: Pawan Wagh Date: Thu, 2 May 2024 18:02:53 +0000 Subject: [PATCH] Make links in dialog text clickable Test: m Settings && adb install -r $ANDROID_PRODUCT_OUT/system_ext/priv-app/Settings/Settings.apk Bug: 295035851 Change-Id: I71d4f5cb1e27cd52e6f0c5aaeabc9b3f89520cf1 --- .../development/Enable16KOemUnlockDialog.java | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/com/android/settings/development/Enable16KOemUnlockDialog.java b/src/com/android/settings/development/Enable16KOemUnlockDialog.java index 65690df7ab4..8ddded41057 100644 --- a/src/com/android/settings/development/Enable16KOemUnlockDialog.java +++ b/src/com/android/settings/development/Enable16KOemUnlockDialog.java @@ -16,10 +16,15 @@ package com.android.settings.development; +import static androidx.core.text.HtmlCompat.FROM_HTML_MODE_COMPACT; + import android.app.Dialog; import android.app.settings.SettingsEnums; import android.content.DialogInterface; import android.os.Bundle; +import android.text.Html; +import android.text.method.LinkMovementMethod; +import android.widget.TextView; import androidx.annotation.NonNull; import androidx.annotation.Nullable; @@ -60,7 +65,10 @@ public class Enable16KOemUnlockDialog extends InstrumentedDialogFragment public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { return new AlertDialog.Builder(getActivity()) .setTitle(R.string.confirm_oem_unlock_for_16k_title) - .setMessage(R.string.confirm_oem_unlock_for_16k_text) + .setMessage( + Html.fromHtml( + getString(R.string.confirm_oem_unlock_for_16k_text), + FROM_HTML_MODE_COMPACT)) .setPositiveButton(android.R.string.ok, this /* onClickListener */) .create(); } @@ -74,4 +82,11 @@ public class Enable16KOemUnlockDialog extends InstrumentedDialogFragment public void onDismiss(@NonNull DialogInterface dialog) { super.onDismiss(dialog); } + + @Override + public void onStart() { + super.onStart(); + ((TextView) getDialog().findViewById(android.R.id.message)) + .setMovementMethod(LinkMovementMethod.getInstance()); + } }