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

Commit f4ad4434 authored by Jason Monk's avatar Jason Monk Committed by Android (Google) Code Review
Browse files

Merge "Make linkify handle emptys urls better DO NOT MERGE" into nyc-dev

parents b2301cb4 f01d1d5d

src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java

+20 −7
Original line number Diff line number Diff line
@@ -29,11 +29,13 @@ import android.text.Annotation; 
import android.text.SpannableString;

import android.text.SpannableStringBuilder;

import android.text.TextPaint;

import android.text.TextUtils;

import android.text.style.URLSpan;

import android.util.Log;

import android.view.View;



import com.android.internal.logging.MetricsProto.MetricsEvent;

import com.android.internal.util.CharSequences;

import com.android.settings.ChooseLockGeneric;

import com.android.settings.ChooseLockSettingsHelper;

import com.android.settingslib.HelpUtils;
@@ -205,6 +207,16 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase 
        public static CharSequence linkify(CharSequence rawText, String uri) {

            SpannableString msg = new SpannableString(rawText);

            Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);

            if (TextUtils.isEmpty(uri)) {

                CharSequence ret = rawText;

                for (Annotation annotation : spans) {

                    int start = msg.getSpanStart(annotation);

                    int end = msg.getSpanEnd(annotation);

                    ret = TextUtils.concat(ret.subSequence(0, start),

                            msg.subSequence(end, msg.length()));

                }

                return ret;

            } else {

                SpannableStringBuilder builder = new SpannableStringBuilder(msg);

                for (Annotation annotation : spans) {

                    int start = msg.getSpanStart(annotation);
@@ -216,3 +228,4 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase 
            }

        }

    }

}