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

Make linkify handle emptys urls better DO NOT MERGE

Browse Source 
Change-Id: I60029b02e6cda334a8c66ba8453be28b35a818a3
Fixes: 29045818
This commit is contained in:
Jason Monk
2016-06-13 13:08:32 -04:00
parent 98704bc495
commit f01d1d5dcb
1 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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
}
}
}
}