Navigation Menu

Skip to content

Commit

Permalink
Update android core class definitions across material
Browse files Browse the repository at this point in the history 
PiperOrigin-RevId: 414839941
  • Loading branch information
@josefigueroa168
Material Design Team authored and josefigueroa168 committed Dec 8, 2021
1 parent 35d9da8 commit cfc00aa
Show file tree
Hide file tree
Showing 74 changed files with 92 additions and 92 deletions.
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/adaptive/AdaptiveFeedDemoActivity.java
View file
Expand Up @@ -22,12 +22,12 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import androidx.core.util.Consumer;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.util.Consumer;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
import androidx.window.layout.DisplayFeature;
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/adaptive/AdaptiveListViewDemoActivity.java
View file
Expand Up @@ -23,7 +23,6 @@
import android.os.Handler;
import android.os.Looper;
import androidx.fragment.app.FragmentManager;
import androidx.core.util.Consumer;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -32,6 +31,7 @@
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.constraintlayout.widget.ConstraintSet;
import androidx.constraintlayout.widget.ReactiveGuide;
import androidx.core.util.Consumer;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
import androidx.window.layout.DisplayFeature;
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/adaptive/AdaptiveMusicPlayerLibraryDemoFragment.java
View file
Expand Up @@ -21,12 +21,12 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import androidx.core.util.Consumer;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.util.Consumer;
import androidx.core.view.ViewCompat;
import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
import androidx.window.layout.DisplayFeature;
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/adaptive/AdaptiveSupportingPanelDemoActivity.java
View file
Expand Up @@ -22,12 +22,12 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Looper;
import androidx.core.util.Consumer;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.util.Consumer;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.window.java.layout.WindowInfoTrackerCallbackAdapter;
import androidx.window.layout.DisplayFeature;
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/datepicker/DatePickerMainDemoFragment.java
View file
Expand Up @@ -19,7 +19,6 @@

import android.content.Context;
import android.os.Bundle;
import androidx.core.util.Pair;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
Expand All @@ -28,6 +27,7 @@
import android.widget.RadioGroup;
import androidx.annotation.AttrRes;
import androidx.annotation.Nullable;
import androidx.core.util.Pair;
import com.google.android.material.button.MaterialButton;
import com.google.android.material.datepicker.CalendarConstraints;
import com.google.android.material.datepicker.CompositeDateValidator;
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/feature/DemoUtils.java
View file
Expand Up @@ -18,13 +18,13 @@

import android.app.Activity;
import android.content.Context;
import androidx.core.widget.NestedScrollView;
import android.view.MenuItem;
import android.view.View;
import android.view.View.OnLayoutChangeListener;
import android.view.ViewGroup;
import android.widget.ScrollView;
import androidx.core.view.ViewCompat;
import androidx.core.widget.NestedScrollView;
import com.google.android.material.internal.ContextUtils;
import com.google.android.material.snackbar.Snackbar;
import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/font/FontMainDemoFragment.java
View file
Expand Up @@ -21,7 +21,6 @@
import android.content.Context;
import android.content.res.TypedArray;
import android.os.Bundle;
import androidx.core.widget.TextViewCompat;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
Expand All @@ -38,6 +37,7 @@
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.core.view.ViewCompat;
import androidx.core.widget.TextViewCompat;
import com.google.android.material.resources.TextAppearance;
import com.google.android.material.snackbar.Snackbar;
import io.material.catalog.feature.DemoFragment;
Expand Down
2 changes: 1 addition & 1 deletion catalog/java/io/material/catalog/windowpreferences/WindowPreferencesManager.java
View file
Expand Up @@ -28,10 +28,10 @@
import android.graphics.Color;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import androidx.core.graphics.ColorUtils;
import android.view.View;
import android.view.Window;
import androidx.annotation.RequiresApi;
import androidx.core.graphics.ColorUtils;
import com.google.android.material.color.MaterialColors;

/** Helper that saves the current window preferences for the Catalog. */
Expand Down
4 changes: 2 additions & 2 deletions lib/java/com/google/android/material/appbar/AppBarLayout.java
View file
Expand Up @@ -38,8 +38,6 @@
import android.os.Build.VERSION_CODES;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.util.ObjectsCompat;
import androidx.appcompat.content.res.AppCompatResources;
import android.util.AttributeSet;
import android.view.View;
Expand All @@ -60,6 +58,8 @@
import androidx.annotation.RestrictTo;
import androidx.annotation.VisibleForTesting;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.util.ObjectsCompat;
import androidx.core.view.NestedScrollingChild;
import androidx.core.view.ViewCompat;
import androidx.core.view.ViewCompat.NestedScrollType;
Expand Down
4 changes: 2 additions & 2 deletions lib/java/com/google/android/material/appbar/CollapsingToolbarLayout.java
View file
Expand Up @@ -35,8 +35,6 @@
import android.graphics.drawable.Drawable;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.util.ObjectsCompat;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.Gravity;
Expand All @@ -55,7 +53,9 @@
import androidx.annotation.RestrictTo;
import androidx.annotation.StyleRes;
import androidx.core.content.ContextCompat;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.math.MathUtils;
import androidx.core.util.ObjectsCompat;
import androidx.core.view.GravityCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/appbar/MaterialToolbar.java
View file
Expand Up @@ -28,7 +28,6 @@
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.os.Build.VERSION_CODES;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.appcompat.widget.Toolbar;
import android.util.AttributeSet;
import android.util.Pair;
Expand All @@ -38,6 +37,7 @@
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import com.google.android.material.internal.ThemeEnforcement;
import com.google.android.material.internal.ToolbarUtils;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/bottomappbar/BottomAppBar.java
View file
Expand Up @@ -34,7 +34,6 @@
import android.graphics.drawable.Drawable;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.appcompat.widget.ActionMenuView;
import androidx.appcompat.widget.Toolbar;
import android.util.AttributeSet;
Expand All @@ -50,6 +49,7 @@
import androidx.annotation.Px;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.coordinatorlayout.widget.CoordinatorLayout.AttachedBehavior;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.ViewCompat.NestedScrollType;
import androidx.core.view.ViewCompat.ScrollAxis;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/bottomsheet/BottomSheetBehavior.java
View file
Expand Up @@ -32,7 +32,6 @@
import android.os.Build.VERSION_CODES;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.core.graphics.Insets;
import android.util.AttributeSet;
import android.util.Log;
import android.util.TypedValue;
Expand All @@ -55,6 +54,7 @@
import androidx.annotation.VisibleForTesting;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.coordinatorlayout.widget.CoordinatorLayout.LayoutParams;
import androidx.core.graphics.Insets;
import androidx.core.math.MathUtils;
import androidx.core.view.ViewCompat;
import androidx.core.view.WindowInsetsCompat;
Expand Down
4 changes: 2 additions & 2 deletions lib/java/com/google/android/material/button/MaterialButton.java
View file
Expand Up @@ -33,8 +33,6 @@
import android.os.Build.VERSION_CODES;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.widget.TextViewCompat;
import androidx.appcompat.content.res.AppCompatResources;
import androidx.appcompat.widget.AppCompatButton;
import android.util.AttributeSet;
Expand All @@ -55,7 +53,9 @@
import androidx.annotation.Px;
import androidx.annotation.RequiresApi;
import androidx.annotation.RestrictTo;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import androidx.core.widget.TextViewCompat;
import androidx.customview.view.AbsSavedState;
import com.google.android.material.internal.ThemeEnforcement;
import com.google.android.material.internal.ViewUtils;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/button/MaterialButtonHelper.java
View file
Expand Up @@ -31,12 +31,12 @@
import android.graphics.drawable.RippleDrawable;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.annotation.ChecksSdkIntAtLeast;
import androidx.annotation.Dimension;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RestrictTo;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import com.google.android.material.color.MaterialColors;
import com.google.android.material.internal.ViewUtils;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/card/MaterialCardViewHelper.java
View file
Expand Up @@ -33,7 +33,6 @@
import android.os.Build;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import androidx.core.graphics.drawable.DrawableCompat;
import android.util.AttributeSet;
import android.view.Gravity;
import android.view.View;
Expand All @@ -46,6 +45,7 @@
import androidx.annotation.RestrictTo;
import androidx.annotation.StyleRes;
import androidx.cardview.widget.CardView;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.view.ViewCompat;
import com.google.android.material.card.MaterialCardView.CheckedIconGravity;
import com.google.android.material.color.MaterialColors;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/checkbox/MaterialCheckBox.java
View file
Expand Up @@ -23,10 +23,10 @@
import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.TypedArray;
import androidx.core.widget.CompoundButtonCompat;
import androidx.appcompat.widget.AppCompatCheckBox;
import android.util.AttributeSet;
import androidx.annotation.Nullable;
import androidx.core.widget.CompoundButtonCompat;
import com.google.android.material.color.MaterialColors;
import com.google.android.material.internal.ThemeEnforcement;
import com.google.android.material.resources.MaterialResources;
Expand Down
6 changes: 3 additions & 3 deletions lib/java/com/google/android/material/chip/ChipDrawable.java
View file
Expand Up @@ -43,9 +43,6 @@
import android.graphics.drawable.ShapeDrawable;
import android.graphics.drawable.shapes.OvalShape;
import android.os.Build.VERSION_CODES;
import androidx.core.graphics.ColorUtils;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.graphics.drawable.TintAwareDrawable;
import androidx.appcompat.content.res.AppCompatResources;
import android.text.TextUtils;
import android.text.TextUtils.TruncateAt;
Expand All @@ -65,6 +62,9 @@
import androidx.annotation.StringRes;
import androidx.annotation.StyleRes;
import androidx.annotation.XmlRes;
import androidx.core.graphics.ColorUtils;
import androidx.core.graphics.drawable.DrawableCompat;
import androidx.core.graphics.drawable.TintAwareDrawable;
import androidx.core.text.BidiFormatter;
import androidx.core.view.ViewCompat;
import com.google.android.material.animation.MotionSpec;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/color/MaterialColors.java
View file
Expand Up @@ -21,14 +21,14 @@

import android.content.Context;
import android.graphics.Color;
import androidx.core.graphics.ColorUtils;
import android.util.TypedValue;
import android.view.View;
import androidx.annotation.AttrRes;
import androidx.annotation.ColorInt;
import androidx.annotation.FloatRange;
import androidx.annotation.IntRange;
import androidx.annotation.NonNull;
import androidx.core.graphics.ColorUtils;
import com.google.android.material.resources.MaterialAttributes;

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/datepicker/CalendarConstraints.java
View file
Expand Up @@ -18,9 +18,9 @@
import android.os.Bundle;
import android.os.Parcel;
import android.os.Parcelable;
import androidx.core.util.ObjectsCompat;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.util.ObjectsCompat;
import java.util.Arrays;
import java.util.Calendar;

Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/datepicker/CalendarItemStyle.java
View file
Expand Up @@ -26,10 +26,10 @@
import android.graphics.drawable.RippleDrawable;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import androidx.core.util.Preconditions;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.StyleRes;
import androidx.core.util.Preconditions;
import androidx.core.view.ViewCompat;
import com.google.android.material.resources.MaterialResources;
import com.google.android.material.shape.MaterialShapeDrawable;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/datepicker/DateSelector.java
View file
Expand Up @@ -20,7 +20,6 @@
import android.content.Context;
import android.os.Bundle;
import android.os.Parcelable;
import androidx.core.util.Pair;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand All @@ -31,6 +30,7 @@
import androidx.annotation.RestrictTo.Scope;
import androidx.annotation.StringRes;
import androidx.annotation.StyleRes;
import androidx.core.util.Pair;
import java.util.Collection;

/**
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/datepicker/DateStrings.java
View file
Expand Up @@ -18,9 +18,9 @@
import android.icu.text.DateFormat;
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import androidx.core.util.Pair;
import android.text.format.DateUtils;
import androidx.annotation.Nullable;
import androidx.core.util.Pair;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/datepicker/MaterialCalendar.java
View file
Expand Up @@ -23,7 +23,6 @@
import android.os.Build.VERSION;
import android.os.Build.VERSION_CODES;
import android.os.Bundle;
import androidx.core.util.Pair;
import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.PagerSnapHelper;
Expand All @@ -45,6 +44,7 @@
import androidx.annotation.RestrictTo.Scope;
import androidx.annotation.StyleRes;
import androidx.annotation.VisibleForTesting;
import androidx.core.util.Pair;
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/datepicker/MaterialCalendarGridView.java
View file
Expand Up @@ -23,7 +23,6 @@
import android.content.Context;
import android.graphics.Canvas;
import android.graphics.Rect;
import androidx.core.util.Pair;
import android.util.AttributeSet;
import android.view.KeyEvent;
import android.view.View;
Expand All @@ -32,6 +31,7 @@
import android.widget.ListAdapter;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.util.Pair;
import androidx.core.view.AccessibilityDelegateCompat;
import androidx.core.view.ViewCompat;
import androidx.core.view.accessibility.AccessibilityNodeInfoCompat;
Expand Down
2 changes: 1 addition & 1 deletion lib/java/com/google/android/material/datepicker/MaterialDatePicker.java
View file
Expand Up @@ -33,7 +33,6 @@
import android.os.Bundle;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.FragmentTransaction;
import androidx.core.util.Pair;
import androidx.appcompat.content.res.AppCompatResources;
import android.view.LayoutInflater;
import android.view.View;
Expand All @@ -49,6 +48,7 @@
import androidx.annotation.RestrictTo;
import androidx.annotation.StringRes;
import androidx.annotation.StyleRes;
import androidx.core.util.Pair;
import androidx.core.view.ViewCompat;
import com.google.android.material.dialog.InsetDialogOnTouchListener;
import com.google.android.material.internal.CheckableImageButton;
Expand Down

0 comments on commit cfc00aa

Please sign in to comment.