Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4987)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchControl.java

Issue 1173263002: Start removing [obj] characters from Contextual search panel. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add null check Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/OWNERS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchControl.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchControl.java b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchControl.java
index 17853b0110ca614a84fc49962bf7532b6e95ca45..7e26eb52ffcb4608ad647f49e125965ba375f683 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchControl.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/ContextualSearchControl.java
@@ -21,6 +21,13 @@ import org.chromium.ui.resources.dynamics.ViewResourceAdapter;
* Based on ToolbarControlContainer.
*/
public class ContextualSearchControl extends LinearLayout {
+ /**
+ * Object Replacement Character that is used in place of HTML objects that cannot be represented
+ * as text (e.g. images). Contextual search panel should not be displaying such characters as
+ * they get shown as [obj] character.
+ */
+ private static final String OBJ_CHARACTER = "\uFFFC";
+
private static final float RESOLVED_SEARCH_TERM_SIDE_PADDING_DP = 40.f;
private final int mSidePaddingPx;
@@ -106,9 +113,9 @@ public class ContextualSearchControl extends LinearLayout {
*/
public void setSearchContext(String selection, String start, String end) {
mSelectionText.setPadding(0, 0, 0, 0);
- mSelectionText.setText(selection);
- mStartText.setText(start);
- mEndText.setText(end);
+ mSelectionText.setText(sanitizeText(selection));
+ mStartText.setText(sanitizeText(start));
+ mEndText.setText(sanitizeText(end));
mIsDirty = true;
}
@@ -123,4 +130,9 @@ public class ContextualSearchControl extends LinearLayout {
mEndText.setText("");
mIsDirty = true;
}
+
+ private String sanitizeText(String text) {
+ if (text == null) return null;
+ return text.replace(OBJ_CHARACTER, " ");
+ }
}
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/contextualsearch/OWNERS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698