Skip to content

GitLab

T
tangled
Commit 52aea3d0 authored by Tomasz Wiszkowski's avatar Tomasz Wiszkowski Committed by Commit Bot
Browse files
Options

Allow BaseSuggestion to host arbitrary number of Action icons. 

Change-Id: Iee930bac15483daaf0bb7a88ab48af0007717a7d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2219580
Commit-Queue: Ender <ender@google.com>
Reviewed-by: default avatarFilip Gorski <fgorski@chromium.org>
Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#773830}
parent 2e1adfe0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 335 additions and 152 deletions
chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionView.java
View file @ 52aea3d0
......@@ -21,6 +21,9 @@ import org.chromium.chrome.browser.omnibox.suggestions.basic.SuggestionViewDeleg
import org.chromium.chrome.browser.util.KeyNavigationUtil;
import org.chromium.components.browser_ui.widget.RoundedCornerImageView;
import java.util.ArrayList;
import java.util.List;
/**
* Base layout for common suggestion types. Includes support for a configurable suggestion content
* and the common suggestion patterns shared across suggestion formats.
......@@ -28,9 +31,9 @@ import org.chromium.components.browser_ui.widget.RoundedCornerImageView;
* @param <T> The type of View being wrapped by this container.
*/
public class BaseSuggestionView<T extends View> extends SimpleHorizontalLayoutView {
protected final ImageView mActionView;
protected final DecoratedSuggestionView<T> mDecoratedView;
private final List<ImageView> mActionButtons;
private final @DrawableRes int mSelectableBackgroundRes;
private final DecoratedSuggestionView<T> mDecoratedView;
private SuggestionViewDelegate mDelegate;
/**
......@@ -43,10 +46,9 @@ public class BaseSuggestionView<T extends View> extends SimpleHorizontalLayoutVi
TypedValue themeRes = new TypedValue();
getContext().getTheme().resolveAttribute(R.attr.selectableItemBackground, themeRes, true);
@DrawableRes
int selectableBackgroundRes = themeRes.resourceId;
mSelectableBackgroundRes = themeRes.resourceId;
mDecoratedView = new DecoratedSuggestionView<>(getContext(), selectableBackgroundRes);
mDecoratedView = new DecoratedSuggestionView<>(getContext(), mSelectableBackgroundRes);
mDecoratedView.setOnClickListener(v -> mDelegate.onSelection());
mDecoratedView.setOnLongClickListener(v -> {
mDelegate.onLongPress();
......@@ -55,23 +57,66 @@ public class BaseSuggestionView<T extends View> extends SimpleHorizontalLayoutVi
mDecoratedView.setLayoutParams(LayoutParams.forDynamicView());
addView(mDecoratedView);
// Action icons. Currently we only support the Refine button.
mActionView = new AppCompatImageView(getContext());
mActionView.setBackgroundResource(selectableBackgroundRes);
mActionView.setClickable(true);
mActionView.setFocusable(true);
mActionView.setScaleType(ImageView.ScaleType.CENTER);
mActionView.setContentDescription(
getResources().getString(R.string.accessibility_omnibox_btn_refine));
mActionView.setImageResource(R.drawable.btn_suggestion_refine);
mActionView.setLayoutParams(new LayoutParams(
getResources().getDimensionPixelSize(R.dimen.omnibox_suggestion_action_icon_width),
LayoutParams.MATCH_PARENT));
addView(mActionView);
mActionButtons = new ArrayList<>();
setContentView(view);
}
/**
* Prepare (truncate or add) Action views for the Suggestion.
*
* @param desiredViewCount Number of action views for this suggestion.
*/
void setActionButtonsCount(int desiredViewCount) {
final int currentViewCount = mActionButtons.size();
if (currentViewCount < desiredViewCount) {
increaseActionButtonsCount(desiredViewCount);
} else if (currentViewCount > desiredViewCount) {
decreaseActionButtonsCount(desiredViewCount);
}
}
/**
* @return List of Action views.
*/
List<ImageView> getActionButtons() {
return mActionButtons;
}
/**
* Create additional action buttons for the suggestion view.
*
* @param desiredViewCount Desired number of action buttons.
*/
private void increaseActionButtonsCount(int desiredViewCount) {
for (int index = mActionButtons.size(); index < desiredViewCount; index++) {
ImageView actionView = new AppCompatImageView(getContext());
actionView.setBackgroundResource(mSelectableBackgroundRes);
actionView.setClickable(true);
actionView.setFocusable(true);
actionView.setScaleType(ImageView.ScaleType.CENTER);
actionView.setLayoutParams(
new LayoutParams(getResources().getDimensionPixelSize(
R.dimen.omnibox_suggestion_action_icon_width),
LayoutParams.MATCH_PARENT));
mActionButtons.add(actionView);
addView(actionView);
}
}
/**
* Remove unused action views from the suggestion view.
*
* @param desiredViewCount Desired target number of action buttons.
*/
private void decreaseActionButtonsCount(int desiredViewCount) {
for (int index = desiredViewCount; index < mActionButtons.size(); index++) {
removeView(mActionButtons.get(index));
}
mActionButtons.subList(desiredViewCount, mActionButtons.size()).clear();
}
/**
* Constructs a new suggestion view and inflates supplied layout as the contents view.
*
......@@ -99,7 +144,10 @@ public class BaseSuggestionView<T extends View> extends SimpleHorizontalLayoutVi
boolean isRtl = getLayoutDirection() == LAYOUT_DIRECTION_RTL;
if ((!isRtl && KeyNavigationUtil.isGoRight(event))
|| (isRtl && KeyNavigationUtil.isGoLeft(event))) {
return mActionView.callOnClick();
// For views with exactly 1 action icon, continue to support the arrow key triggers.
if (mActionButtons.size() == 1) {
mActionButtons.get(0).callOnClick();
}
}
return super.onKeyDown(keyCode, event);
}
......@@ -144,9 +192,4 @@ public class BaseSuggestionView<T extends View> extends SimpleHorizontalLayoutVi
RoundedCornerImageView getSuggestionImageView() {
return mDecoratedView.getImageView();
}
/** @return Widget holding action icon. */
ImageView getActionImageView() {
return mActionView;
}
}
chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewBinder.java
View file @ 52aea3d0
......@@ -16,12 +16,15 @@ import androidx.core.view.ViewCompat;
import org.chromium.base.ApiCompatibilityUtils;
import org.chromium.chrome.R;
import org.chromium.chrome.browser.omnibox.suggestions.SuggestionCommonProperties;
import org.chromium.chrome.browser.omnibox.suggestions.base.BaseSuggestionViewProperties.Action;
import org.chromium.components.browser_ui.styles.ChromeColors;
import org.chromium.components.browser_ui.widget.RoundedCornerImageView;
import org.chromium.ui.modelutil.PropertyKey;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor.ViewBinder;
import java.util.List;
/**
* Binds base suggestion view properties.
*
......@@ -48,15 +51,6 @@ public final class BaseSuggestionViewBinder<T extends View>
} else if (BaseSuggestionViewProperties.ICON == propertyKey) {
updateSuggestionIcon(model, view);
updateContentViewPadding(model, view.getDecoratedSuggestionView());
} else if (BaseSuggestionViewProperties.ACTION_ICON == propertyKey) {
updateActionIcon(model, view);
} else if (BaseSuggestionViewProperties.ACTION_CALLBACK == propertyKey) {
final Runnable callback = model.get(BaseSuggestionViewProperties.ACTION_CALLBACK);
if (callback != null) {
view.getActionImageView().setOnClickListener(v -> callback.run());
} else {
view.getActionImageView().setOnClickListener(null);
}
} else if (BaseSuggestionViewProperties.DENSITY == propertyKey) {
updateContentViewPadding(model, view.getDecoratedSuggestionView());
} else if (SuggestionCommonProperties.LAYOUT_DIRECTION == propertyKey) {
......@@ -64,8 +58,39 @@ public final class BaseSuggestionViewBinder<T extends View>
view, model.get(SuggestionCommonProperties.LAYOUT_DIRECTION));
updateContentViewPadding(model, view.getDecoratedSuggestionView());
} else if (SuggestionCommonProperties.USE_DARK_COLORS == propertyKey) {
updateSuggestionIcon(model, view);
updateActionIcon(model, view);
updateColorScheme(model, view);
} else if (BaseSuggestionViewProperties.ACTIONS == propertyKey) {
bindActionButtons(model, view, model.get(BaseSuggestionViewProperties.ACTIONS));
}
}
/** Bind Action Icons for the suggestion view. */
private static <T extends View> void bindActionButtons(
PropertyModel model, BaseSuggestionView<T> view, List<Action> actions) {
final int actionCount = actions != null ? actions.size() : 0;
view.setActionButtonsCount(actionCount);
final List<ImageView> actionViews = view.getActionButtons();
for (int index = 0; index < actionCount; index++) {
final ImageView actionView = actionViews.get(index);
final Action action = actions.get(index);
actionView.setOnClickListener(v -> action.callback.run());
actionView.setContentDescription(
view.getContext().getResources().getString(action.accessibilityDescription));
updateIcon(actionView, action.icon,
ChromeColors.getPrimaryIconTintRes(!isDarkMode(model)));
}
}
/** Update visual theme to reflect dark mode UI theme update. */
private static <T extends View> void updateColorScheme(
PropertyModel model, BaseSuggestionView<T> view) {
updateSuggestionIcon(model, view);
final List<Action> actions = model.get(BaseSuggestionViewProperties.ACTIONS);
final List<ImageView> actionViews = view.getActionButtons();
for (int index = 0; index < actionViews.size(); index++) {
updateIcon(actionViews.get(index), actions.get(index).icon,
ChromeColors.getPrimaryIconTintRes(!isDarkMode(model)));
}
}
......@@ -106,14 +131,6 @@ public final class BaseSuggestionViewBinder<T extends View>
updateIcon(rciv, sds, ChromeColors.getSecondaryIconTintRes(!isDarkMode(model)));
}
/** Update attributes of decorated suggestion icon. */
private static <T extends View> void updateActionIcon(
PropertyModel model, BaseSuggestionView<T> baseView) {
final ImageView view = baseView.getActionImageView();
final SuggestionDrawableState sds = model.get(BaseSuggestionViewProperties.ACTION_ICON);
updateIcon(view, sds, ChromeColors.getPrimaryIconTintRes(!isDarkMode(model)));
}
/**
* Update content view padding.
* This is required only to adjust the leading padding for undecorated suggestions.
......
chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewProcessor.java
View file @ 52aea3d0
......@@ -18,12 +18,14 @@ import org.chromium.chrome.browser.omnibox.MatchClassificationStyle;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion;
import org.chromium.chrome.browser.omnibox.suggestions.OmniboxSuggestion.MatchClassification;
import org.chromium.chrome.browser.omnibox.suggestions.SuggestionProcessor;
import org.chromium.chrome.browser.omnibox.suggestions.base.BaseSuggestionViewProperties.Action;
import org.chromium.chrome.browser.omnibox.suggestions.basic.SuggestionHost;
import org.chromium.chrome.browser.omnibox.suggestions.basic.SuggestionViewDelegate;
import org.chromium.chrome.browser.ui.favicon.LargeIconBridge;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.url.GURL;
import java.util.Arrays;
import java.util.List;
/**
......@@ -96,13 +98,10 @@ public abstract class BaseSuggestionViewProcessor implements SuggestionProcessor
* Specify SuggestionDrawableState for action button.
*
* @param model Property model to update.
* @param drawable SuggestionDrawableState object defining decoration for the action button.
* @param callback Runnable to invoke when user presses the action icon.
* @param actions List of actions for the suggestion.
*/
protected void setCustomAction(
PropertyModel model, SuggestionDrawableState drawable, Runnable callback) {
model.set(BaseSuggestionViewProperties.ACTION_ICON, drawable);
model.set(BaseSuggestionViewProperties.ACTION_CALLBACK, callback);
protected void setCustomActions(PropertyModel model, List<Action> actions) {
model.set(BaseSuggestionViewProperties.ACTIONS, actions);
}
/**
......@@ -113,13 +112,15 @@ public abstract class BaseSuggestionViewProcessor implements SuggestionProcessor
* @param isSearchQuery Whether refineText is an URL or Search query.
*/
protected void setRefineAction(PropertyModel model, OmniboxSuggestion suggestion) {
setCustomAction(model,
SuggestionDrawableState.Builder
.forDrawableRes(mContext, R.drawable.btn_suggestion_refine)
.setLarge(true)
.setAllowTint(true)
.build(),
() -> { mSuggestionHost.onRefineSuggestion(suggestion); });
setCustomActions(model,
Arrays.asList(new Action(
SuggestionDrawableState.Builder
.forDrawableRes(mContext, R.drawable.btn_suggestion_refine)
.setLarge(true)
.setAllowTint(true)
.build(),
R.string.accessibility_omnibox_btn_refine,
() -> mSuggestionHost.onRefineSuggestion(suggestion))));
}
@Override
......@@ -129,7 +130,7 @@ public abstract class BaseSuggestionViewProcessor implements SuggestionProcessor
model.set(BaseSuggestionViewProperties.SUGGESTION_DELEGATE, delegate);
model.set(BaseSuggestionViewProperties.DENSITY, mDensity);
setCustomAction(model, null, null);
setCustomActions(model, null);
}
/**
......
chrome/android/java/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewProperties.java
View file @ 52aea3d0
......@@ -5,6 +5,7 @@
package org.chromium.chrome.browser.omnibox.suggestions.base;
import androidx.annotation.IntDef;
import androidx.annotation.StringRes;
import org.chromium.chrome.browser.omnibox.suggestions.SuggestionCommonProperties;
import org.chromium.chrome.browser.omnibox.suggestions.basic.SuggestionViewDelegate;
......@@ -15,6 +16,7 @@ import org.chromium.ui.modelutil.PropertyModel.WritableObjectPropertyKey;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.util.List;
/** The base set of properties for most omnibox suggestions. */
public class BaseSuggestionViewProperties {
......@@ -27,17 +29,35 @@ public class BaseSuggestionViewProperties {
int COMPACT = 2;
}
/**
* Describes the content and behavior of the interactive Action Icon.
*/
public static final class Action {
public final SuggestionDrawableState icon;
public final Runnable callback;
public final @StringRes int accessibilityDescription;
/**
* Create a new action for suggestion.
*
* @param icon SuggestionDrawableState describing the icon to show.
* @param description Content description for the action view.
* @param callback Callback to invoke when user interacts with the icon.
*/
Action(SuggestionDrawableState icon, @StringRes int description, Runnable callback) {
this.icon = icon;
this.accessibilityDescription = description;
this.callback = callback;
}
}
/** SuggestionDrawableState to show as a suggestion icon. */
public static final WritableObjectPropertyKey<SuggestionDrawableState> ICON =
new WritableObjectPropertyKey<>();
/** SuggestionDrawableState to show as an action icon. */
public static final WritableObjectPropertyKey<SuggestionDrawableState> ACTION_ICON =
new WritableObjectPropertyKey<>();
/** ActionCallback to invoke when user presses the ActionIcon. */
public static final WritableObjectPropertyKey<Runnable> ACTION_CALLBACK =
new WritableObjectPropertyKey<>();
/** Action Icons description. */
public static final WritableObjectPropertyKey<List<Action>> ACTIONS =
new WritableObjectPropertyKey();
/** Delegate receiving user events. */
public static final WritableObjectPropertyKey<SuggestionViewDelegate> SUGGESTION_DELEGATE =
......@@ -47,7 +67,7 @@ public class BaseSuggestionViewProperties {
public static final WritableIntPropertyKey DENSITY = new WritableIntPropertyKey();
public static final PropertyKey[] ALL_UNIQUE_KEYS =
new PropertyKey[] {ICON, DENSITY, ACTION_ICON, ACTION_CALLBACK, SUGGESTION_DELEGATE};
new PropertyKey[] {ACTIONS, ICON, DENSITY, SUGGESTION_DELEGATE};
public static final PropertyKey[] ALL_KEYS =
PropertyModel.concatKeys(ALL_UNIQUE_KEYS, SuggestionCommonProperties.ALL_KEYS);
......
chrome/android/junit/src/org/chromium/chrome/browser/omnibox/suggestions/base/BaseSuggestionViewTest.java
View file @ 52aea3d0
......@@ -37,7 +37,6 @@ public class BaseSuggestionViewTest {
private BaseSuggestionViewForTest mView;
private Activity mActivity;
private View mRefineView;
private View mDecoratedView;
private View mContentView;
......@@ -78,14 +77,6 @@ public class BaseSuggestionViewTest {
final int height = getMeasuredHeight();
onLayout(true, 0, 0, width, height);
}
View getDecoratedView() {
return mDecoratedView;
}
View getRefineView() {
return mActionView;
}
}
@Before
......@@ -100,8 +91,7 @@ public class BaseSuggestionViewTest {
mActionIconWidthPx = mActivity.getResources().getDimensionPixelSize(
R.dimen.omnibox_suggestion_action_icon_width);
mRefineView = mView.getRefineView();
mDecoratedView = mView.getDecoratedView();
mDecoratedView = mView.getDecoratedSuggestionView();
}
/**
......@@ -134,6 +124,82 @@ public class BaseSuggestionViewTest {
Assert.assertThat("view height", v.getMeasuredHeight(), lessThanOrEqualTo(bottom - top));
}
@Test
public void layout_LtrMultipleActionButtonsVisible() {
final int useContentWidth = 320;
final int paddingStart = 12;
final int paddingEnd = 34;
final int giveSuggestionWidth =
useContentWidth + 3 * mActionIconWidthPx + paddingStart + paddingEnd;
final int giveContentHeight = 15;
final int expectedContentLeft = paddingStart;
final int expectedContentRight = expectedContentLeft + useContentWidth;
final int expectedRefine1Left = expectedContentRight;
final int expectedRefine1Right = expectedRefine1Left + mActionIconWidthPx;
final int expectedRefine2Left = expectedRefine1Right;
final int expectedRefine2Right = expectedRefine2Left + mActionIconWidthPx;
final int expectedRefine3Left = expectedRefine2Right;
final int expectedRefine3Right = giveSuggestionWidth - paddingEnd;
mView.setPaddingRelative(paddingStart, 0, paddingEnd, 0);
mView.setActionButtonsCount(3);
final View actionButton1 = (View) mView.getActionButtons().get(0);
final View actionButton2 = (View) mView.getActionButtons().get(1);
final View actionButton3 = (View) mView.getActionButtons().get(2);
executeLayoutTest(giveSuggestionWidth, giveContentHeight, View.LAYOUT_DIRECTION_LTR);
verifyViewLayout(
actionButton1, expectedRefine1Left, 0, expectedRefine1Right, giveContentHeight);
verifyViewLayout(
actionButton2, expectedRefine2Left, 0, expectedRefine2Right, giveContentHeight);
verifyViewLayout(
actionButton3, expectedRefine3Left, 0, expectedRefine3Right, giveContentHeight);
verifyViewLayout(
mDecoratedView, expectedContentLeft, 0, expectedContentRight, giveContentHeight);
}
@Test
public void layout_RtlMultipleActionButtonsVisible() {
final int useContentWidth = 220;
final int paddingStart = 13;
final int paddingEnd = 57;
final int giveSuggestionWidth =
useContentWidth + 3 * mActionIconWidthPx + paddingStart + paddingEnd;
final int giveContentHeight = 25;
final int expectedRefine1Left = paddingEnd;
final int expectedRefine1Right = expectedRefine1Left + mActionIconWidthPx;
final int expectedRefine2Left = expectedRefine1Right;
final int expectedRefine2Right = expectedRefine2Left + mActionIconWidthPx;
final int expectedRefine3Left = expectedRefine2Right;
final int expectedRefine3Right = expectedRefine3Left + mActionIconWidthPx;
final int expectedContentLeft = expectedRefine3Right;
final int expectedContentRight = giveSuggestionWidth - paddingStart;
mView.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
mView.setPaddingRelative(paddingStart, 0, paddingEnd, 0);
mView.setActionButtonsCount(3);
// Note: reverse order, because we also want to show these buttons in reverse order.
final View actionButton1 = (View) mView.getActionButtons().get(2);
final View actionButton2 = (View) mView.getActionButtons().get(1);
final View actionButton3 = (View) mView.getActionButtons().get(0);
executeLayoutTest(giveSuggestionWidth, giveContentHeight, View.LAYOUT_DIRECTION_RTL);
verifyViewLayout(
actionButton1, expectedRefine1Left, 0, expectedRefine1Right, giveContentHeight);
verifyViewLayout(
actionButton2, expectedRefine2Left, 0, expectedRefine2Right, giveContentHeight);
verifyViewLayout(
actionButton3, expectedRefine3Left, 0, expectedRefine3Right, giveContentHeight);
verifyViewLayout(
mDecoratedView, expectedContentLeft, 0, expectedContentRight, giveContentHeight);
}
@Test
public void layout_LtrRefineVisible() {
final int useContentWidth = 120;
......@@ -160,10 +226,13 @@ public class BaseSuggestionViewTest {
final int expectedRefineRight = giveSuggestionWidth - paddingEnd;
mView.setPaddingRelative(paddingStart, 0, paddingEnd, 0);
mView.setActionButtonsCount(1);
final View actionButton = (View) mView.getActionButtons().get(0);
executeLayoutTest(giveSuggestionWidth, giveContentHeight, View.LAYOUT_DIRECTION_LTR);
verifyViewLayout(
mRefineView, expectedRefineLeft, 0, expectedRefineRight, giveContentHeight);
actionButton, expectedRefineLeft, 0, expectedRefineRight, giveContentHeight);
verifyViewLayout(
mDecoratedView, expectedContentLeft, 0, expectedContentRight, giveContentHeight);
}
......@@ -195,10 +264,13 @@ public class BaseSuggestionViewTest {
mView.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
mView.setPaddingRelative(paddingStart, 0, paddingEnd, 0);
mView.setActionButtonsCount(1);
final View actionButton = (View) mView.getActionButtons().get(0);
executeLayoutTest(giveSuggestionWidth, giveContentHeight, View.LAYOUT_DIRECTION_RTL);
verifyViewLayout(
mRefineView, expectedRefineLeft, 0, expectedRefineRight, giveContentHeight);
actionButton, expectedRefineLeft, 0, expectedRefineRight, giveContentHeight);
verifyViewLayout(
mDecoratedView, expectedContentLeft, 0, expectedContentRight, giveContentHeight);
}
......@@ -224,8 +296,6 @@ public class BaseSuggestionViewTest {
final int expectedContentLeft = paddingStart;
final int expectedContentRight = giveSuggestionWidth - paddingEnd;
mRefineView.setVisibility(View.GONE);
mView.setPaddingRelative(paddingStart, 0, paddingEnd, 0);
executeLayoutTest(giveSuggestionWidth, giveContentHeight, View.LAYOUT_DIRECTION_LTR);
verifyViewLayout(
......@@ -253,8 +323,6 @@ public class BaseSuggestionViewTest {
final int expectedContentLeft = paddingEnd;
final int expectedContentRight = giveSuggestionWidth - paddingStart;
mRefineView.setVisibility(View.GONE);
mView.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
mView.setPaddingRelative(paddingStart, 0, paddingEnd, 0);
executeLayoutTest(giveSuggestionWidth, giveContentHeight, View.LAYOUT_DIRECTION_RTL);
......
chrome/android/native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/basic/BasicSuggestionProcessorUnitTest.java
View file @ 52aea3d0
......@@ -253,11 +253,11 @@ public class BasicSuggestionProcessorUnitTest {
createSearchSuggestion(OmniboxSuggestionType.URL_WHAT_YOU_TYPED, typed, "");
PropertyModel model = mProcessor.createModel();
mProcessor.populateModel(mSuggestion, model, 0);
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTION_CALLBACK));
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTIONS));
createUrlSuggestion(OmniboxSuggestionType.URL_WHAT_YOU_TYPED, typed, "");
mProcessor.populateModel(mSuggestion, model, 0);
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTION_CALLBACK));
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTIONS));
}
@CalledByNativeJavaTest
......@@ -268,11 +268,11 @@ public class BasicSuggestionProcessorUnitTest {
createSearchSuggestion(OmniboxSuggestionType.URL_WHAT_YOU_TYPED, refined, "");
PropertyModel model = mProcessor.createModel();
mProcessor.populateModel(mSuggestion, model, 0);
Assert.assertNotNull(mModel.get(BaseSuggestionViewProperties.ACTION_CALLBACK));
Assert.assertNotNull(mModel.get(BaseSuggestionViewProperties.ACTIONS));
createUrlSuggestion(OmniboxSuggestionType.URL_WHAT_YOU_TYPED, refined, "");
mProcessor.populateModel(mSuggestion, model, 0);
Assert.assertNotNull(mModel.get(BaseSuggestionViewProperties.ACTION_CALLBACK));
Assert.assertNotNull(mModel.get(BaseSuggestionViewProperties.ACTIONS));
}
@CalledByNativeJavaTest
......
chrome/android/native_java_unittests/src/org/chromium/chrome/browser/omnibox/suggestions/clipboard/ClipboardSuggestionProcessorTest.java
View file @ 52aea3d0
......@@ -122,13 +122,13 @@ public class ClipboardSuggestionProcessorTest {
@CalledByNativeJavaTest
public void clipboardSuggestion_doesNotRefine() {
createClipboardSuggestion(OmniboxSuggestionType.CLIPBOARD_URL, GURL.emptyGURL());
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTION_CALLBACK));
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTIONS));
createClipboardSuggestion(OmniboxSuggestionType.CLIPBOARD_TEXT, GURL.emptyGURL());
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTION_CALLBACK));
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTIONS));
createClipboardSuggestion(OmniboxSuggestionType.CLIPBOARD_IMAGE, GURL.emptyGURL());
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTION_CALLBACK));
Assert.assertNull(mModel.get(BaseSuggestionViewProperties.ACTIONS));
}
@CalledByNativeJavaTest
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment