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

Fine-tune the widget of "Allow rich content in Accessibility Settings" for security.

Browse Source 
1. Remove tag checker in HtmlTextPreference.
2. Set the max height for AnimatedImagePreference.

Bug: 149516547
Test: manaul test
Change-Id: I98f49d055db9427d91a3f1ca816e94a11d29cd3d
This commit is contained in:
Peter_Liang
2020-02-18 13:27:05 +08:00
committed by Menghan Li
parent ee1dacb338
commit 10bc375176
5 changed files with 81 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/com/android/settings/accessibility/HtmlTextPreference.java
View File

@@ -23,9 +23,6 @@ import android.widget.TextView;
import androidx.preference.PreferenceViewHolder;
import java.util.List;
import java.util.regex.Pattern;
/**
* A custom {@link android.widget.TextView} preference that shows html text with a custom tag
* filter.
@@ -35,7 +32,6 @@ public final class HtmlTextPreference extends StaticTextPreference {
private int mFlag = Html.FROM_HTML_MODE_COMPACT;
private Html.ImageGetter mImageGetter;
private Html.TagHandler mTagHandler;
private List<String> mUnsupportedTagList;
HtmlTextPreference(Context context) {
super(context);
@@ -47,8 +43,8 @@ public final class HtmlTextPreference extends StaticTextPreference {
final TextView summaryView = holder.itemView.findViewById(android.R.id.summary);
if (summaryView != null && !TextUtils.isEmpty(getSummary())) {
final String filteredText = getFilteredText(getSummary().toString());
summaryView.setText(Html.fromHtml(filteredText, mFlag, mImageGetter, mTagHandler));
summaryView.setText(
Html.fromHtml(getSummary().toString(), mFlag, mImageGetter, mTagHandler));
}
}
@@ -87,39 +83,4 @@ public final class HtmlTextPreference extends StaticTextPreference {
notifyChanged();
}
}
/**
* Sets unsupported tag list, the text will be filtered though this list in advanced.
*
* @param unsupportedTagList the list of unsupported tags
*/
public void setUnsupportedTagList(List<String> unsupportedTagList) {
if (unsupportedTagList != null && !unsupportedTagList.equals(mUnsupportedTagList)) {
mUnsupportedTagList = unsupportedTagList;
notifyChanged();
}
}
private String getFilteredText(String text) {
if (mUnsupportedTagList == null) {
return text;
}
int i = 1;
for (String tag : mUnsupportedTagList) {
if (!TextUtils.isEmpty(text)) {
final String index = String.valueOf(i++);
final String targetStart1 = "(?i)<" + tag + " ";
final String targetStart2 = "(?i)<" + tag + ">";
final String replacementStart1 = "<unsupportedtag" + index + " ";
final String replacementStart2 = "<unsupportedtag" + index + ">";
final String targetEnd = "(?i)</" + tag + ">";
final String replacementEnd = "</unsupportedtag" + index + ">";
text = Pattern.compile(targetStart1).matcher(text).replaceAll(replacementStart1);
text = Pattern.compile(targetStart2).matcher(text).replaceAll(replacementStart2);
text = Pattern.compile(targetEnd).matcher(text).replaceAll(replacementEnd);
}
}
return text;
}
}