Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "trim and strip html tags for load safe label name" into nyc-dev

Browse Source
This commit is contained in:
Chen Xu
2016-06-01 16:47:17 +00:00
committed by Android (Google) Code Review
parent 438693dd6c e630f35322
commit c16bc88fc9
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/content/pm/PackageItemInfo.java
View File

@@ -25,6 +25,7 @@ import android.os.Bundle;
import android.os.Parcel; import android.os.Parcel;
import android.os.UserHandle; import android.os.UserHandle;
import android.text.BidiFormatter; import android.text.BidiFormatter;
import android.text.Html;
import android.text.TextPaint; import android.text.TextPaint;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Printer; import android.util.Printer;
@@ -164,12 +165,13 @@ public class PackageItemInfo {
@SystemApi @SystemApi
public @NonNull CharSequence loadSafeLabel(@NonNull PackageManager pm) { public @NonNull CharSequence loadSafeLabel(@NonNull PackageManager pm) {
// loadLabel() always returns non-null // loadLabel() always returns non-null
CharSequence label = loadLabel(pm); String label = loadLabel(pm).toString();
// strip HTML tags to avoid <br> and other tags overwriting original message
String labelStr = Html.fromHtml(label).toString();
// If the label contains new line characters it may push the UI // If the label contains new line characters it may push the UI
// down to hide a part of it. Labels shouldn't have new line // down to hide a part of it. Labels shouldn't have new line
// characters, so just truncate at the first time one is seen. // characters, so just truncate at the first time one is seen.
String labelStr = label.toString();
final int labelLength = labelStr.length(); final int labelLength = labelStr.length();
int offset = 0; int offset = 0;
while (offset < labelLength) { while (offset < labelLength) {
@@ -181,13 +183,18 @@ public class PackageItemInfo {
labelStr = labelStr.substring(0, offset); labelStr = labelStr.substring(0, offset);
break; break;
} }
// replace all non-break space to " " in order to be trimmed
if (type == Character.SPACE_SEPARATOR) {
labelStr = labelStr.substring(0, offset) + " " + labelStr.substring(offset +
Character.charCount(codePoint));
}
offset += Character.charCount(codePoint); offset += Character.charCount(codePoint);
} }
labelStr = labelStr.trim();
if (labelStr.isEmpty()) { if (labelStr.isEmpty()) {
return labelStr; return packageName;
} }
TextPaint paint = new TextPaint(); TextPaint paint = new TextPaint();
paint.setTextSize(42); paint.setTextSize(42);