Skip to content

GitLab

T
tangled
Commit 0499d65e authored by Sinan Sahin's avatar Sinan Sahin Committed by Commit Bot
Browse files
Options

Replace ChromeTextInputLayout with material lib component 

Bug: 1066257
Change-Id: I6212cc2c8364307a17aa0e53e3276eae7143d494
Binary-Size: Re-added material lib component.
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2134769
Commit-Queue: Sinan Sahin <sinansahin@google.com>
Reviewed-by: default avatarTheresa  <twellington@chromium.org>
Cr-Commit-Position: refs/heads/master@{#756923}
parent b8677adc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 785 deletions
chrome/android/features/autofill_assistant/java/src/org/chromium/chrome/browser/autofill_assistant/user_data/additional_sections/AssistantTextInputSection.java
View file @ 0499d65e
......@@ -141,7 +141,7 @@ public class AssistantTextInputSection implements AssistantAdditionalSection {
mDelegate.onValueChanged(
result.first, new AssistantValue(new String[] {result.second}));
});
inputView.getInputLayout().addEditTextOnFocusChangeListener((unusedView, hasFocus) -> {
inputView.getEditText().setOnFocusChangeListener((unusedView, hasFocus) -> {
if (!hasFocus && mDelegate != null) {
mDelegate.onTextFocusLost();
}
......
chrome/android/java/res/layout/autofill_local_card_editor.xml
View file @ 0499d65e
......@@ -9,7 +9,7 @@
xmlns:tools="http://schemas.android.com/tools">
<!-- Name -->
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/credit_card_name_label"
android:labelFor="@+id/credit_card_name_edit"
android:layout_width="match_parent"
......@@ -27,10 +27,10 @@
android:inputType="textCapWords"
android:hint="@string/autofill_credit_card_editor_name" />
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<!-- Credit card number -->
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/credit_card_number_label"
android:labelFor="@+id/credit_card_number_edit"
android:layout_width="match_parent"
......@@ -49,7 +49,7 @@
android:digits="0123456789- "
android:hint="@string/autofill_credit_card_editor_number" />
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<!-- Expiration date -->
<TextView
......
chrome/android/java/res/layout/autofill_name_fixflow.xml
View file @ 0499d65e
......@@ -18,7 +18,7 @@
android:orientation="horizontal"
android:gravity="center_vertical">
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/cc_name"
android:labelFor="@+id/cc_name_edit"
android:layout_width="0dp"
......@@ -36,7 +36,7 @@
android:imeActionLabel="@string/autofill_fix_flow_prompt_save_card_label"
android:inputType="textCapWords"/>
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<ImageView
android:id="@+id/cc_name_tooltip_icon"
......
chrome/android/java/res/layout/bookmark_add_edit_folder_activity.xml
View file @ 0499d65e
......@@ -28,7 +28,7 @@
android:layout_marginEnd="12dp"
android:layout_marginStart="12dp"
android:layout_marginTop="24dp"
app:hint="@string/title"
android:hint="@string/title"
app:emptyErrorMessage="@string/bookmark_missing_title">
<com.google.android.material.textfield.TextInputEditText
......
chrome/android/java/res/layout/bookmark_edit.xml
View file @ 0499d65e
......@@ -26,7 +26,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="22dp"
app:hint="@string/bookmark_name"
android:hint="@string/bookmark_name"
app:emptyErrorMessage="@string/bookmark_missing_title">
<com.google.android.material.textfield.TextInputEditText
android:layout_width="match_parent"
......@@ -59,7 +59,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
app:hint="@string/bookmark_url"
android:hint="@string/bookmark_url"
app:emptyErrorMessage="@string/bookmark_missing_url">
<com.google.android.material.textfield.TextInputEditText
......
chrome/android/java/res/layout/homepage_editor.xml
View file @ 0499d65e
......@@ -22,7 +22,7 @@
android:orientation="vertical"
android:focusableInTouchMode="true" >
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/homepage_url"
style="@style/PreferenceScreenLayout"
android:layout_width="match_parent"
......@@ -36,7 +36,7 @@
android:inputType="textUri"
android:singleLine="true"
android:hint="@string/options_homepage_edit_label" />
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<Space style="@style/ButtonBarTopSpacer" />
<View style="@style/ButtonBarTopDivider" />
......
chrome/android/java/res/layout/http_auth_dialog.xml
View file @ 0499d65e
......@@ -17,7 +17,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/username_label"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
......@@ -29,9 +29,9 @@
android:inputType="textNoSuggestions"
android:imeOptions="flagNoExtractUi"
android:importantForAutofill="no" />
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_label"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
......@@ -43,7 +43,7 @@
android:inputType="textPassword"
android:imeOptions="flagNoExtractUi"
android:importantForAutofill="no" />
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
</LinearLayout>
......
chrome/android/java/res/layout/password_entry_editor.xml
View file @ 0499d65e
......@@ -16,7 +16,7 @@
android:paddingRight="@dimen/password_entry_editor_content_spacing">
<!-- Site -->
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/site_label"
android:labelFor="@+id/site_edit"
android:layout_width="match_parent"
......@@ -33,10 +33,10 @@
android:inputType="text"
android:hint="@string/password_entry_viewer_site_title"
android:enabled="false"/>
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<!-- Username -->
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/username_label"
android:labelFor="@+id/username_edit"
android:layout_width="match_parent"
......@@ -52,7 +52,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="text"
android:hint="@string/password_entry_viewer_username_title"/>
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<!-- Password -->
<LinearLayout
......@@ -61,7 +61,7 @@
android:orientation="horizontal"
android:gravity="center">
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_label"
android:labelFor="@+id/password_edit"
android:layout_height="wrap_content"
......@@ -78,7 +78,7 @@
android:imeOptions="flagNoExtractUi"
android:inputType="textPassword"
android:hint="@string/password_entry_viewer_password"/>
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<org.chromium.ui.widget.ChromeImageButton
......
chrome/android/java/res/layout/payment_request_editor_dropdown.xml
View file @ 0499d65e
......@@ -17,8 +17,7 @@
android:id="@+id/spinner_label"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.TextSmall.Secondary"
android:layout_marginTop="5dp"/>
android:textAppearance="@style/TextAppearance.TextSmall.Secondary" />
<androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/spinner"
......
chrome/android/java/res/layout/payments_request_editor_textview.xml
View file @ 0499d65e
......@@ -12,7 +12,7 @@
android:layout_marginTop="@dimen/editor_dialog_section_small_spacing"
android:layout_marginBottom="@dimen/editor_dialog_section_small_spacing">
<org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/text_input_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -26,7 +26,7 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:imeOptions="flagNoExtractUi" />
</org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout>
</com.google.android.material.textfield.TextInputLayout>
<LinearLayout
android:id="@+id/icons_layer"
......
chrome/android/java/src/org/chromium/chrome/browser/autofill/prefeditor/EditorTextField.java
View file @ 0499d65e
......@@ -27,9 +27,10 @@ import androidx.annotation.VisibleForTesting;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.core.view.ViewCompat;
import com.google.android.material.textfield.TextInputLayout;
import org.chromium.chrome.R;
import org.chromium.components.browser_ui.widget.TintedDrawable;
import org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout;
/** Handles validation and display of one field from the {@link EditorFieldModel}. */
@VisibleForTesting
......@@ -39,7 +40,7 @@ public class EditorTextField extends FrameLayout implements EditorFieldView, Vie
private EditorFieldModel mEditorFieldModel;
private OnEditorActionListener mEditorActionListener;
private ChromeTextInputLayout mInputLayout;
private TextInputLayout mInputLayout;
private AutoCompleteTextView mInput;
private View mIconsLayer;
private ImageView mActionIcon;
......@@ -56,7 +57,7 @@ public class EditorTextField extends FrameLayout implements EditorFieldView, Vie
mEditorActionListener = actionListener;
LayoutInflater.from(context).inflate(R.layout.payments_request_editor_textview, this, true);
mInputLayout = (ChromeTextInputLayout) findViewById(R.id.text_input_layout);
mInputLayout = (TextInputLayout) findViewById(R.id.text_input_layout);
// Build up the label. Required fields are indicated by appending a '*'.
CharSequence label = fieldModel.getLabel();
......@@ -108,12 +109,15 @@ public class EditorTextField extends FrameLayout implements EditorFieldView, Vie
}
// Validate the field when the user de-focuses it.
mInputLayout.addEditTextOnFocusChangeListener((v, hasFocus) -> {
if (hasFocus) {
mHasFocusedAtLeastOnce = true;
} else if (mHasFocusedAtLeastOnce) {
// Show no errors until the user has already tried to edit the field once.
updateDisplayedError(!mEditorFieldModel.isValid());
mInput.setOnFocusChangeListener(new OnFocusChangeListener() {
@Override
public void onFocusChange(View v, boolean hasFocus) {
if (hasFocus) {
mHasFocusedAtLeastOnce = true;
} else if (mHasFocusedAtLeastOnce) {
// Show no errors until the user has already tried to edit the field once.
updateDisplayedError(!mEditorFieldModel.isValid());
}
}
});
......@@ -284,10 +288,6 @@ public class EditorTextField extends FrameLayout implements EditorFieldView, Vie
}
}
public ChromeTextInputLayout getInputLayout() {
return mInputLayout;
}
@VisibleForTesting
public static void setEditorObserverForTest(EditorObserverForTest observerForTest) {
sObserverForTest = observerForTest;
......
chrome/android/java/src/org/chromium/chrome/browser/autofill/settings/AutofillLocalCardEditor.java
View file @ 0499d65e
......@@ -17,6 +17,8 @@ import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner;
import com.google.android.material.textfield.TextInputLayout;
import org.chromium.base.annotations.UsedByReflection;
import org.chromium.base.metrics.RecordUserAction;
import org.chromium.chrome.R;
......@@ -25,7 +27,6 @@ import org.chromium.chrome.browser.autofill.PersonalDataManager;
import org.chromium.chrome.browser.autofill.PersonalDataManager.AutofillProfile;
import org.chromium.chrome.browser.autofill.PersonalDataManager.CreditCard;
import org.chromium.chrome.browser.payments.SettingsAutofillAndPaymentsObserver;
import org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout;
import java.text.SimpleDateFormat;
import java.util.Calendar;
......@@ -35,9 +36,9 @@ import java.util.Locale;
* Local credit card settings.
*/
public class AutofillLocalCardEditor extends AutofillCreditCardEditor {
private ChromeTextInputLayout mNameLabel;
private TextInputLayout mNameLabel;
private EditText mNameText;
private ChromeTextInputLayout mNumberLabel;
private TextInputLayout mNumberLabel;
private EditText mNumberText;
private Spinner mExpirationMonth;
private Spinner mExpirationYear;
......@@ -60,9 +61,9 @@ public class AutofillLocalCardEditor extends AutofillCreditCardEditor {
View v = super.onCreateView(inflater, container, savedInstanceState);
mNameLabel = (ChromeTextInputLayout) v.findViewById(R.id.credit_card_name_label);
mNameLabel = (TextInputLayout) v.findViewById(R.id.credit_card_name_label);
mNameText = (EditText) v.findViewById(R.id.credit_card_name_edit);
mNumberLabel = (ChromeTextInputLayout) v.findViewById(R.id.credit_card_number_label);
mNumberLabel = (TextInputLayout) v.findViewById(R.id.credit_card_number_label);
mNumberText = (EditText) v.findViewById(R.id.credit_card_number_edit);
// Set text watcher to format credit card number
......
chrome/android/java/src/org/chromium/chrome/browser/bookmarks/BookmarkTextInputLayout.java
View file @ 0499d65e
......@@ -11,14 +11,15 @@ import android.text.TextUtils;
import android.text.TextWatcher;
import android.util.AttributeSet;
import com.google.android.material.textfield.TextInputLayout;
import org.chromium.chrome.R;
import org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout;
/**
* Wraps around {@link ChromeTextInputLayout} to implement a basic empty field error behavior
* Wraps around {@link TextInputLayout} to implement a basic empty field error behavior
* for the Bookmark related TextInputLayouts.
*/
public class BookmarkTextInputLayout extends ChromeTextInputLayout {
public class BookmarkTextInputLayout extends TextInputLayout {
private String mEmptyErrorMessage;
public BookmarkTextInputLayout(Context context, AttributeSet attrs) {
......
chrome/android/java/src/org/chromium/chrome/browser/password_manager/settings/PasswordEntryEditor.java
View file @ 0499d65e
......@@ -19,8 +19,9 @@ import android.widget.ImageButton;
import androidx.fragment.app.Fragment;
import com.google.android.material.textfield.TextInputLayout;
import org.chromium.chrome.R;
import org.chromium.components.browser_ui.widget.text.ChromeTextInputLayout;
import org.chromium.ui.widget.Toast;
/**
......@@ -32,7 +33,7 @@ public class PasswordEntryEditor extends Fragment {
private EditText mUsernameText;
private EditText mPasswordText;
private ImageButton mViewPasswordButton;
private ChromeTextInputLayout mPasswordLabel;
private TextInputLayout mPasswordLabel;
private boolean mViewButtonPressed;
static final String VIEW_BUTTON_PRESSED = "viewButtonPressed";
public static final String CREDENTIAL_URL = "credentialUrl";
......@@ -53,7 +54,7 @@ public class PasswordEntryEditor extends Fragment {
mSiteText = (EditText) view.findViewById(R.id.site_edit);
mUsernameText = (EditText) view.findViewById(R.id.username_edit);
mPasswordText = (EditText) view.findViewById(R.id.password_edit);
mPasswordLabel = (ChromeTextInputLayout) view.findViewById(R.id.password_label);
mPasswordLabel = (TextInputLayout) view.findViewById(R.id.password_label);
mViewPasswordButton = view.findViewById(R.id.password_entry_editor_view_password);
mSiteText.setText(getArguments().getString(CREDENTIAL_URL));
mUsernameText.setText(getArguments().getString(CREDENTIAL_NAME));
......
components/browser_ui/widget/android/BUILD.gn
View file @ 0499d65e
......@@ -67,7 +67,6 @@ android_library("java") {
"java/src/org/chromium/components/browser_ui/widget/selectable_list/SelectionDelegate.java",
"java/src/org/chromium/components/browser_ui/widget/text/AccessibleTextView.java",
"java/src/org/chromium/components/browser_ui/widget/text/AlertDialogEditText.java",
"java/src/org/chromium/components/browser_ui/widget/text/ChromeTextInputLayout.java",
"java/src/org/chromium/components/browser_ui/widget/text/TemplatePreservingTextView.java",
"java/src/org/chromium/components/browser_ui/widget/text/TextViewWithCompoundDrawables.java",
"java/src/org/chromium/components/browser_ui/widget/text/VerticallyFixedEditText.java",
......@@ -200,7 +199,6 @@ android_library("javatests") {
"java/src/org/chromium/components/browser_ui/widget/highlight/ViewHighlighterTest.java",
"java/src/org/chromium/components/browser_ui/widget/listmenu/ListMenuRenderTest.java",
"java/src/org/chromium/components/browser_ui/widget/scrim/ScrimTest.java",
"java/src/org/chromium/components/browser_ui/widget/text/ChromeTextInputLayoutRenderTest.java",
]
deps = [
":java",
......@@ -236,7 +234,6 @@ android_resources("java_test_resources") {
"test/java/res/layout/radio_button_with_description_layout_test.xml",
"test/java/res/layout/radio_button_with_edit_text_test.xml",
"test/java/res/values/strings.xml",
"test/java/res/values/styles.xml",
]
deps = [
":java_resources",
......
components/browser_ui/widget/android/java/res/values/attrs.xml
View file @ 0499d65e
......@@ -10,12 +10,6 @@
<attr name="maxHeight" format="dimension" />
</declare-styleable>
<declare-styleable name="ChromeTextInputLayout">
<attr name="errorTextAppearance" format="reference" />
<attr name="hint" format="reference|string" />
<attr name="hintTextAppearance" format="reference" />
</declare-styleable>
<declare-styleable name="DualControlLayout">
<attr name="stackedMargin" format="reference|dimension"/>
<attr name="primaryButtonText" format="reference|string"/>
......
components/browser_ui/widget/android/java/res/values/dimens.xml
View file @ 0499d65e
......@@ -13,9 +13,6 @@
<!-- DualControlLayout -->
<dimen name="dual_control_margin_between_items">8dp</dimen>
<!-- ChromeTextInputLayout -->
<dimen name="text_input_layout_padding_start">3dp</dimen>
<!-- Dialogs -->
<dimen name="dialog_max_width">600dp</dimen>
<dimen name="dialog_header_margin">14dp</dimen>
......
components/browser_ui/widget/android/java/src/org/chromium/components/browser_ui/widget/text/ChromeTextInputLayoutRenderTest.java deleted 100644 → 0
View file @ b8677adc
// 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.components.browser_ui.widget.text;
import android.app.Activity;
import android.graphics.Color;
import android.support.test.filters.MediumTest;
import android.text.InputType;
import android.view.ContextThemeWrapper;
import android.view.View;
import android.view.ViewGroup;
import androidx.appcompat.widget.AppCompatEditText;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.chromium.base.test.params.BaseJUnit4RunnerDelegate;
import org.chromium.base.test.params.ParameterAnnotations;
import org.chromium.base.test.params.ParameterSet;
import org.chromium.base.test.params.ParameterizedRunner;
import org.chromium.base.test.util.Feature;
import org.chromium.components.browser_ui.widget.test.R;
import org.chromium.content_public.browser.test.util.TestThreadUtils;
import org.chromium.ui.base.LocalizationUtils;
import org.chromium.ui.test.util.DummyUiActivityTestCase;
import org.chromium.ui.test.util.NightModeTestUtils;
import org.chromium.ui.test.util.RenderTestRule;
import java.io.IOException;
import java.util.List;
/**
* Render tests for the ChromeTextInputLayout
*/
@RunWith(ParameterizedRunner.class)
@ParameterAnnotations.UseRunnerDelegate(BaseJUnit4RunnerDelegate.class)
public class ChromeTextInputLayoutRenderTest extends DummyUiActivityTestCase {
@ParameterAnnotations.ClassParameter
private static List<ParameterSet> sClassParams =
new NightModeTestUtils.NightModeParams().getParameters();
@Rule
public RenderTestRule mRenderTestRule =
new RenderTestRule("chrome/test/data/android/render_tests");
private static final String LABEL = "Label";
private static final String TEXT = "Chrome's own TextInputLayout";
private static final String PHONE = "+1 555-555-5555";
private static final String ERROR = "Error";
private final int mFakeBgColor;
private ChromeTextInputLayout mInputLayout;
private AppCompatEditText mEditText;
public ChromeTextInputLayoutRenderTest(boolean nightModeEnabled) {
// Sets a fake background color to make the screenshots easier to compare with bare eyes.
mFakeBgColor = nightModeEnabled ? Color.BLACK : Color.WHITE;
NightModeTestUtils.setUpNightModeForDummyUiActivity(nightModeEnabled);
mRenderTestRule.setNightModeEnabled(nightModeEnabled);
}
@Override
public void setUpTest() throws Exception {
super.setUpTest();
final Activity activity = getActivity();
TestThreadUtils.runOnUiThreadBlocking(() -> {
mInputLayout = new ChromeTextInputLayout(
new ContextThemeWrapper(activity, R.style.Theme_Chromium_Settings));
ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
mInputLayout.setLayoutParams(layoutParams);
mInputLayout.setBackgroundColor(mFakeBgColor);
((ViewGroup) activity.findViewById(android.R.id.content)).addView(mInputLayout);
mEditText = new AppCompatEditText(
new ContextThemeWrapper(activity, R.style.Theme_Chromium_Settings));
mInputLayout.addView(mEditText);
mInputLayout.setHint(LABEL);
RenderTestRule.sanitize(mEditText);
});
}
@Override
public void tearDownTest() throws Exception {
NightModeTestUtils.tearDownNightModeForDummyUiActivity();
super.tearDownTest();
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testExpanded() throws IOException {
mRenderTestRule.render(mInputLayout, "expanded");
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testFocused() throws Exception {
TestThreadUtils.runOnUiThreadBlocking(() -> mEditText.requestFocus());
mRenderTestRule.render(mInputLayout, "focused");
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testFilled() throws Exception {
TestThreadUtils.runOnUiThreadBlocking(() -> mEditText.setText(TEXT));
mRenderTestRule.render(mInputLayout, "filled");
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testError() throws Exception {
TestThreadUtils.runOnUiThreadBlocking(() -> mInputLayout.setError(ERROR));
mRenderTestRule.render(mInputLayout, "error");
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testFocusedRTL() throws IOException {
TestThreadUtils.runOnUiThreadBlocking(() -> {
setLayoutDirectionRTL();
mEditText.requestFocus();
});
mRenderTestRule.render(mInputLayout, "focused_rtl");
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testExpandedRTL() throws IOException {
TestThreadUtils.runOnUiThreadBlocking(this::setLayoutDirectionRTL);
mRenderTestRule.render(mInputLayout, "expanded_rtl");
}
@Test
@MediumTest
@Feature({"RenderTest"})
public void testPhoneRTL() throws IOException {
TestThreadUtils.runOnUiThreadBlocking(() -> {
setLayoutDirectionRTL();
mEditText.setInputType(InputType.TYPE_CLASS_PHONE);
});
mRenderTestRule.render(mInputLayout, "phone_expanded_rtl");
TestThreadUtils.runOnUiThreadBlocking(() -> mEditText.setText(PHONE));
mRenderTestRule.render(mInputLayout, "phone_rtl");
}
private void setLayoutDirectionRTL() {
LocalizationUtils.setRtlForTesting(true);
mInputLayout.setLayoutDirection(View.LAYOUT_DIRECTION_RTL);
mInputLayout.setHint(LABEL);
}
}
components/browser_ui/widget/android/test/java/res/values/styles.xml deleted 100644 → 0
View file @ b8677adc
<?xml version="1.0" encoding="utf-8"?>
<!-- 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. -->
<resources>
<!-- Settings theme and styles for ChromeTextInputLayoutRenderTest -->
<style name="TextAppearance.PreferenceMediumText">
<item name="android:textSize">18sp</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
</style>
<style name="Base.V17.Theme.Chromium" parent="Theme.AppCompat.DayNight.NoActionBar">
<!-- Window Properties -->
<item name="android:windowBackground">@color/default_bg_color</item>
<!-- Action bar color -->
<item name="colorPrimary">@color/default_bg_color</item>
<!-- Text colors -->
<item name="android:textColorLink">@color/default_text_color_link</item>
<item name="android:textColorHighlight">@color/text_highlight_color</item>
<!-- Color of checkboxes, switches, buttons, etc. -->
<item name="colorAccent">@color/light_active_color</item>
<item name="colorControlNormal">@color/control_normal_color</item>
<item name="colorControlActivated">@color/light_active_color</item>
<item name="colorControlHighlight">@color/control_highlight_color</item>
</style>
<style name="Base.Theme.Chromium" parent="Base.V17.Theme.Chromium" />
<style name="Base.Theme.Chromium.WithActionBar">
<!-- With ActionBar -->
<item name="windowActionBar">true</item>
<item name="windowNoTitle">false</item>
</style>
<style name="Theme.Chromium.WithActionBar" parent="Base.Theme.Chromium.WithActionBar" />
<style name="Base.Theme.Chromium.Settings" parent="Theme.Chromium.WithActionBar" />
<style name="Theme.Chromium.Settings" parent="Base.Theme.Chromium.Settings">
<!-- Theme attributes pre-v21 -->
<item name="android:textAppearanceMedium">@style/TextAppearance.PreferenceMediumText</item>
<item name="android:textAppearanceSmall">@style/TextAppearance.TextMedium.Secondary</item>
<item name="android:windowContentOverlay">@null</item>
</style>
</resources>
components/test/data/payments/render_tests/PaymentRequestRetryTest.retry_with_payer_errors.Nexus_5X-23.png.sha1
View file @ 0499d65e
b13e0773a76f3c3b8a1fb3f292d9e0710f80c18d
\ No newline at end of file
4651790fa40a205088cff59450e163528f98efca
\ 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