From df5380e366696eaee9200c92990583cda8b16296 Mon Sep 17 00:00:00 2001
From: Material Web Team <material-web-copybara@google.com>
Date: Mon, 27 Jan 2020 14:51:18 -0500
Subject: [PATCH] Project import generated by Copybara.

PiperOrigin-RevId: 291768975
---
 packages/mdc-data-table/README.md   |  6 ++---
 packages/mdc-icon-button/README.md  |  3 +++
 packages/mdc-textfield/_mixins.scss |  5 ----
 testing/helpers/foundation.ts       | 40 ++++++++++++++++++++++-------
 4 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/packages/mdc-data-table/README.md b/packages/mdc-data-table/README.md
index 27eced712b3..c74eb2c2ee5 100644
--- a/packages/mdc-data-table/README.md
+++ b/packages/mdc-data-table/README.md
@@ -209,9 +209,9 @@ CSS Class | Description
 `mdc-data-table` | Mandatory. The root DOM element containing `table` and other supporting elements.
 `mdc-data-table__table` | Mandatory. Table element. Added to `table` HTML tag.
 `mdc-data-table__header-row` | Mandatory. Table header row element. Added to `thead > tr` HTML tag.
-`mdc-data-table__header-cell` | Mandatory. Table header cell element. Added to `thead > tr > th` HTML tag.
-`mdc-data-table__header-cell--checkbox` | Optional. Table header cell element that contains `mdc-checkbox`. Added to `thead > tr > th` HTML tag.
-`mdc-data-table__header-cell--numeric` | Optional. Table header cell element that maps to numeric cells. Added to `thead > tr > th` HTML tag.
+`mdc-data-table__header-cell` | Mandatory. Table header cell element. Added to `thead > th > td` HTML tag.
+`mdc-data-table__header-cell--checkbox` | Optional. Table header cell element that contains `mdc-checkbox`. Added to `thead> th > td:first-child` HTML tag.
+`mdc-data-table__header-cell--numeric` | Optional. Table header cell element that maps to numeric cells. Added to `thead > th > td` HTML tag.
 `mdc-data-table__content` | Mandatory. Table body element. Added to `tbody` HTML tag.
 `mdc-data-table__row` | Mandatory. Table row element. Added to `tbody > tr` HTML tag.
 `mdc-data-table__cell` | Mandatory. Table cell element. Added to `tbody > tr > td` HTML tag.
diff --git a/packages/mdc-icon-button/README.md b/packages/mdc-icon-button/README.md
index e1dd8f799c0..f84d6bac54c 100644
--- a/packages/mdc-icon-button/README.md
+++ b/packages/mdc-icon-button/README.md
@@ -79,6 +79,7 @@ Then instantiate an `MDCIconButtonToggle` on the root element.
 <button id="add-to-favorites"
    class="mdc-icon-button"
    aria-label="Add to favorites"
+   aria-hidden="true"
    aria-pressed="false">
    <i class="material-icons mdc-icon-button__icon mdc-icon-button__icon--on">favorite</i>
    <i class="material-icons mdc-icon-button__icon">favorite_border</i>
@@ -98,6 +99,7 @@ The icon button toggle can be used with SVGs.
 <button id="star-this-item"
    class="mdc-icon-button mdc-icon-button--on"
    aria-label="Unstar this item"
+   aria-hidden="true"
    aria-pressed="true">
    <svg class="mdc-icon-button__icon">
      ...
@@ -116,6 +118,7 @@ The icon button toggle can be used with `img` tags.
 <button id="star-this-item"
    class="mdc-icon-button mdc-icon-button--on"
    aria-label="Unstar this item"
+   aria-hidden="true"
    aria-pressed="true">
    <img src="" class="mdc-icon-button__icon"/>
    <img src="" class="mdc-icon-button__icon mdc-icon-button__icon--on"/>
diff --git a/packages/mdc-textfield/_mixins.scss b/packages/mdc-textfield/_mixins.scss
index 3e289d2344f..c9ccaae4018 100644
--- a/packages/mdc-textfield/_mixins.scss
+++ b/packages/mdc-textfield/_mixins.scss
@@ -1143,11 +1143,6 @@
       @include rtl-mixins.reflexive-property(padding, variables.$input-padding, icon-variables.$icon-padding);
     }
   }
-
-  // Outlined uses 16px for text alignment when using a trailing icon.
-  &.mdc-text-field--outlined {
-    @include icon-mixins.trailing-icon-horizontal-position_(icon-variables.$icon-position, $query: $query);
-  }
 }
 
 @mixin dense-with-trailing-icon_($query: feature-targeting-functions.all()) {
diff --git a/testing/helpers/foundation.ts b/testing/helpers/foundation.ts
index 33907434e3b..004c11dab6d 100644
--- a/testing/helpers/foundation.ts
+++ b/testing/helpers/foundation.ts
@@ -32,17 +32,37 @@ export interface FoundationConstructor<F extends MDCFoundation> extends
   new(...args: any[]): F;
 }
 
+/**
+ * @returns Method names of the given foundation class, including all MDC
+ *     superclasses.
+ */
+function getFoundationMethods<F extends MDCFoundation>(
+    // tslint:disable-next-line:enforce-name-casing
+    FoundationCtor: FoundationConstructor<F>,
+    foundationMethods = []): string[] {
+  const methods = foundationMethods.concat(
+      [].slice.call(Object.getOwnPropertyNames(FoundationCtor.prototype)));
+  // tslint:disable-next-line:enforce-name-casing
+  const BaseFoundationCtor = Object.getPrototypeOf(FoundationCtor);
+  if (BaseFoundationCtor.toString().match(/MDC/)) {
+    return getFoundationMethods(BaseFoundationCtor, methods);
+  } else {
+    return methods;
+  }
+}
+
 /**
  * Creates a mockFoundation object with spy functions for each of the
  * foundation class' methods.
  */
 export function createMockFoundation<F extends MDCFoundation>(
-    FoundationClass: FoundationConstructor<F>) {
+    // tslint:disable-next-line:enforce-name-casing
+    FoundationCtor: FoundationConstructor<F>) {
   const mockFoundationMethods =
-      Object.getOwnPropertyNames(FoundationClass.prototype)
+      Object.getOwnPropertyNames(FoundationCtor.prototype)
           .concat(Object.getOwnPropertyNames(MDCFoundation.prototype));
   const mockFoundation =
-      jasmine.createSpyObj(FoundationClass.name, mockFoundationMethods);
+      jasmine.createSpyObj(FoundationCtor.name, mockFoundationMethods);
   return mockFoundation;
 }
 
@@ -51,15 +71,16 @@ export function createMockFoundation<F extends MDCFoundation>(
  * adapter class' methods.
  */
 export function createMockAdapter<F extends MDCFoundation>(
-    FoundationClass: FoundationConstructor<F>) {
+    // tslint:disable-next-line:enforce-name-casing
+    FoundationCtor: FoundationConstructor<F>) {
   const mockAdapterMethods = {};
-  Object.keys(FoundationClass.defaultAdapter).forEach((methodName) => {
-    const value = (FoundationClass.defaultAdapter as any)[methodName];
+  Object.keys(FoundationCtor.defaultAdapter).forEach((methodName) => {
+    const value = (FoundationCtor.defaultAdapter as any)[methodName];
     (mockAdapterMethods as any)[methodName] =
         typeof value === 'function' ? value() : value;
   });
   const mockAdapter =
-      jasmine.createSpyObj(FoundationClass.name, mockAdapterMethods);
+      jasmine.createSpyObj(FoundationCtor.name, mockAdapterMethods);
   return mockAdapter;
 }
 
@@ -71,8 +92,9 @@ export function createMockAdapter<F extends MDCFoundation>(
  * Every foundation test suite includes this verification.
  */
 export function verifyDefaultAdapter<F extends MDCFoundation>(
-    FoundationClass: FoundationConstructor<F>, expectedMethodNames: string[]) {
-  const defaultAdapter = FoundationClass.defaultAdapter as {
+    // tslint:disable-next-line:enforce-name-casing
+    FoundationCtor: FoundationConstructor<F>, expectedMethodNames: string[]) {
+  const defaultAdapter = FoundationCtor.defaultAdapter as {
     [key: string]: any;
   };
   const adapterKeys = Object.keys(defaultAdapter);