PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: f4ad4434f1

Change-Id: Ic52d42c920c29942dbcca880fa70bdde69cb1960
This commit is contained in:
Jason Monk
2016-06-15 15:03:26 +00:00
committed by android-build-merger
parent 7803e3f76b f4ad4434f1
commit 4904ba543e
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/fingerprint/FingerprintEnrollIntroduction.java
View File

@@ -29,11 +29,13 @@ import android.text.Annotation;
import android.text.SpannableString; import android.text.SpannableString;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.TextUtils;
import android.text.style.URLSpan; import android.text.style.URLSpan;
import android.util.Log; import android.util.Log;
import android.view.View; import android.view.View;
import com.android.internal.logging.MetricsProto.MetricsEvent; import com.android.internal.logging.MetricsProto.MetricsEvent;
import com.android.internal.util.CharSequences;
import com.android.settings.ChooseLockGeneric; import com.android.settings.ChooseLockGeneric;
import com.android.settings.ChooseLockSettingsHelper; import com.android.settings.ChooseLockSettingsHelper;
import com.android.settingslib.HelpUtils; import com.android.settingslib.HelpUtils;
@@ -205,14 +207,25 @@ public class FingerprintEnrollIntroduction extends FingerprintEnrollBase
public static CharSequence linkify(CharSequence rawText, String uri) { public static CharSequence linkify(CharSequence rawText, String uri) {
SpannableString msg = new SpannableString(rawText); SpannableString msg = new SpannableString(rawText);
Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class); Annotation[] spans = msg.getSpans(0, msg.length(), Annotation.class);
SpannableStringBuilder builder = new SpannableStringBuilder(msg); if (TextUtils.isEmpty(uri)) {
for (Annotation annotation : spans) { CharSequence ret = rawText;
int start = msg.getSpanStart(annotation); for (Annotation annotation : spans) {
int end = msg.getSpanEnd(annotation); int start = msg.getSpanStart(annotation);
LearnMoreSpan link = new LearnMoreSpan(uri); int end = msg.getSpanEnd(annotation);
builder.setSpan(link, start, end, msg.getSpanFlags(link)); 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);
int end = msg.getSpanEnd(annotation);
LearnMoreSpan link = new LearnMoreSpan(uri);
builder.setSpan(link, start, end, msg.getSpanFlags(link));
}
return builder;
} }
return builder;
} }
} }
} }