Skip to content

GitLab

T
tangled
Commit bf35bd5f authored by Brandon Wylie's avatar Brandon Wylie Committed by Commit Bot
Browse files
Options

Fix for incorrect status view padding when verbose text is visible 

Bug: 1022504
Change-Id: Ia1d34e69ed8d90fd17bb74207f38d48770d2e0f4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904765
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715114}
parent a9af71a8
Hide whitespace changes
Inline Side-by-side
Showing with 137 additions and 1 deletion
chrome/android/chrome_test_java_sources.gni
View file @ bf35bd5f
......@@ -292,6 +292,7 @@ chrome_test_java_sources = [
"javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.java",
"javatests/src/org/chromium/chrome/browser/omnibox/UrlBarIntegrationTest.java",
"javatests/src/org/chromium/chrome/browser/omnibox/geo/GeolocationHeaderTest.java",
"javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java",
"javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewTest.java",
"javatests/src/org/chromium/chrome/browser/omnibox/suggestions/VoiceSuggestionProviderTest.java",
"javatests/src/org/chromium/chrome/browser/page_info/ConnectionInfoPopupTest.java",
......
chrome/android/java/res/values/dimens.xml
View file @ bf35bd5f
......@@ -309,6 +309,8 @@
<dimen name="location_bar_status_icon_width">24dp</dimen>
<dimen name="sei_location_bar_icon_end_padding">4dp</dimen>
<dimen name="sei_location_bar_icon_end_padding_focused">16dp</dimen>
<dimen name="sei_location_bar_verbose_start_padding_verbose_text">4dp</dimen>
<dimen name="sei_location_bar_status_extra_padding_width">4dp</dimen>
<dimen name="tablet_toolbar_start_padding">4dp</dimen>
<dimen name="tablet_toolbar_end_padding">6dp</dimen>
......
chrome/android/java/src/org/chromium/chrome/browser/omnibox/status/StatusView.java
View file @ bf35bd5f
......@@ -41,7 +41,7 @@ import org.chromium.ui.widget.Toast;
*/
public class StatusView extends LinearLayout {
@VisibleForTesting
class StatusViewDelegate {
static class StatusViewDelegate {
/** @see {@link SearchEngineLogoUtils#shouldShowSearchEngineLogo} */
boolean shouldShowSearchEngineLogo(boolean isIncognito) {
return SearchEngineLogoUtils.shouldShowSearchEngineLogo(isIncognito);
......@@ -123,6 +123,18 @@ public class StatusView extends LinearLayout {
// layout positioning.
setPaddingRelative(getPaddingStart(), getPaddingTop(),
getEndPaddingPixelSizeForFocusState(false), getPaddingBottom());
// Note: the margins and implicit padding were removed from the status view for the
// dse icon experiment. Moving padding values that were there to the verbose status
// text view and the verbose text extra space.
mVerboseStatusTextView.setPaddingRelative(
getResources().getDimensionPixelSize(
R.dimen.sei_location_bar_verbose_start_padding_verbose_text),
mVerboseStatusTextView.getPaddingTop(), mVerboseStatusTextView.getPaddingEnd(),
mVerboseStatusTextView.getPaddingBottom());
layoutParams = new LinearLayout.LayoutParams(mStatusExtraSpace.getLayoutParams());
layoutParams.width = getResources().getDimensionPixelSize(
R.dimen.sei_location_bar_status_extra_padding_width);
mStatusExtraSpace.setLayoutParams(layoutParams);
}
}
......
chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/status/StatusViewRenderTest.java 0 → 100644
View file @ bf35bd5f
// Copyright 2019 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
package org.chromium.chrome.browser.omnibox.status;
import static org.chromium.content_public.browser.test.util.TestThreadUtils.runOnUiThreadBlocking;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.LinearLayout;
import androidx.test.filters.MediumTest;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.chromium.base.test.util.Feature;
import org.chromium.chrome.browser.omnibox.status.StatusView.StatusViewDelegate;
import org.chromium.chrome.browser.toolbar.LocationBarModel;
import org.chromium.chrome.browser.ui.widget.CompositeTouchDelegate;
import org.chromium.chrome.test.ChromeJUnit4ClassRunner;
import org.chromium.chrome.test.ui.DummyUiActivityTestCase;
import org.chromium.chrome.test.util.RenderTestRule;
import org.chromium.ui.modelutil.PropertyModel;
import org.chromium.ui.modelutil.PropertyModelChangeProcessor;
/**
* Render tests for {@link StatusView}.
*/
@RunWith(ChromeJUnit4ClassRunner.class)
public class StatusViewRenderTest extends DummyUiActivityTestCase {
@Rule
public RenderTestRule mRenderTestRule =
new RenderTestRule("chrome/test/data/android/render_tests");
private StatusView mStatusView;
private PropertyModel mStatusModel;
/** Testing implementation that returns true for everything. */
static class DelegateForTesting extends StatusViewDelegate {
@Override
boolean shouldShowSearchEngineLogo(boolean isIncognito) {
return true;
}
@Override
boolean isSearchEngineLogoEnabled() {
return true;
}
}
@Override
public void setUpTest() throws Exception {
super.setUpTest();
MockitoAnnotations.initMocks(this);
runOnUiThreadBlocking(() -> {
ViewGroup view = new LinearLayout(getActivity());
FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
getActivity().setContentView(view, params);
mStatusView = getActivity()
.getLayoutInflater()
.inflate(org.chromium.chrome.R.layout.location_status, view, true)
.findViewById(org.chromium.chrome.R.id.location_bar_status);
mStatusView.setCompositeTouchDelegate(new CompositeTouchDelegate(view));
mStatusView.setToolbarCommonPropertiesModel(
new LocationBarModel(mStatusView.getContext()));
mStatusModel = new PropertyModel.Builder(StatusProperties.ALL_KEYS).build();
PropertyModelChangeProcessor.create(mStatusModel, mStatusView, new StatusViewBinder());
});
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testStatusViewVerbosePadding() throws Exception {
runOnUiThreadBlocking(() -> {
mStatusView.setVerboseStatusTextContent(
org.chromium.chrome.R.string.location_bar_preview_lite_page_status);
mStatusView.setVerboseStatusTextWidth(mStatusView.getResources().getDimensionPixelSize(
org.chromium.chrome.R.dimen.location_bar_min_verbose_status_text_width));
mStatusView.setVerboseStatusTextVisible(true);
mStatusModel.set(
StatusProperties.STATUS_ICON_RES, org.chromium.chrome.R.drawable.ic_search);
mStatusModel.set(StatusProperties.STATUS_ICON_TINT_RES, 0);
});
mRenderTestRule.render(mStatusView, "status_view_verbose_padding");
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testStatusViewVerbosePadding_withDSEIcon() throws Exception {
runOnUiThreadBlocking(() -> {
mStatusView.setDelegateForTesting(new DelegateForTesting());
mStatusView.updateSearchEngineStatusIcon(true, true, "");
mStatusView.setVerboseStatusTextContent(
org.chromium.chrome.R.string.location_bar_preview_lite_page_status);
mStatusView.setVerboseStatusTextWidth(mStatusView.getResources().getDimensionPixelSize(
org.chromium.chrome.R.dimen.location_bar_min_verbose_status_text_width));
mStatusView.setVerboseStatusTextVisible(true);
mStatusModel.set(StatusProperties.STATUS_ALPHA, 1f);
mStatusModel.set(StatusProperties.SHOW_STATUS_ICON, true);
mStatusModel.set(StatusProperties.STATUS_ICON_RES,
org.chromium.chrome.R.drawable.ic_logo_googleg_24dp);
mStatusModel.set(StatusProperties.STATUS_ICON_TINT_RES, 0);
});
mRenderTestRule.render(mStatusView, "status_view_verbose_padding_with_dse_icon");
}
}
\ No newline at end of file
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