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

Commit f224840b authored by Pawan Wagh's avatar Pawan Wagh Committed by Automerger Merge Worker
Browse files

Merge "Make links in dialog text clickable" into main am: 12ff1e24

parents 231766c4 12ff1e24
Loading
Loading
Loading
Loading
+16 −1
Original line number Diff line number Diff line
@@ -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());
    }
}