Remove all the extra accessor methods added by javac in support-design.
Change private methods to be package protected to avoid extra methods
that get added to be able to access them from inner classes.
This CL saves 138 methods in our jar.
Bug: 31075707
Change-Id: I9ee192652fe005957e28ccfe35c9707be242aac1
diff --git a/design/base/android/support/design/widget/StateListAnimator.java b/design/base/android/support/design/widget/StateListAnimator.java
index 7ef944ebb..4378ef92 100644
--- a/design/base/android/support/design/widget/StateListAnimator.java
+++ b/design/base/android/support/design/widget/StateListAnimator.java
@@ -25,7 +25,7 @@
private final ArrayList<Tuple> mTuples = new ArrayList<>();
private Tuple mLastMatch = null;
- private ValueAnimatorCompat mRunningAnimator = null;
+ ValueAnimatorCompat mRunningAnimator = null;
private final ValueAnimatorCompat.AnimatorListener mAnimationListener
= new ValueAnimatorCompat.AnimatorListenerAdapter() {
@@ -105,7 +105,7 @@
final int[] mSpecs;
final ValueAnimatorCompat mAnimator;
- private Tuple(int[] specs, ValueAnimatorCompat animator) {
+ Tuple(int[] specs, ValueAnimatorCompat animator) {
mSpecs = specs;
mAnimator = animator;
}
diff --git a/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java b/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
index 2cd3de5..0f53258 100644
--- a/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
+++ b/design/gingerbread/android/support/design/widget/FloatingActionButtonGingerbread.java
@@ -246,6 +246,9 @@
}
private class ResetElevationAnimation extends ShadowAnimatorImpl {
+ ResetElevationAnimation() {
+ }
+
@Override
protected float getTargetShadowSize() {
return mElevation;
@@ -253,6 +256,9 @@
}
private class ElevateToTranslationZAnimation extends ShadowAnimatorImpl {
+ ElevateToTranslationZAnimation() {
+ }
+
@Override
protected float getTargetShadowSize() {
return mElevation + mPressedTranslationZ;
@@ -260,6 +266,9 @@
}
private class DisabledElevationAnimation extends ShadowAnimatorImpl {
+ DisabledElevationAnimation() {
+ }
+
@Override
protected float getTargetShadowSize() {
return 0f;
diff --git a/design/src/android/support/design/internal/NavigationMenuItemView.java b/design/src/android/support/design/internal/NavigationMenuItemView.java
index d1e6027..51553ec 100644
--- a/design/src/android/support/design/internal/NavigationMenuItemView.java
+++ b/design/src/android/support/design/internal/NavigationMenuItemView.java
@@ -51,7 +51,7 @@
private boolean mNeedsEmptyIcon;
- private boolean mCheckable;
+ boolean mCheckable;
private final CheckedTextView mTextView;
diff --git a/design/src/android/support/design/internal/NavigationMenuPresenter.java b/design/src/android/support/design/internal/NavigationMenuPresenter.java
index de2a7c5..bc5ad11 100644
--- a/design/src/android/support/design/internal/NavigationMenuPresenter.java
+++ b/design/src/android/support/design/internal/NavigationMenuPresenter.java
@@ -55,20 +55,20 @@
private static final String STATE_ADAPTER = "android:menu:adapter";
private NavigationMenuView mMenuView;
- private LinearLayout mHeaderLayout;
+ LinearLayout mHeaderLayout;
private Callback mCallback;
- private MenuBuilder mMenu;
+ MenuBuilder mMenu;
private int mId;
- private NavigationMenuAdapter mAdapter;
- private LayoutInflater mLayoutInflater;
+ NavigationMenuAdapter mAdapter;
+ LayoutInflater mLayoutInflater;
- private int mTextAppearance;
- private boolean mTextAppearanceSet;
- private ColorStateList mTextColor;
- private ColorStateList mIconTintList;
- private Drawable mItemBackground;
+ int mTextAppearance;
+ boolean mTextAppearanceSet;
+ ColorStateList mTextColor;
+ ColorStateList mIconTintList;
+ Drawable mItemBackground;
/**
* Padding to be inserted at the top of the list to avoid the first menu item
@@ -79,7 +79,7 @@
/**
* Padding for separators between items
*/
- private int mPaddingSeparator;
+ int mPaddingSeparator;
@Override
public void initForMenu(Context context, MenuBuilder menu) {
@@ -318,7 +318,7 @@
/**
* Handles click events for the menu items. The items has to be {@link NavigationMenuItemView}.
*/
- private final View.OnClickListener mOnClickListener = new View.OnClickListener() {
+ final View.OnClickListener mOnClickListener = new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -612,7 +612,7 @@
boolean needsEmptyIcon;
- private NavigationMenuTextItem(MenuItemImpl item) {
+ NavigationMenuTextItem(MenuItemImpl item) {
mMenuItem = item;
}
@@ -650,6 +650,8 @@
* Header (not subheader) items.
*/
private static class NavigationMenuHeaderItem implements NavigationMenuItem {
+ NavigationMenuHeaderItem() {
+ }
// The actual content is hold by NavigationMenuPresenter#mHeaderLayout.
}
diff --git a/design/src/android/support/design/internal/ScrimInsetsFrameLayout.java b/design/src/android/support/design/internal/ScrimInsetsFrameLayout.java
index 80aee76..34d3a79 100644
--- a/design/src/android/support/design/internal/ScrimInsetsFrameLayout.java
+++ b/design/src/android/support/design/internal/ScrimInsetsFrameLayout.java
@@ -34,9 +34,9 @@
*/
public class ScrimInsetsFrameLayout extends FrameLayout {
- private Drawable mInsetForeground;
+ Drawable mInsetForeground;
- private Rect mInsets;
+ Rect mInsets;
private Rect mTempRect = new Rect();
diff --git a/design/src/android/support/design/widget/AppBarLayout.java b/design/src/android/support/design/widget/AppBarLayout.java
index c253029..af9811f 100644
--- a/design/src/android/support/design/widget/AppBarLayout.java
+++ b/design/src/android/support/design/widget/AppBarLayout.java
@@ -103,10 +103,10 @@
@CoordinatorLayout.DefaultBehavior(AppBarLayout.Behavior.class)
public class AppBarLayout extends LinearLayout {
- private static final int PENDING_ACTION_NONE = 0x0;
- private static final int PENDING_ACTION_EXPANDED = 0x1;
- private static final int PENDING_ACTION_COLLAPSED = 0x2;
- private static final int PENDING_ACTION_ANIMATE_ENABLED = 0x4;
+ static final int PENDING_ACTION_NONE = 0x0;
+ static final int PENDING_ACTION_EXPANDED = 0x1;
+ static final int PENDING_ACTION_COLLAPSED = 0x2;
+ static final int PENDING_ACTION_ANIMATE_ENABLED = 0x4;
/**
* Interface definition for a callback to be invoked when an {@link AppBarLayout}'s vertical
@@ -325,7 +325,7 @@
return new LayoutParams(p);
}
- private boolean hasChildWithInterpolator() {
+ boolean hasChildWithInterpolator() {
return mHaveChildWithInterpolator;
}
@@ -366,21 +366,21 @@
return mTotalScrollRange = Math.max(0, range - getTopInset());
}
- private boolean hasScrollableChildren() {
+ boolean hasScrollableChildren() {
return getTotalScrollRange() != 0;
}
/**
* Return the scroll range when scrolling up from a nested pre-scroll.
*/
- private int getUpNestedPreScrollRange() {
+ int getUpNestedPreScrollRange() {
return getTotalScrollRange();
}
/**
* Return the scroll range when scrolling down from a nested pre-scroll.
*/
- private int getDownNestedPreScrollRange() {
+ int getDownNestedPreScrollRange() {
if (mDownPreScrollRange != INVALID_SCROLL_RANGE) {
// If we already have a valid value, return it
return mDownPreScrollRange;
@@ -419,7 +419,7 @@
/**
* Return the scroll range when scrolling down from a nested scroll.
*/
- private int getDownNestedScrollRange() {
+ int getDownNestedScrollRange() {
if (mDownScrollRange != INVALID_SCROLL_RANGE) {
// If we already have a valid value, return it
return mDownScrollRange;
@@ -454,7 +454,7 @@
return mDownScrollRange = Math.max(0, range);
}
- private void dispatchOffsetUpdates(int offset) {
+ void dispatchOffsetUpdates(int offset) {
// Iterate backwards through the list so that most recently added listeners
// get the first chance to decide
if (mListeners != null) {
@@ -519,7 +519,7 @@
*
* @return true if the collapsed state changed
*/
- private boolean setCollapsedState(boolean collapsed) {
+ boolean setCollapsedState(boolean collapsed) {
if (mCollapsed != collapsed) {
mCollapsed = collapsed;
refreshDrawableState();
@@ -553,11 +553,11 @@
return 0;
}
- private int getPendingAction() {
+ int getPendingAction() {
return mPendingAction;
}
- private void resetPendingAction() {
+ void resetPendingAction() {
mPendingAction = PENDING_ACTION_NONE;
}
@@ -566,7 +566,7 @@
return mLastInsets != null ? mLastInsets.getSystemWindowInsetTop() : 0;
}
- private WindowInsetsCompat onWindowInsetChanged(final WindowInsetsCompat insets) {
+ WindowInsetsCompat onWindowInsetChanged(final WindowInsetsCompat insets) {
WindowInsetsCompat newInsets = null;
if (ViewCompat.getFitsSystemWindows(this)) {
@@ -742,7 +742,7 @@
/**
* Returns true if the scroll flags are compatible for 'collapsing'
*/
- private boolean isCollapsible() {
+ boolean isCollapsible() {
return (mScrollFlags & SCROLL_FLAG_SCROLL) == SCROLL_FLAG_SCROLL
&& (mScrollFlags & COLLAPSIBLE_FLAGS) != 0;
}
diff --git a/design/src/android/support/design/widget/BottomSheetBehavior.java b/design/src/android/support/design/widget/BottomSheetBehavior.java
index 1337352..dba6920 100644
--- a/design/src/android/support/design/widget/BottomSheetBehavior.java
+++ b/design/src/android/support/design/widget/BottomSheetBehavior.java
@@ -128,18 +128,18 @@
private int mPeekHeightMin;
- private int mMinOffset;
+ int mMinOffset;
- private int mMaxOffset;
+ int mMaxOffset;
- private boolean mHideable;
+ boolean mHideable;
private boolean mSkipCollapsed;
@State
- private int mState = STATE_COLLAPSED;
+ int mState = STATE_COLLAPSED;
- private ViewDragHelper mViewDragHelper;
+ ViewDragHelper mViewDragHelper;
private boolean mIgnoreEvents;
@@ -147,21 +147,21 @@
private boolean mNestedScrolled;
- private int mParentHeight;
+ int mParentHeight;
- private WeakReference<V> mViewRef;
+ WeakReference<V> mViewRef;
- private WeakReference<View> mNestedScrollingChildRef;
+ WeakReference<View> mNestedScrollingChildRef;
private BottomSheetCallback mCallback;
private VelocityTracker mVelocityTracker;
- private int mActivePointerId;
+ int mActivePointerId;
private int mInitialY;
- private boolean mTouchingScrollingChild;
+ boolean mTouchingScrollingChild;
/**
* Default constructor for instantiating BottomSheetBehaviors.
@@ -560,7 +560,7 @@
return mState;
}
- private void setStateInternal(@State int state) {
+ void setStateInternal(@State int state) {
if (mState == state) {
return;
}
@@ -579,7 +579,7 @@
}
}
- private boolean shouldHide(View child, float yvel) {
+ boolean shouldHide(View child, float yvel) {
if (mSkipCollapsed) {
return true;
}
@@ -612,7 +612,7 @@
return VelocityTrackerCompat.getYVelocity(mVelocityTracker, mActivePointerId);
}
- private void startSettlingAnimation(View child, int state) {
+ void startSettlingAnimation(View child, int state) {
int top;
if (state == STATE_COLLAPSED) {
top = mMaxOffset;
@@ -713,7 +713,7 @@
}
};
- private void dispatchOnSlide(int top) {
+ void dispatchOnSlide(int top) {
View bottomSheet = mViewRef.get();
if (bottomSheet != null && mCallback != null) {
if (top > mMaxOffset) {
diff --git a/design/src/android/support/design/widget/BottomSheetDialog.java b/design/src/android/support/design/widget/BottomSheetDialog.java
index 0473e54..4c124f3 100644
--- a/design/src/android/support/design/widget/BottomSheetDialog.java
+++ b/design/src/android/support/design/widget/BottomSheetDialog.java
@@ -38,7 +38,7 @@
private BottomSheetBehavior<FrameLayout> mBehavior;
- private boolean mCancelable = true;
+ boolean mCancelable = true;
private boolean mCanceledOnTouchOutside = true;
private boolean mCanceledOnTouchOutsideSet;
@@ -130,7 +130,7 @@
return coordinator;
}
- private boolean shouldWindowCloseOnTouchOutside() {
+ boolean shouldWindowCloseOnTouchOutside() {
if (!mCanceledOnTouchOutsideSet) {
if (Build.VERSION.SDK_INT < 11) {
mCanceledOnTouchOutside = true;
diff --git a/design/src/android/support/design/widget/CollapsingToolbarLayout.java b/design/src/android/support/design/widget/CollapsingToolbarLayout.java
index 6d95dec..0fbb75d 100644
--- a/design/src/android/support/design/widget/CollapsingToolbarLayout.java
+++ b/design/src/android/support/design/widget/CollapsingToolbarLayout.java
@@ -114,12 +114,12 @@
private int mExpandedMarginBottom;
private final Rect mTmpRect = new Rect();
- private final CollapsingTextHelper mCollapsingTextHelper;
+ final CollapsingTextHelper mCollapsingTextHelper;
private boolean mCollapsingTitleEnabled;
private boolean mDrawCollapsingTitle;
private Drawable mContentScrim;
- private Drawable mStatusBarScrim;
+ Drawable mStatusBarScrim;
private int mScrimAlpha;
private boolean mScrimsAreShown;
private ValueAnimatorCompat mScrimAnimator;
@@ -128,9 +128,9 @@
private AppBarLayout.OnOffsetChangedListener mOnOffsetChangedListener;
- private int mCurrentOffset;
+ int mCurrentOffset;
- private WindowInsetsCompat mLastInsets;
+ WindowInsetsCompat mLastInsets;
public CollapsingToolbarLayout(Context context) {
this(context, null);
@@ -258,7 +258,7 @@
super.onDetachedFromWindow();
}
- private WindowInsetsCompat onWindowInsetChanged(final WindowInsetsCompat insets) {
+ WindowInsetsCompat onWindowInsetChanged(final WindowInsetsCompat insets) {
WindowInsetsCompat newInsets = null;
if (ViewCompat.getFitsSystemWindows(this)) {
@@ -490,7 +490,7 @@
return view.getHeight();
}
- private static ViewOffsetHelper getViewOffsetHelper(View view) {
+ static ViewOffsetHelper getViewOffsetHelper(View view) {
ViewOffsetHelper offsetHelper = (ViewOffsetHelper) view.getTag(R.id.view_offset_helper);
if (offsetHelper == null) {
offsetHelper = new ViewOffsetHelper(view);
@@ -609,7 +609,7 @@
mScrimAnimator.start();
}
- private void setScrimAlpha(int alpha) {
+ void setScrimAlpha(int alpha) {
if (alpha != mScrimAlpha) {
final Drawable contentScrim = mContentScrim;
if (contentScrim != null && mToolbar != null) {
@@ -1241,6 +1241,9 @@
}
private class OffsetUpdateListener implements AppBarLayout.OnOffsetChangedListener {
+ OffsetUpdateListener() {
+ }
+
@Override
public void onOffsetChanged(AppBarLayout layout, int verticalOffset) {
mCurrentOffset = verticalOffset;
diff --git a/design/src/android/support/design/widget/CoordinatorLayout.java b/design/src/android/support/design/widget/CoordinatorLayout.java
index 201ed9b..548c9ad 100644
--- a/design/src/android/support/design/widget/CoordinatorLayout.java
+++ b/design/src/android/support/design/widget/CoordinatorLayout.java
@@ -132,9 +132,9 @@
new ThreadLocal<>();
- private static final int EVENT_PRE_DRAW = 0;
- private static final int EVENT_NESTED_SCROLL = 1;
- private static final int EVENT_VIEW_REMOVED = 2;
+ static final int EVENT_PRE_DRAW = 0;
+ static final int EVENT_NESTED_SCROLL = 1;
+ static final int EVENT_VIEW_REMOVED = 2;
/** @hide */
@Retention(RetentionPolicy.SOURCE)
@@ -172,7 +172,7 @@
private boolean mDrawStatusBarBackground;
private Drawable mStatusBarBackground;
- private OnHierarchyChangeListener mOnHierarchyChangeListener;
+ OnHierarchyChangeListener mOnHierarchyChangeListener;
private android.support.v4.view.OnApplyWindowInsetsListener mApplyWindowInsetsListener;
private final NestedScrollingParentHelper mNestedScrollingParentHelper =
@@ -2502,8 +2502,8 @@
*/
public int dodgeInsetEdges = Gravity.NO_GRAVITY;
- private int mInsetOffsetX;
- private int mInsetOffsetY;
+ int mInsetOffsetX;
+ int mInsetOffsetY;
View mAnchorView;
View mAnchorDirectChild;
@@ -2851,6 +2851,9 @@
}
private class HierarchyChangeListener implements OnHierarchyChangeListener {
+ HierarchyChangeListener() {
+ }
+
@Override
public void onChildViewAdded(View parent, View child) {
if (mOnHierarchyChangeListener != null) {
diff --git a/design/src/android/support/design/widget/FloatingActionButton.java b/design/src/android/support/design/widget/FloatingActionButton.java
index 68b7c5b..de19e5a 100644
--- a/design/src/android/support/design/widget/FloatingActionButton.java
+++ b/design/src/android/support/design/widget/FloatingActionButton.java
@@ -130,11 +130,11 @@
private int mBorderWidth;
private int mRippleColor;
private int mSize;
- private int mImagePadding;
+ int mImagePadding;
private int mMaxImageSize;
- private boolean mCompatPadding;
- private final Rect mShadowPadding = new Rect();
+ boolean mCompatPadding;
+ final Rect mShadowPadding = new Rect();
private final Rect mTouchArea = new Rect();
private AppCompatImageHelper mImageHelper;
@@ -309,7 +309,7 @@
show(listener, true);
}
- private void show(OnVisibilityChangedListener listener, boolean fromUser) {
+ void show(OnVisibilityChangedListener listener, boolean fromUser) {
getImpl().show(wrapOnVisibilityChangedListener(listener), fromUser);
}
@@ -331,7 +331,7 @@
hide(listener, true);
}
- private void hide(@Nullable OnVisibilityChangedListener listener, boolean fromUser) {
+ void hide(@Nullable OnVisibilityChangedListener listener, boolean fromUser) {
getImpl().hide(wrapOnVisibilityChangedListener(listener), fromUser);
}
@@ -414,7 +414,7 @@
};
}
- private int getSizeDimension() {
+ int getSizeDimension() {
return getSizeDimension(mSize);
}
@@ -790,6 +790,9 @@
}
private class ShadowDelegateImpl implements ShadowViewDelegate {
+ ShadowDelegateImpl() {
+ }
+
@Override
public float getRadius() {
return getSizeDimension() / 2f;
diff --git a/design/src/android/support/design/widget/HeaderBehavior.java b/design/src/android/support/design/widget/HeaderBehavior.java
index 7dd2700..5e555de 100644
--- a/design/src/android/support/design/widget/HeaderBehavior.java
+++ b/design/src/android/support/design/widget/HeaderBehavior.java
@@ -37,7 +37,7 @@
private static final int INVALID_POINTER = -1;
private Runnable mFlingRunnable;
- private ScrollerCompat mScroller;
+ ScrollerCompat mScroller;
private boolean mIsBeingDragged;
private int mActivePointerId = INVALID_POINTER;
diff --git a/design/src/android/support/design/widget/NavigationView.java b/design/src/android/support/design/widget/NavigationView.java
index e53b7e8..e4fbf39 100644
--- a/design/src/android/support/design/widget/NavigationView.java
+++ b/design/src/android/support/design/widget/NavigationView.java
@@ -84,7 +84,7 @@
private final NavigationMenu mMenu;
private final NavigationMenuPresenter mPresenter = new NavigationMenuPresenter();
- private OnNavigationItemSelectedListener mListener;
+ OnNavigationItemSelectedListener mListener;
private int mMaxWidth;
private MenuInflater mMenuInflater;
diff --git a/design/src/android/support/design/widget/Snackbar.java b/design/src/android/support/design/widget/Snackbar.java
index bc5df7f..2c87529 100644
--- a/design/src/android/support/design/widget/Snackbar.java
+++ b/design/src/android/support/design/widget/Snackbar.java
@@ -154,9 +154,9 @@
static final int ANIMATION_DURATION = 250;
static final int ANIMATION_FADE_DURATION = 180;
- private static final Handler sHandler;
- private static final int MSG_SHOW = 0;
- private static final int MSG_DISMISS = 1;
+ static final Handler sHandler;
+ static final int MSG_SHOW = 0;
+ static final int MSG_DISMISS = 1;
static {
sHandler = new Handler(Looper.getMainLooper(), new Handler.Callback() {
@@ -177,7 +177,7 @@
private final ViewGroup mTargetParent;
private final Context mContext;
- private final SnackbarLayout mView;
+ final SnackbarLayout mView;
private int mDuration;
private Callback mCallback;
@@ -401,7 +401,7 @@
dispatchDismiss(Callback.DISMISS_EVENT_MANUAL);
}
- private void dispatchDismiss(@Callback.DismissEvent int event) {
+ void dispatchDismiss(@Callback.DismissEvent int event) {
SnackbarManager.getInstance().dismiss(mManagerCallback, event);
}
@@ -429,7 +429,7 @@
return SnackbarManager.getInstance().isCurrentOrNext(mManagerCallback);
}
- private final SnackbarManager.Callback mManagerCallback = new SnackbarManager.Callback() {
+ final SnackbarManager.Callback mManagerCallback = new SnackbarManager.Callback() {
@Override
public void show() {
sHandler.sendMessage(sHandler.obtainMessage(MSG_SHOW, Snackbar.this));
@@ -531,7 +531,7 @@
}
}
- private void animateViewIn() {
+ void animateViewIn() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.ICE_CREAM_SANDWICH) {
ViewCompat.setTranslationY(mView, mView.getHeight());
ViewCompat.animate(mView)
@@ -618,14 +618,14 @@
}
}
- private void onViewShown() {
+ void onViewShown() {
SnackbarManager.getInstance().onShown(mManagerCallback);
if (mCallback != null) {
mCallback.onShown(this);
}
}
- private void onViewHidden(int event) {
+ void onViewHidden(int event) {
// First tell the SnackbarManager that it has been dismissed
SnackbarManager.getInstance().onDismissed(mManagerCallback);
// Now call the dismiss listener (if available)
@@ -650,7 +650,7 @@
/**
* Returns true if we should animate the Snackbar view in/out.
*/
- private boolean shouldAnimate() {
+ boolean shouldAnimate() {
return !mAccessibilityManager.isEnabled();
}
diff --git a/design/src/android/support/design/widget/SnackbarManager.java b/design/src/android/support/design/widget/SnackbarManager.java
index e0c3922..b391a3a 100644
--- a/design/src/android/support/design/widget/SnackbarManager.java
+++ b/design/src/android/support/design/widget/SnackbarManager.java
@@ -27,7 +27,7 @@
*/
class SnackbarManager {
- private static final int MSG_TIMEOUT = 0;
+ static final int MSG_TIMEOUT = 0;
private static final int SHORT_DURATION_MS = 1500;
private static final int LONG_DURATION_MS = 2750;
@@ -166,8 +166,8 @@
}
private static class SnackbarRecord {
- private final WeakReference<Callback> callback;
- private int duration;
+ final WeakReference<Callback> callback;
+ int duration;
SnackbarRecord(int duration, Callback callback) {
this.callback = new WeakReference<>(callback);
@@ -229,7 +229,7 @@
mHandler.sendMessageDelayed(Message.obtain(mHandler, MSG_TIMEOUT, r), durationMs);
}
- private void handleTimeout(SnackbarRecord record) {
+ void handleTimeout(SnackbarRecord record) {
synchronized (mLock) {
if (mCurrentSnackbar == record || mNextSnackbar == record) {
cancelSnackbarLocked(record, Snackbar.Callback.DISMISS_EVENT_TIMEOUT);
diff --git a/design/src/android/support/design/widget/SwipeDismissBehavior.java b/design/src/android/support/design/widget/SwipeDismissBehavior.java
index ae1ef86..c2e02cd 100644
--- a/design/src/android/support/design/widget/SwipeDismissBehavior.java
+++ b/design/src/android/support/design/widget/SwipeDismissBehavior.java
@@ -78,17 +78,17 @@
private static final float DEFAULT_ALPHA_START_DISTANCE = 0f;
private static final float DEFAULT_ALPHA_END_DISTANCE = DEFAULT_DRAG_DISMISS_THRESHOLD;
- private ViewDragHelper mViewDragHelper;
- private OnDismissListener mListener;
+ ViewDragHelper mViewDragHelper;
+ OnDismissListener mListener;
private boolean mInterceptingEvents;
private float mSensitivity = 0f;
private boolean mSensitivitySet;
- private int mSwipeDirection = SWIPE_DIRECTION_ANY;
- private float mDragDismissThreshold = DEFAULT_DRAG_DISMISS_THRESHOLD;
- private float mAlphaStartSwipeDistance = DEFAULT_ALPHA_START_DISTANCE;
- private float mAlphaEndSwipeDistance = DEFAULT_ALPHA_END_DISTANCE;
+ int mSwipeDirection = SWIPE_DIRECTION_ANY;
+ float mDragDismissThreshold = DEFAULT_DRAG_DISMISS_THRESHOLD;
+ float mAlphaStartSwipeDistance = DEFAULT_ALPHA_START_DISTANCE;
+ float mAlphaEndSwipeDistance = DEFAULT_ALPHA_END_DISTANCE;
/**
* Callback interface used to notify the application that the view has been dismissed.
@@ -381,11 +381,11 @@
}
}
- private static float clamp(float min, float value, float max) {
+ static float clamp(float min, float value, float max) {
return Math.min(Math.max(min, value), max);
}
- private static int clamp(int min, int value, int max) {
+ static int clamp(int min, int value, int max) {
return Math.min(Math.max(min, value), max);
}
diff --git a/design/src/android/support/design/widget/TabLayout.java b/design/src/android/support/design/widget/TabLayout.java
index 01ca835..63ede27 100755
--- a/design/src/android/support/design/widget/TabLayout.java
+++ b/design/src/android/support/design/widget/TabLayout.java
@@ -144,12 +144,12 @@
public class TabLayout extends HorizontalScrollView {
private static final int DEFAULT_HEIGHT_WITH_TEXT_ICON = 72; // dps
- private static final int DEFAULT_GAP_TEXT_ICON = 8; // dps
+ static final int DEFAULT_GAP_TEXT_ICON = 8; // dps
private static final int INVALID_WIDTH = -1;
private static final int DEFAULT_HEIGHT = 48; // dps
private static final int TAB_MIN_WIDTH_MARGIN = 56; //dps
- private static final int FIXED_WRAP_GUTTER_MIN = 16; //dps
- private static final int MOTION_NON_ADJACENT_OFFSET = 24;
+ static final int FIXED_WRAP_GUTTER_MIN = 16; //dps
+ static final int MOTION_NON_ADJACENT_OFFSET = 24;
private static final int ANIMATION_DURATION = 300;
@@ -239,27 +239,27 @@
private final SlidingTabStrip mTabStrip;
- private int mTabPaddingStart;
- private int mTabPaddingTop;
- private int mTabPaddingEnd;
- private int mTabPaddingBottom;
+ int mTabPaddingStart;
+ int mTabPaddingTop;
+ int mTabPaddingEnd;
+ int mTabPaddingBottom;
- private int mTabTextAppearance;
- private ColorStateList mTabTextColors;
- private float mTabTextSize;
- private float mTabTextMultiLineSize;
+ int mTabTextAppearance;
+ ColorStateList mTabTextColors;
+ float mTabTextSize;
+ float mTabTextMultiLineSize;
- private final int mTabBackgroundResId;
+ final int mTabBackgroundResId;
- private int mTabMaxWidth = Integer.MAX_VALUE;
+ int mTabMaxWidth = Integer.MAX_VALUE;
private final int mRequestedTabMinWidth;
private final int mRequestedTabMaxWidth;
private final int mScrollableTabMinWidth;
private int mContentInsetStart;
- private int mTabGravity;
- private int mMode;
+ int mTabGravity;
+ int mMode;
private OnTabSelectedListener mSelectedListener;
private final ArrayList<OnTabSelectedListener> mSelectedListeners = new ArrayList<>();
@@ -267,7 +267,7 @@
private ValueAnimatorCompat mScrollAnimator;
- private ViewPager mViewPager;
+ ViewPager mViewPager;
private PagerAdapter mPagerAdapter;
private DataSetObserver mPagerAdapterObserver;
private TabLayoutOnPageChangeListener mPageChangeListener;
@@ -399,7 +399,7 @@
setScrollPosition(position, positionOffset, updateSelectedText, true);
}
- private void setScrollPosition(int position, float positionOffset, boolean updateSelectedText,
+ void setScrollPosition(int position, float positionOffset, boolean updateSelectedText,
boolean updateIndicatorPosition) {
final int roundedPosition = Math.round(position + positionOffset);
if (roundedPosition < 0 || roundedPosition >= mTabStrip.getChildCount()) {
@@ -874,7 +874,7 @@
- getPaddingRight());
}
- private void setPagerAdapter(@Nullable final PagerAdapter adapter, final boolean addObserver) {
+ void setPagerAdapter(@Nullable final PagerAdapter adapter, final boolean addObserver) {
if (mPagerAdapter != null && mPagerAdapterObserver != null) {
// If we already have a PagerAdapter, unregister our observer
mPagerAdapter.unregisterDataSetObserver(mPagerAdapterObserver);
@@ -894,7 +894,7 @@
populateFromPagerAdapter();
}
- private void populateFromPagerAdapter() {
+ void populateFromPagerAdapter() {
removeAllTabs();
if (mPagerAdapter != null) {
@@ -990,7 +990,7 @@
}
}
- private int dpToPx(int dps) {
+ int dpToPx(int dps) {
return Math.round(getResources().getDisplayMetrics().density * dps);
}
@@ -1199,7 +1199,7 @@
updateTabViews(true);
}
- private void updateTabViews(final boolean requestLayout) {
+ void updateTabViews(final boolean requestLayout) {
for (int i = 0; i < mTabStrip.getChildCount(); i++) {
View child = mTabStrip.getChildAt(i);
child.setMinimumWidth(getTabMinWidth());
@@ -1229,10 +1229,10 @@
private int mPosition = INVALID_POSITION;
private View mCustomView;
- private TabLayout mParent;
- private TabView mView;
+ TabLayout mParent;
+ TabView mView;
- private Tab() {
+ Tab() {
// Private constructor
}
@@ -1462,13 +1462,13 @@
return mContentDesc;
}
- private void updateView() {
+ void updateView() {
if (mView != null) {
mView.update();
}
}
- private void reset() {
+ void reset() {
mParent = null;
mView = null;
mTag = null;
@@ -1621,14 +1621,14 @@
}
}
- private void setTab(@Nullable final Tab tab) {
+ void setTab(@Nullable final Tab tab) {
if (tab != mTab) {
mTab = tab;
update();
}
}
- private void reset() {
+ void reset() {
setTab(null);
setSelected(false);
}
@@ -1798,8 +1798,8 @@
private int mSelectedIndicatorHeight;
private final Paint mSelectedIndicatorPaint;
- private int mSelectedPosition = -1;
- private float mSelectionOffset;
+ int mSelectedPosition = -1;
+ float mSelectionOffset;
private int mIndicatorLeft = -1;
private int mIndicatorRight = -1;
@@ -1947,7 +1947,7 @@
setIndicatorPosition(left, right);
}
- private void setIndicatorPosition(int left, int right) {
+ void setIndicatorPosition(int left, int right) {
if (left != mIndicatorLeft || right != mIndicatorRight) {
// If the indicator's left/right has changed, invalidate
mIndicatorLeft = left;
@@ -2084,7 +2084,7 @@
return generateDefaultLayoutParams();
}
- private int getTabMaxWidth() {
+ int getTabMaxWidth() {
return mTabMaxWidth;
}
@@ -2145,7 +2145,7 @@
}
}
- private void reset() {
+ void reset() {
mPreviousScrollState = mScrollState = SCROLL_STATE_IDLE;
}
}
@@ -2178,6 +2178,9 @@
}
private class PagerAdapterObserver extends DataSetObserver {
+ PagerAdapterObserver() {
+ }
+
@Override
public void onChanged() {
populateFromPagerAdapter();
@@ -2192,6 +2195,9 @@
private class AdapterChangeListener implements ViewPager.OnAdapterChangeListener {
private boolean mAutoRefresh;
+ AdapterChangeListener() {
+ }
+
@Override
public void onAdapterChanged(@NonNull ViewPager viewPager,
@Nullable PagerAdapter oldAdapter, @Nullable PagerAdapter newAdapter) {
diff --git a/design/src/android/support/design/widget/TextInputLayout.java b/design/src/android/support/design/widget/TextInputLayout.java
index 44925f7..add7b76 100644
--- a/design/src/android/support/design/widget/TextInputLayout.java
+++ b/design/src/android/support/design/widget/TextInputLayout.java
@@ -102,7 +102,7 @@
private static final String LOG_TAG = "TextInputLayout";
private final FrameLayout mInputFrame;
- private EditText mEditText;
+ EditText mEditText;
private boolean mHintEnabled;
private CharSequence mHint;
@@ -114,12 +114,12 @@
private int mIndicatorsAdded;
private boolean mErrorEnabled;
- private TextView mErrorView;
+ TextView mErrorView;
private int mErrorTextAppearance;
private boolean mErrorShown;
private CharSequence mError;
- private boolean mCounterEnabled;
+ boolean mCounterEnabled;
private TextView mCounterView;
private int mCounterMaxLength;
private int mCounterTextAppearance;
@@ -144,7 +144,7 @@
// Only used for testing
private boolean mHintExpanded;
- private final CollapsingTextHelper mCollapsingTextHelper = new CollapsingTextHelper(this);
+ final CollapsingTextHelper mCollapsingTextHelper = new CollapsingTextHelper(this);
private boolean mHintAnimationEnabled;
private ValueAnimatorCompat mAnimator;
@@ -371,7 +371,7 @@
}
}
- private void updateLabelState(boolean animate) {
+ void updateLabelState(boolean animate) {
final boolean isEnabled = isEnabled();
final boolean hasText = mEditText != null && !TextUtils.isEmpty(mEditText.getText());
final boolean isFocused = arrayContains(getDrawableState(), android.R.attr.state_focused);
@@ -782,7 +782,7 @@
return mCounterMaxLength;
}
- private void updateCounter(int length) {
+ void updateCounter(int length) {
boolean wasCounterOverflowed = mCounterOverflowed;
if (mCounterMaxLength == INVALID_MAX_LENGTH) {
mCounterView.setText(String.valueOf(length));
@@ -1193,7 +1193,7 @@
applyPasswordToggleTint();
}
- private void passwordVisibilityToggleRequested() {
+ void passwordVisibilityToggleRequested() {
if (mPasswordToggleEnabled) {
// Store the current cursor position
final int selection = mEditText.getSelectionEnd();
@@ -1346,6 +1346,9 @@
}
private class TextInputAccessibilityDelegate extends AccessibilityDelegateCompat {
+ TextInputAccessibilityDelegate() {
+ }
+
@Override
public void onInitializeAccessibilityEvent(View host, AccessibilityEvent event) {
super.onInitializeAccessibilityEvent(host, event);
diff --git a/design/src/android/support/design/widget/ViewGroupUtils.java b/design/src/android/support/design/widget/ViewGroupUtils.java
index a5d2f8a..bb5e1b6 100644
--- a/design/src/android/support/design/widget/ViewGroupUtils.java
+++ b/design/src/android/support/design/widget/ViewGroupUtils.java
@@ -28,6 +28,9 @@
}
private static class ViewGroupUtilsImplBase implements ViewGroupUtilsImpl {
+ ViewGroupUtilsImplBase() {
+ }
+
@Override
public void offsetDescendantRect(ViewGroup parent, View child, Rect rect) {
parent.offsetDescendantRectToMyCoords(child, rect);
@@ -39,6 +42,9 @@
}
private static class ViewGroupUtilsImplHoneycomb implements ViewGroupUtilsImpl {
+ ViewGroupUtilsImplHoneycomb() {
+ }
+
@Override
public void offsetDescendantRect(ViewGroup parent, View child, Rect rect) {
ViewGroupUtilsHoneycomb.offsetDescendantRect(parent, child, rect);
