Remove all the extra accessor methods added by javac in support-v7-appcompat.
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 196 methods in our jar.
Bug: 31075707
Change-Id: I2592b845b920384ff523fe130f634d5808a382a8
diff --git a/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java b/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
index 5cbebc6..3db19dc 100644
--- a/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
+++ b/v7/appcompat/src/android/support/v7/app/ActionBarDrawerToggle.java
@@ -117,12 +117,12 @@
private DrawerArrowDrawable mSlider;
private Drawable mHomeAsUpIndicator;
- private boolean mDrawerIndicatorEnabled = true;
+ boolean mDrawerIndicatorEnabled = true;
private boolean mHasCustomUpIndicator;
private final int mOpenDrawerContentDescRes;
private final int mCloseDrawerContentDescRes;
// used in toolbar mode when DrawerToggle is disabled
- private View.OnClickListener mToolbarNavigationClickListener;
+ View.OnClickListener mToolbarNavigationClickListener;
// If developer does not set displayHomeAsUp, DrawerToggle won't show up.
// DrawerToggle logs a warning if this case is detected
private boolean mWarnedForDisplayHomeAsUp = false;
@@ -280,7 +280,7 @@
return false;
}
- private void toggle() {
+ void toggle() {
int drawerLockMode = mDrawerLayout.getDrawerLockMode(GravityCompat.START);
if (mDrawerLayout.isDrawerVisible(GravityCompat.START)
&& (drawerLockMode != DrawerLayout.LOCK_MODE_LOCKED_OPEN)) {
@@ -499,7 +499,7 @@
final Activity mActivity;
ActionBarDrawerToggleHoneycomb.SetIndicatorInfo mSetIndicatorInfo;
- private HoneycombDelegate(Activity activity) {
+ HoneycombDelegate(Activity activity) {
mActivity = activity;
}
@@ -552,7 +552,7 @@
final Activity mActivity;
- private JellybeanMr2Delegate(Activity activity) {
+ JellybeanMr2Delegate(Activity activity) {
mActivity = activity;
}
diff --git a/v7/appcompat/src/android/support/v7/app/AlertController.java b/v7/appcompat/src/android/support/v7/app/AlertController.java
index 0dca7fb..c7aad2d 100644
--- a/v7/appcompat/src/android/support/v7/app/AlertController.java
+++ b/v7/appcompat/src/android/support/v7/app/AlertController.java
@@ -60,12 +60,12 @@
class AlertController {
private final Context mContext;
- private final AppCompatDialog mDialog;
+ final AppCompatDialog mDialog;
private final Window mWindow;
private CharSequence mTitle;
private CharSequence mMessage;
- private ListView mListView;
+ ListView mListView;
private View mView;
private int mViewLayoutResId;
@@ -76,19 +76,19 @@
private int mViewSpacingBottom;
private boolean mViewSpacingSpecified = false;
- private Button mButtonPositive;
+ Button mButtonPositive;
private CharSequence mButtonPositiveText;
- private Message mButtonPositiveMessage;
+ Message mButtonPositiveMessage;
- private Button mButtonNegative;
+ Button mButtonNegative;
private CharSequence mButtonNegativeText;
- private Message mButtonNegativeMessage;
+ Message mButtonNegativeMessage;
- private Button mButtonNeutral;
+ Button mButtonNeutral;
private CharSequence mButtonNeutralText;
- private Message mButtonNeutralMessage;
+ Message mButtonNeutralMessage;
- private NestedScrollView mScrollView;
+ NestedScrollView mScrollView;
private int mIconId = 0;
private Drawable mIcon;
@@ -98,20 +98,20 @@
private TextView mMessageView;
private View mCustomTitleView;
- private ListAdapter mAdapter;
+ ListAdapter mAdapter;
- private int mCheckedItem = -1;
+ int mCheckedItem = -1;
private int mAlertDialogLayout;
private int mButtonPanelSideLayout;
- private int mListLayout;
- private int mMultiChoiceItemLayout;
- private int mSingleChoiceItemLayout;
- private int mListItemLayout;
+ int mListLayout;
+ int mMultiChoiceItemLayout;
+ int mSingleChoiceItemLayout;
+ int mListItemLayout;
private int mButtonPanelLayoutHint = AlertDialog.LAYOUT_HINT_NONE;
- private Handler mHandler;
+ Handler mHandler;
private final View.OnClickListener mButtonHandler = new View.OnClickListener() {
@Override
@@ -700,7 +700,7 @@
}
}
- private static void manageScrollIndicators(View v, View upIndicator, View downIndicator) {
+ static void manageScrollIndicators(View v, View upIndicator, View downIndicator) {
if (upIndicator != null) {
upIndicator.setVisibility(
ViewCompat.canScrollVertically(v, -1) ? View.VISIBLE : View.INVISIBLE);
diff --git a/v7/appcompat/src/android/support/v7/app/AlertDialog.java b/v7/appcompat/src/android/support/v7/app/AlertDialog.java
index 5c0a1d7..3b9f5aa 100644
--- a/v7/appcompat/src/android/support/v7/app/AlertDialog.java
+++ b/v7/appcompat/src/android/support/v7/app/AlertDialog.java
@@ -69,7 +69,7 @@
*/
public class AlertDialog extends AppCompatDialog implements DialogInterface {
- private final AlertController mAlert;
+ final AlertController mAlert;
/**
* No layout hint.
@@ -103,7 +103,7 @@
setOnCancelListener(cancelListener);
}
- private static int resolveDialogTheme(@NonNull Context context, @StyleRes int resid) {
+ static int resolveDialogTheme(@NonNull Context context, @StyleRes int resid) {
if (resid >= 0x01000000) { // start of real resource IDs.
return resid;
} else {
diff --git a/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplBase.java b/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplBase.java
index f680b6d..b26f3df 100644
--- a/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplBase.java
+++ b/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplBase.java
@@ -43,7 +43,7 @@
private static boolean sInstalledExceptionHandler;
private static final boolean SHOULD_INSTALL_EXCEPTION_HANDLER = Build.VERSION.SDK_INT < 21;
- private static final String EXCEPTION_HANDLER_MESSAGE_SUFFIX= ". If the resource you are"
+ static final String EXCEPTION_HANDLER_MESSAGE_SUFFIX= ". If the resource you are"
+ " trying to use is a vector resource, you may be referencing it in an unsupported"
+ " way. See AppCompatDelegate.setCompatVectorFromResourcesEnabled() for more info.";
@@ -195,6 +195,9 @@
}
private class ActionBarDrawableToggleImpl implements ActionBarDrawerToggle.Delegate {
+ ActionBarDrawableToggleImpl() {
+ }
+
@Override
public Drawable getThemeUpIndicator() {
final TintTypedArray a = TintTypedArray.obtainStyledAttributes(
diff --git a/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV9.java b/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV9.java
index 299bad0..4e25f71 100644
--- a/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV9.java
+++ b/v7/appcompat/src/android/support/v7/app/AppCompatDelegateImplV9.java
@@ -120,8 +120,8 @@
private boolean mLongPressBackDown;
- private boolean mInvalidatePanelMenuPosted;
- private int mInvalidatePanelMenuFeatures;
+ boolean mInvalidatePanelMenuPosted;
+ int mInvalidatePanelMenuFeatures;
private final Runnable mInvalidatePanelMenuRunnable = new Runnable() {
@Override
public void run() {
@@ -870,7 +870,7 @@
return mSubDecorInstalled && mSubDecor != null && ViewCompat.isLaidOut(mSubDecor);
}
- private void endOnGoingFadeAnimation() {
+ void endOnGoingFadeAnimation() {
if (mFadeAnim != null) {
mFadeAnim.cancel();
}
@@ -1403,7 +1403,7 @@
return true;
}
- private void checkCloseActionMenu(MenuBuilder menu) {
+ void checkCloseActionMenu(MenuBuilder menu) {
if (mClosingActionMenu) {
return;
}
@@ -1417,11 +1417,11 @@
mClosingActionMenu = false;
}
- private void closePanel(int featureId) {
+ void closePanel(int featureId) {
closePanel(getPanelState(featureId, true), true);
}
- private void closePanel(PanelFeatureState st, boolean doCallback) {
+ void closePanel(PanelFeatureState st, boolean doCallback) {
if (doCallback && st.featureId == FEATURE_OPTIONS_PANEL &&
mDecorContentParent != null && mDecorContentParent.isOverflowMenuShowing()) {
checkCloseActionMenu(st.menu);
@@ -1517,7 +1517,7 @@
return handled;
}
- private void callOnPanelClosed(int featureId, PanelFeatureState panel, Menu menu) {
+ void callOnPanelClosed(int featureId, PanelFeatureState panel, Menu menu) {
// Try to get a menu
if (menu == null) {
// Need a panel to grab the menu, so try to get that
@@ -1545,7 +1545,7 @@
}
}
- private PanelFeatureState findMenuPanel(Menu menu) {
+ PanelFeatureState findMenuPanel(Menu menu) {
final PanelFeatureState[] panels = mPanels;
final int N = panels != null ? panels.length : 0;
for (int i = 0; i < N; i++) {
@@ -1608,7 +1608,7 @@
}
}
- private void doInvalidatePanelMenu(int featureId) {
+ void doInvalidatePanelMenu(int featureId) {
PanelFeatureState st = getPanelState(featureId, true);
Bundle savedActionViewStates = null;
if (st.menu != null) {
@@ -1641,7 +1641,7 @@
* @param insetTop the current top system window inset
* @return the new top system window inset
*/
- private int updateStatusGuard(int insetTop) {
+ int updateStatusGuard(int insetTop) {
boolean showStatusGuard = false;
// Show the status guard when the non-overlay contextual action bar is showing
if (mActionModeView != null) {
@@ -1736,7 +1736,7 @@
return mSubDecor;
}
- private void dismissPopups() {
+ void dismissPopups() {
if (mDecorContentParent != null) {
mDecorContentParent.dismissPopups();
}
@@ -1819,6 +1819,9 @@
}
private final class PanelMenuPresenterCallback implements MenuPresenter.Callback {
+ PanelMenuPresenterCallback() {
+ }
+
@Override
public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
final Menu parentMenu = menu.getRootMenu();
@@ -1849,6 +1852,9 @@
}
private final class ActionMenuPresenterCallback implements MenuPresenter.Callback {
+ ActionMenuPresenterCallback() {
+ }
+
@Override
public boolean onOpenSubMenu(MenuBuilder subMenu) {
Window.Callback cb = getWindowCallback();
@@ -2046,6 +2052,9 @@
boolean isOpen;
Bundle menuState;
+ SavedState() {
+ }
+
@Override
public int describeContents() {
return 0;
@@ -2061,7 +2070,7 @@
}
}
- private static SavedState readFromParcel(Parcel source, ClassLoader loader) {
+ static SavedState readFromParcel(Parcel source, ClassLoader loader) {
SavedState savedState = new SavedState();
savedState.featureId = source.readInt();
savedState.isOpen = source.readInt() == 1;
diff --git a/v7/appcompat/src/android/support/v7/app/NotificationCompat.java b/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
index d1c938f..b7aaf88 100644
--- a/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
+++ b/v7/appcompat/src/android/support/v7/app/NotificationCompat.java
@@ -66,8 +66,9 @@
return null;
}
- private static void addMediaStyleToBuilderLollipop(
- NotificationBuilderWithBuilderAccessor builder, android.support.v4.app.NotificationCompat.Style style) {
+ static void addMediaStyleToBuilderLollipop(
+ NotificationBuilderWithBuilderAccessor builder,
+ android.support.v4.app.NotificationCompat.Style style) {
if (style instanceof MediaStyle) {
MediaStyle mediaStyle = (MediaStyle) style;
NotificationCompatImpl21.addMediaStyle(builder,
@@ -76,7 +77,7 @@
}
}
- private static void addMediaStyleToBuilderIcs(NotificationBuilderWithBuilderAccessor builder,
+ static void addMediaStyleToBuilderIcs(NotificationBuilderWithBuilderAccessor builder,
android.support.v4.app.NotificationCompat.Builder b) {
if (b.mStyle instanceof MediaStyle) {
MediaStyle mediaStyle = (MediaStyle) b.mStyle;
@@ -89,7 +90,7 @@
}
}
- private static void addBigMediaStyleToBuilderJellybean(Notification n,
+ static void addBigMediaStyleToBuilderJellybean(Notification n,
android.support.v4.app.NotificationCompat.Builder b) {
if (b.mStyle instanceof MediaStyle) {
MediaStyle mediaStyle = (MediaStyle) b.mStyle;
@@ -141,6 +142,9 @@
private static class IceCreamSandwichExtender extends BuilderExtender {
+ IceCreamSandwichExtender() {
+ }
+
@Override
public Notification build(android.support.v4.app.NotificationCompat.Builder b,
NotificationBuilderWithBuilderAccessor builder) {
@@ -151,6 +155,9 @@
private static class JellybeanExtender extends BuilderExtender {
+ JellybeanExtender() {
+ }
+
@Override
public Notification build(android.support.v4.app.NotificationCompat.Builder b,
NotificationBuilderWithBuilderAccessor builder) {
@@ -163,6 +170,9 @@
private static class LollipopExtender extends BuilderExtender {
+ LollipopExtender() {
+ }
+
@Override
public Notification build(android.support.v4.app.NotificationCompat.Builder b,
NotificationBuilderWithBuilderAccessor builder) {
diff --git a/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java b/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
index 2c9a124..4776812 100644
--- a/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
+++ b/v7/appcompat/src/android/support/v7/app/ToolbarActionBar.java
@@ -45,9 +45,9 @@
import java.util.ArrayList;
class ToolbarActionBar extends ActionBar {
- private DecorToolbar mDecorToolbar;
- private boolean mToolbarMenuPrepared;
- private Window.Callback mWindowCallback;
+ DecorToolbar mDecorToolbar;
+ boolean mToolbarMenuPrepared;
+ Window.Callback mWindowCallback;
private boolean mMenuCallbackSet;
private boolean mLastMenuVisibility;
@@ -511,7 +511,7 @@
}
}
- private View getListMenuView(Menu menu) {
+ View getListMenuView(Menu menu) {
ensureListMenuPresenter(menu);
if (menu == null || mListMenuPresenter == null) {
@@ -598,6 +598,9 @@
private final class ActionMenuPresenterCallback implements MenuPresenter.Callback {
private boolean mClosingActionMenu;
+ ActionMenuPresenterCallback() {
+ }
+
@Override
public boolean onOpenSubMenu(MenuBuilder subMenu) {
if (mWindowCallback != null) {
@@ -623,6 +626,9 @@
}
private final class PanelMenuPresenterCallback implements MenuPresenter.Callback {
+ PanelMenuPresenterCallback() {
+ }
+
@Override
public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
if (mWindowCallback != null) {
@@ -641,6 +647,9 @@
private final class MenuBuilderCallback implements MenuBuilder.Callback {
+ MenuBuilderCallback() {
+ }
+
@Override
public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
return false;
diff --git a/v7/appcompat/src/android/support/v7/app/TwilightManager.java b/v7/appcompat/src/android/support/v7/app/TwilightManager.java
index fceb78c..61bb136 100644
--- a/v7/appcompat/src/android/support/v7/app/TwilightManager.java
+++ b/v7/appcompat/src/android/support/v7/app/TwilightManager.java
@@ -195,5 +195,8 @@
long todaySunset;
long tomorrowSunrise;
long nextUpdate;
+
+ TwilightState() {
+ }
}
}
diff --git a/v7/appcompat/src/android/support/v7/app/WindowDecorActionBar.java b/v7/appcompat/src/android/support/v7/app/WindowDecorActionBar.java
index 96a02a6..16ab4df 100644
--- a/v7/appcompat/src/android/support/v7/app/WindowDecorActionBar.java
+++ b/v7/appcompat/src/android/support/v7/app/WindowDecorActionBar.java
@@ -83,17 +83,17 @@
*/
private static final boolean ALLOW_SHOW_HIDE_ANIMATIONS = Build.VERSION.SDK_INT >= 14;
- private Context mContext;
+ Context mContext;
private Context mThemedContext;
private Activity mActivity;
private Dialog mDialog;
- private ActionBarOverlayLayout mOverlayLayout;
- private ActionBarContainer mContainerView;
- private DecorToolbar mDecorToolbar;
- private ActionBarContextView mContextView;
- private View mContentView;
- private ScrollingTabContainerView mTabScrollView;
+ ActionBarOverlayLayout mOverlayLayout;
+ ActionBarContainer mContainerView;
+ DecorToolbar mDecorToolbar;
+ ActionBarContextView mContextView;
+ View mContentView;
+ ScrollingTabContainerView mTabScrollView;
private ArrayList<TabImpl> mTabs = new ArrayList<TabImpl>();
@@ -120,14 +120,14 @@
private int mCurWindowVisibility = View.VISIBLE;
- private boolean mContentAnimations = true;
- private boolean mHiddenByApp;
- private boolean mHiddenBySystem;
+ boolean mContentAnimations = true;
+ boolean mHiddenByApp;
+ boolean mHiddenBySystem;
private boolean mShowingForMode;
private boolean mNowShowing = true;
- private ViewPropertyAnimatorCompatSet mCurrentShowAnim;
+ ViewPropertyAnimatorCompatSet mCurrentShowAnim;
private boolean mShowHideAnimationEnabled;
boolean mHideOnContentScroll;
@@ -729,7 +729,7 @@
mOverlayLayout.setActionBarHideOffset(offset);
}
- private static boolean checkShowingFlags(boolean hiddenByApp, boolean hiddenBySystem,
+ static boolean checkShowingFlags(boolean hiddenByApp, boolean hiddenBySystem,
boolean showingForMode) {
if (showingForMode) {
return true;
diff --git a/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java b/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
index c8004ee..6bd67ff 100644
--- a/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
+++ b/v7/appcompat/src/android/support/v7/view/SupportMenuInflater.java
@@ -56,7 +56,7 @@
* @hide
*/
public class SupportMenuInflater extends MenuInflater {
- private static final String LOG_TAG = "SupportMenuInflater";
+ static final String LOG_TAG = "SupportMenuInflater";
/** Menu tag name in XML. */
private static final String XML_MENU = "menu";
@@ -67,18 +67,18 @@
/** Item tag name in XML. */
private static final String XML_ITEM = "item";
- private static final int NO_ID = 0;
+ static final int NO_ID = 0;
- private static final Class<?>[] ACTION_VIEW_CONSTRUCTOR_SIGNATURE = new Class[] {Context.class};
+ static final Class<?>[] ACTION_VIEW_CONSTRUCTOR_SIGNATURE = new Class[] {Context.class};
- private static final Class<?>[] ACTION_PROVIDER_CONSTRUCTOR_SIGNATURE =
+ static final Class<?>[] ACTION_PROVIDER_CONSTRUCTOR_SIGNATURE =
ACTION_VIEW_CONSTRUCTOR_SIGNATURE;
- private final Object[] mActionViewConstructorArguments;
+ final Object[] mActionViewConstructorArguments;
- private final Object[] mActionProviderConstructorArguments;
+ final Object[] mActionProviderConstructorArguments;
- private Context mContext;
+ Context mContext;
private Object mRealOwner;
/**
@@ -209,7 +209,7 @@
}
}
- private Object getRealOwner() {
+ Object getRealOwner() {
if (mRealOwner == null) {
mRealOwner = findRealOwner(mContext);
}
@@ -315,7 +315,7 @@
private String itemListenerMethodName;
- private ActionProvider itemActionProvider;
+ ActionProvider itemActionProvider;
private static final int defaultGroupId = NO_ID;
private static final int defaultItemId = NO_ID;
diff --git a/v7/appcompat/src/android/support/v7/view/ViewPropertyAnimatorCompatSet.java b/v7/appcompat/src/android/support/v7/view/ViewPropertyAnimatorCompatSet.java
index 8727c9d..e892948 100644
--- a/v7/appcompat/src/android/support/v7/view/ViewPropertyAnimatorCompatSet.java
+++ b/v7/appcompat/src/android/support/v7/view/ViewPropertyAnimatorCompatSet.java
@@ -32,11 +32,11 @@
*/
public class ViewPropertyAnimatorCompatSet {
- private final ArrayList<ViewPropertyAnimatorCompat> mAnimators;
+ final ArrayList<ViewPropertyAnimatorCompat> mAnimators;
private long mDuration = -1;
private Interpolator mInterpolator;
- private ViewPropertyAnimatorListener mListener;
+ ViewPropertyAnimatorListener mListener;
private boolean mIsStarted;
@@ -77,7 +77,7 @@
mIsStarted = true;
}
- private void onAnimationsEnded() {
+ void onAnimationsEnded() {
mIsStarted = false;
}
diff --git a/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItemView.java b/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItemView.java
index 47d794e..94d60bf 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItemView.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/ActionMenuItemView.java
@@ -49,12 +49,12 @@
private static final String TAG = "ActionMenuItemView";
- private MenuItemImpl mItemData;
+ MenuItemImpl mItemData;
private CharSequence mTitle;
private Drawable mIcon;
- private MenuBuilder.ItemInvoker mItemInvoker;
+ MenuBuilder.ItemInvoker mItemInvoker;
private ForwardingListener mForwardingListener;
- private PopupCallback mPopupCallback;
+ PopupCallback mPopupCallback;
private boolean mAllowTextWithIcon;
private boolean mExpandedFormat;
diff --git a/v7/appcompat/src/android/support/v7/view/menu/CascadingMenuPopup.java b/v7/appcompat/src/android/support/v7/view/menu/CascadingMenuPopup.java
index 7649fd5..b62127e 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/CascadingMenuPopup.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/CascadingMenuPopup.java
@@ -66,21 +66,21 @@
@IntDef({HORIZ_POSITION_LEFT, HORIZ_POSITION_RIGHT})
public @interface HorizPosition {}
- private static final int HORIZ_POSITION_LEFT = 0;
- private static final int HORIZ_POSITION_RIGHT = 1;
+ static final int HORIZ_POSITION_LEFT = 0;
+ static final int HORIZ_POSITION_RIGHT = 1;
/**
* Delay between hovering over a menu item with a mouse and receiving
* side-effects (ex. opening a sub-menu or closing unrelated menus).
*/
- private static final int SUBMENU_TIMEOUT_MS = 200;
+ static final int SUBMENU_TIMEOUT_MS = 200;
private final Context mContext;
private final int mMenuMaxWidth;
private final int mPopupStyleAttr;
private final int mPopupStyleRes;
private final boolean mOverflowOnly;
- private final Handler mSubMenuHoverHandler;
+ final Handler mSubMenuHoverHandler;
/** List of menus that were added before this popup was shown. */
private final List<MenuBuilder> mPendingMenus = new LinkedList<>();
@@ -89,7 +89,7 @@
* List of open menus. The first item is the root menu and each
* subsequent item is a direct submenu of the previous item.
*/
- private final List<CascadingMenuInfo> mShowingMenus = new ArrayList<>();
+ final List<CascadingMenuInfo> mShowingMenus = new ArrayList<>();
private final OnGlobalLayoutListener mGlobalLayoutListener = new OnGlobalLayoutListener() {
@Override
@@ -175,7 +175,7 @@
private int mRawDropDownGravity = Gravity.NO_GRAVITY;
private int mDropDownGravity = Gravity.NO_GRAVITY;
private View mAnchorView;
- private View mShownAnchorView;
+ View mShownAnchorView;
private int mLastPosition;
private boolean mHasXOffset;
private boolean mHasYOffset;
@@ -188,7 +188,7 @@
private PopupWindow.OnDismissListener mOnDismissListener;
/** Whether popup menus should disable exit animations when closing. */
- private boolean mShouldCloseImmediately;
+ boolean mShouldCloseImmediately;
/**
* Initializes a new cascading-capable menu popup.
diff --git a/v7/appcompat/src/android/support/v7/view/menu/ListMenuPresenter.java b/v7/appcompat/src/android/support/v7/view/menu/ListMenuPresenter.java
index a0b7359..0dfbc54 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/ListMenuPresenter.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/ListMenuPresenter.java
@@ -45,7 +45,7 @@
ExpandedMenuView mMenuView;
- private int mItemIndexOffset;
+ int mItemIndexOffset;
int mThemeRes;
int mItemLayoutRes;
diff --git a/v7/appcompat/src/android/support/v7/view/menu/MenuItemImpl.java b/v7/appcompat/src/android/support/v7/view/menu/MenuItemImpl.java
index 6f5f07d..7420ad5 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/MenuItemImpl.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/MenuItemImpl.java
@@ -66,7 +66,7 @@
private int mIconResId = NO_ICON;
/** The menu to which this item belongs */
- private MenuBuilder mMenu;
+ MenuBuilder mMenu;
/** If this item should launch a sub menu, this is the sub menu to launch */
private SubMenuBuilder mSubMenu;
diff --git a/v7/appcompat/src/android/support/v7/view/menu/StandardMenuPopup.java b/v7/appcompat/src/android/support/v7/view/menu/StandardMenuPopup.java
index 55ed1a1..2ab1a0c 100644
--- a/v7/appcompat/src/android/support/v7/view/menu/StandardMenuPopup.java
+++ b/v7/appcompat/src/android/support/v7/view/menu/StandardMenuPopup.java
@@ -53,7 +53,7 @@
private final int mPopupStyleRes;
// The popup window is final in order to couple its lifecycle to the lifecycle of the
// StandardMenuPopup.
- private final MenuPopupWindow mPopup;
+ final MenuPopupWindow mPopup;
private final OnGlobalLayoutListener mGlobalLayoutListener = new OnGlobalLayoutListener() {
@Override
@@ -76,7 +76,7 @@
private PopupWindow.OnDismissListener mOnDismissListener;
private View mAnchorView;
- private View mShownAnchorView;
+ View mShownAnchorView;
private Callback mPresenterCallback;
private ViewTreeObserver mTreeObserver;
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionBarOverlayLayout.java b/v7/appcompat/src/android/support/v7/widget/ActionBarOverlayLayout.java
index d2ded94..732f2f4 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionBarOverlayLayout.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionBarOverlayLayout.java
@@ -57,7 +57,7 @@
// The main UI elements that we handle the layout of.
private ContentFrameLayout mContent;
- private ActionBarContainer mActionBarTop;
+ ActionBarContainer mActionBarTop;
// Some interior UI elements.
private DecorToolbar mDecorToolbar;
@@ -69,7 +69,7 @@
private boolean mOverlayMode;
private boolean mHasNonEmbeddedTabs;
private boolean mHideOnContentScroll;
- private boolean mAnimatingForFling;
+ boolean mAnimatingForFling;
private int mHideOnContentScrollReference;
private int mLastSystemUiVisibility;
private final Rect mBaseContentInsets = new Rect();
@@ -85,9 +85,9 @@
private ScrollerCompat mFlingEstimator;
- private ViewPropertyAnimatorCompat mCurrentActionBarTopAnimator;
+ ViewPropertyAnimatorCompat mCurrentActionBarTopAnimator;
- private final ViewPropertyAnimatorListener mTopAnimatorListener
+ final ViewPropertyAnimatorListener mTopAnimatorListener
= new ViewPropertyAnimatorListenerAdapter() {
@Override
public void onAnimationEnd(View view) {
@@ -565,7 +565,7 @@
ViewCompat.setTranslationY(mActionBarTop, -offset);
}
- private void haltActionBarHideOffsetAnimations() {
+ void haltActionBarHideOffsetAnimations() {
removeCallbacks(mRemoveActionBarHideOffset);
removeCallbacks(mAddActionBarHideOffset);
if (mCurrentActionBarTopAnimator != null) {
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionMenuPresenter.java b/v7/appcompat/src/android/support/v7/widget/ActionMenuPresenter.java
index c3d9893..3abc33b 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionMenuPresenter.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionMenuPresenter.java
@@ -55,7 +55,7 @@
private static final String TAG = "ActionMenuPresenter";
- private OverflowMenuButton mOverflowButton;
+ OverflowMenuButton mOverflowButton;
private Drawable mPendingOverflowIcon;
private boolean mPendingOverflowIconSet;
private boolean mReserveOverflow;
@@ -75,10 +75,10 @@
private View mScrapActionButtonView;
- private OverflowPopup mOverflowPopup;
- private ActionButtonSubmenu mActionButtonPopup;
+ OverflowPopup mOverflowPopup;
+ ActionButtonSubmenu mActionButtonPopup;
- private OpenOverflowRunnable mPostedOpenRunnable;
+ OpenOverflowRunnable mPostedOpenRunnable;
private ActionMenuPopupCallback mPopupCallback;
final PopupPresenterCallback mPopupPresenterCallback = new PopupPresenterCallback();
@@ -764,6 +764,9 @@
}
private class PopupPresenterCallback implements Callback {
+ PopupPresenterCallback() {
+ }
+
@Override
public boolean onOpenSubMenu(MenuBuilder subMenu) {
if (subMenu == null) return false;
@@ -805,6 +808,9 @@
}
private class ActionMenuPopupCallback extends ActionMenuItemView.PopupCallback {
+ ActionMenuPopupCallback() {
+ }
+
@Override
public ShowableListMenu getPopup() {
return mActionButtonPopup != null ? mActionButtonPopup.getPopup() : null;
diff --git a/v7/appcompat/src/android/support/v7/widget/ActionMenuView.java b/v7/appcompat/src/android/support/v7/widget/ActionMenuView.java
index bf5ab6a..60d5062 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActionMenuView.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActionMenuView.java
@@ -61,13 +61,13 @@
private boolean mReserveOverflow;
private ActionMenuPresenter mPresenter;
private MenuPresenter.Callback mActionMenuPresenterCallback;
- private MenuBuilder.Callback mMenuBuilderCallback;
+ MenuBuilder.Callback mMenuBuilderCallback;
private boolean mFormatItems;
private int mFormatItemsWidth;
private int mMinCellSize;
private int mGeneratedItemPadding;
- private OnMenuItemClickListener mOnMenuItemClickListener;
+ OnMenuItemClickListener mOnMenuItemClickListener;
public ActionMenuView(Context context) {
this(context, null);
@@ -753,6 +753,9 @@
}
private class MenuBuilderCallback implements MenuBuilder.Callback {
+ MenuBuilderCallback() {
+ }
+
@Override
public boolean onMenuItemSelected(MenuBuilder menu, MenuItem item) {
return mOnMenuItemClickListener != null &&
@@ -768,6 +771,9 @@
}
private class ActionMenuPresenterCallback implements ActionMenuPresenter.Callback {
+ ActionMenuPresenterCallback() {
+ }
+
@Override
public void onCloseMenu(MenuBuilder menu, boolean allMenusAreClosing) {
}
diff --git a/v7/appcompat/src/android/support/v7/widget/ActivityChooserModel.java b/v7/appcompat/src/android/support/v7/widget/ActivityChooserModel.java
index c4867f0..bdd3435 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActivityChooserModel.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActivityChooserModel.java
@@ -150,37 +150,37 @@
/**
* Flag for selecting debug mode.
*/
- private static final boolean DEBUG = false;
+ static final boolean DEBUG = false;
/**
* Tag used for logging.
*/
- private static final String LOG_TAG = ActivityChooserModel.class.getSimpleName();
+ static final String LOG_TAG = ActivityChooserModel.class.getSimpleName();
/**
* The root tag in the history file.
*/
- private static final String TAG_HISTORICAL_RECORDS = "historical-records";
+ static final String TAG_HISTORICAL_RECORDS = "historical-records";
/**
* The tag for a record in the history file.
*/
- private static final String TAG_HISTORICAL_RECORD = "historical-record";
+ static final String TAG_HISTORICAL_RECORD = "historical-record";
/**
* Attribute for the activity.
*/
- private static final String ATTRIBUTE_ACTIVITY = "activity";
+ static final String ATTRIBUTE_ACTIVITY = "activity";
/**
* Attribute for the choice time.
*/
- private static final String ATTRIBUTE_TIME = "time";
+ static final String ATTRIBUTE_TIME = "time";
/**
* Attribute for the choice weight.
*/
- private static final String ATTRIBUTE_WEIGHT = "weight";
+ static final String ATTRIBUTE_WEIGHT = "weight";
/**
* The default name of the choice history file.
@@ -242,12 +242,12 @@
/**
* Context for accessing resources.
*/
- private final Context mContext;
+ final Context mContext;
/**
* The name of the history file that backs this model.
*/
- private final String mHistoryFileName;
+ final String mHistoryFileName;
/**
* The intent for which a activity is being chosen.
@@ -272,7 +272,7 @@
* only after a call to {@link #persistHistoricalDataIfNeeded()} followed by change
* of the share records.
*/
- private boolean mCanReadHistoricalData = true;
+ boolean mCanReadHistoricalData = true;
/**
* Flag whether the choice history was read. This is used to enforce that
@@ -918,6 +918,9 @@
private final Map<ComponentName, ActivityResolveInfo> mPackageNameToActivityMap =
new HashMap<ComponentName, ActivityResolveInfo>();
+ DefaultSorter() {
+ }
+
public void sort(Intent intent, List<ActivityResolveInfo> activities,
List<HistoricalRecord> historicalRecords) {
Map<ComponentName, ActivityResolveInfo> componentNameToActivityMap =
@@ -1032,6 +1035,9 @@
*/
private final class PersistHistoryAsyncTask extends AsyncTask<Object, Void, Void> {
+ PersistHistoryAsyncTask() {
+ }
+
@Override
@SuppressWarnings("unchecked")
public Void doInBackground(Object... args) {
diff --git a/v7/appcompat/src/android/support/v7/widget/ActivityChooserView.java b/v7/appcompat/src/android/support/v7/widget/ActivityChooserView.java
index 16c240a..61ad65b 100644
--- a/v7/appcompat/src/android/support/v7/widget/ActivityChooserView.java
+++ b/v7/appcompat/src/android/support/v7/widget/ActivityChooserView.java
@@ -72,7 +72,7 @@
/**
* An adapter for displaying the activities in an {@link android.widget.AdapterView}.
*/
- private final ActivityChooserViewAdapter mAdapter;
+ final ActivityChooserViewAdapter mAdapter;
/**
* Implementation of various interfaces to avoid publishing them in the APIs.
@@ -92,7 +92,7 @@
/**
* The expand activities action button;
*/
- private final FrameLayout mExpandActivityOverflowButton;
+ final FrameLayout mExpandActivityOverflowButton;
/**
* The image for the expand activities action button;
@@ -102,7 +102,7 @@
/**
* The default activities action button;
*/
- private final FrameLayout mDefaultActivityButton;
+ final FrameLayout mDefaultActivityButton;
/**
* The image for the default activities action button;
@@ -122,7 +122,7 @@
/**
* Observer for the model data.
*/
- private final DataSetObserver mModelDataSetObserver = new DataSetObserver() {
+ final DataSetObserver mModelDataSetObserver = new DataSetObserver() {
@Override
public void onChanged() {
@@ -160,17 +160,17 @@
/**
* Listener for the dismissal of the popup/alert.
*/
- private PopupWindow.OnDismissListener mOnDismissListener;
+ PopupWindow.OnDismissListener mOnDismissListener;
/**
* Flag whether a default activity currently being selected.
*/
- private boolean mIsSelectingDefaultActivity;
+ boolean mIsSelectingDefaultActivity;
/**
* The count of activities in the popup.
*/
- private int mInitialActivityCount = ActivityChooserViewAdapter.MAX_ACTIVITY_COUNT_DEFAULT;
+ int mInitialActivityCount = ActivityChooserViewAdapter.MAX_ACTIVITY_COUNT_DEFAULT;
/**
* Flag whether this view is attached to a window.
@@ -344,7 +344,7 @@
*
* @param maxActivityCount The max number of activities to display.
*/
- private void showPopupUnchecked(int maxActivityCount) {
+ void showPopupUnchecked(int maxActivityCount) {
if (mAdapter.getDataModel() == null) {
throw new IllegalStateException("No data model. Did you call #setDataModel?");
}
@@ -501,7 +501,7 @@
*
* @return The popup.
*/
- private ListPopupWindow getListPopupWindow() {
+ ListPopupWindow getListPopupWindow() {
if (mListPopupWindow == null) {
mListPopupWindow = new ListPopupWindow(getContext());
mListPopupWindow.setAdapter(mAdapter);
@@ -516,7 +516,7 @@
/**
* Updates the buttons state.
*/
- private void updateAppearance() {
+ void updateAppearance() {
// Expand overflow button.
if (mAdapter.getCount() > 0) {
mExpandActivityOverflowButton.setEnabled(true);
@@ -554,6 +554,9 @@
private class Callbacks implements AdapterView.OnItemClickListener,
View.OnClickListener, View.OnLongClickListener, PopupWindow.OnDismissListener {
+ Callbacks() {
+ }
+
// AdapterView#OnItemClickListener
@Override
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -661,6 +664,9 @@
private boolean mShowFooterView;
+ ActivityChooserViewAdapter() {
+ }
+
public void setDataModel(ActivityChooserModel dataModel) {
ActivityChooserModel oldDataModel = mAdapter.getDataModel();
if (oldDataModel != null && isShown()) {
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatBackgroundHelper.java b/v7/appcompat/src/android/support/v7/widget/AppCompatBackgroundHelper.java
index 60f3976..09e4a28 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatBackgroundHelper.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatBackgroundHelper.java
@@ -222,6 +222,9 @@
// modified for actual tinting purposes
public ColorStateList mOriginalTintList;
+ BackgroundTintInfo() {
+ }
+
@Override
void clear() {
super.clear();
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java b/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
index fe4b0f6..4cf6319 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatDrawableManager.java
@@ -731,6 +731,9 @@
}
private static class VdcInflateDelegate implements InflateDelegate {
+ VdcInflateDelegate() {
+ }
+
@Override
public Drawable createFromXmlInner(@NonNull Context context, @NonNull XmlPullParser parser,
@NonNull AttributeSet attrs, @Nullable Resources.Theme theme) {
@@ -745,6 +748,9 @@
}
private static class AvdcInflateDelegate implements InflateDelegate {
+ AvdcInflateDelegate() {
+ }
+
@Override
public Drawable createFromXmlInner(@NonNull Context context, @NonNull XmlPullParser parser,
@NonNull AttributeSet attrs, @Nullable Resources.Theme theme) {
diff --git a/v7/appcompat/src/android/support/v7/widget/AppCompatSpinner.java b/v7/appcompat/src/android/support/v7/widget/AppCompatSpinner.java
index a497b86..23cad15 100644
--- a/v7/appcompat/src/android/support/v7/widget/AppCompatSpinner.java
+++ b/v7/appcompat/src/android/support/v7/widget/AppCompatSpinner.java
@@ -64,7 +64,7 @@
*/
public class AppCompatSpinner extends Spinner implements TintableBackgroundView {
- private static final boolean IS_AT_LEAST_M = Build.VERSION.SDK_INT >= 23;
+ static final boolean IS_AT_LEAST_M = Build.VERSION.SDK_INT >= 23;
private static final boolean IS_AT_LEAST_JB = Build.VERSION.SDK_INT >= 16;
private static final int[] ATTRS_ANDROID_SPINNERMODE = {android.R.attr.spinnerMode};
@@ -90,11 +90,11 @@
private boolean mPopupSet;
- private DropdownPopup mPopup;
+ DropdownPopup mPopup;
- private int mDropDownWidth;
+ int mDropDownWidth;
- private final Rect mTempRect = new Rect();
+ final Rect mTempRect = new Rect();
/**
* Construct a new spinner with the given context's theme.
@@ -530,7 +530,7 @@
}
}
- private int compatMeasureContentWidth(SpinnerAdapter adapter, Drawable background) {
+ int compatMeasureContentWidth(SpinnerAdapter adapter, Drawable background) {
if (adapter == null) {
return 0;
}
@@ -693,7 +693,7 @@
private class DropdownPopup extends ListPopupWindow {
private CharSequence mHintText;
- private ListAdapter mAdapter;
+ ListAdapter mAdapter;
private final Rect mVisibleRect = new Rect();
public DropdownPopup(Context context, AttributeSet attrs, int defStyleAttr) {
@@ -821,7 +821,7 @@
/**
* Simplified version of the the hidden View.isVisibleToUser()
*/
- private boolean isVisibleToUser(View view) {
+ boolean isVisibleToUser(View view) {
return ViewCompat.isAttachedToWindow(view) && view.getGlobalVisibleRect(mVisibleRect);
}
}
diff --git a/v7/appcompat/src/android/support/v7/widget/ForwardingListener.java b/v7/appcompat/src/android/support/v7/widget/ForwardingListener.java
index 7d53b93..4528a48 100644
--- a/v7/appcompat/src/android/support/v7/widget/ForwardingListener.java
+++ b/v7/appcompat/src/android/support/v7/widget/ForwardingListener.java
@@ -41,7 +41,7 @@
private final int mLongPressTimeout;
/** Source view from which events are forwarded. */
- private final View mSrc;
+ final View mSrc;
/** Runnable used to prevent conflicts with scrolling parents. */
private Runnable mDisallowIntercept;
@@ -199,7 +199,7 @@
}
}
- private void onLongPress() {
+ void onLongPress() {
clearCallbacks();
final View src = mSrc;
@@ -290,6 +290,9 @@
}
private class DisallowIntercept implements Runnable {
+ DisallowIntercept() {
+ }
+
@Override
public void run() {
final ViewParent parent = mSrc.getParent();
@@ -300,6 +303,9 @@
}
private class TriggerLongPress implements Runnable {
+ TriggerLongPress() {
+ }
+
@Override
public void run() {
onLongPress();
diff --git a/v7/appcompat/src/android/support/v7/widget/ListPopupWindow.java b/v7/appcompat/src/android/support/v7/widget/ListPopupWindow.java
index de11489..d8905dd 100644
--- a/v7/appcompat/src/android/support/v7/widget/ListPopupWindow.java
+++ b/v7/appcompat/src/android/support/v7/widget/ListPopupWindow.java
@@ -71,7 +71,7 @@
* must leave a pointer down without scrolling to expand
* the autocomplete dropdown list to cover the IME.
*/
- private static final int EXPAND_LIST_TIMEOUT = 250;
+ static final int EXPAND_LIST_TIMEOUT = 250;
private static Method sClipToWindowEnabledMethod;
private static Method sGetMaxAvailableHeightMethod;
@@ -101,7 +101,7 @@
private Context mContext;
private ListAdapter mAdapter;
- private DropDownListView mDropDownList;
+ DropDownListView mDropDownList;
private int mDropDownHeight = ViewGroup.LayoutParams.WRAP_CONTENT;
private int mDropDownWidth = ViewGroup.LayoutParams.WRAP_CONTENT;
@@ -129,13 +129,13 @@
private AdapterView.OnItemClickListener mItemClickListener;
private OnItemSelectedListener mItemSelectedListener;
- private final ResizePopupRunnable mResizePopupRunnable = new ResizePopupRunnable();
+ final ResizePopupRunnable mResizePopupRunnable = new ResizePopupRunnable();
private final PopupTouchInterceptor mTouchInterceptor = new PopupTouchInterceptor();
private final PopupScrollListener mScrollListener = new PopupScrollListener();
private final ListSelectorHider mHideSelector = new ListSelectorHider();
private Runnable mShowDropDownRunnable;
- private final Handler mHandler;
+ final Handler mHandler;
private final Rect mTempRect = new Rect();
@@ -1291,6 +1291,9 @@
}
private class PopupDataSetObserver extends DataSetObserver {
+ PopupDataSetObserver() {
+ }
+
@Override
public void onChanged() {
if (isShowing()) {
@@ -1306,6 +1309,9 @@
}
private class ListSelectorHider implements Runnable {
+ ListSelectorHider() {
+ }
+
@Override
public void run() {
clearListSelection();
@@ -1313,6 +1319,9 @@
}
private class ResizePopupRunnable implements Runnable {
+ ResizePopupRunnable() {
+ }
+
@Override
public void run() {
if (mDropDownList != null && ViewCompat.isAttachedToWindow(mDropDownList)
@@ -1325,6 +1334,9 @@
}
private class PopupTouchInterceptor implements OnTouchListener {
+ PopupTouchInterceptor() {
+ }
+
@Override
public boolean onTouch(View v, MotionEvent event) {
final int action = event.getAction();
@@ -1343,6 +1355,9 @@
}
private class PopupScrollListener implements ListView.OnScrollListener {
+ PopupScrollListener() {
+ }
+
@Override
public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount,
int totalItemCount) {
diff --git a/v7/appcompat/src/android/support/v7/widget/PopupMenu.java b/v7/appcompat/src/android/support/v7/widget/PopupMenu.java
index 066c7e0..8377010 100644
--- a/v7/appcompat/src/android/support/v7/widget/PopupMenu.java
+++ b/v7/appcompat/src/android/support/v7/widget/PopupMenu.java
@@ -45,10 +45,10 @@
private final Context mContext;
private final MenuBuilder mMenu;
private final View mAnchor;
- private final MenuPopupHelper mPopup;
+ final MenuPopupHelper mPopup;
- private OnMenuItemClickListener mMenuItemClickListener;
- private OnDismissListener mOnDismissListener;
+ OnMenuItemClickListener mMenuItemClickListener;
+ OnDismissListener mOnDismissListener;
private View.OnTouchListener mDragListener;
/**
diff --git a/v7/appcompat/src/android/support/v7/widget/ScrollingTabContainerView.java b/v7/appcompat/src/android/support/v7/widget/ScrollingTabContainerView.java
index 670579a..0466075 100644
--- a/v7/appcompat/src/android/support/v7/widget/ScrollingTabContainerView.java
+++ b/v7/appcompat/src/android/support/v7/widget/ScrollingTabContainerView.java
@@ -58,7 +58,7 @@
Runnable mTabSelector;
private TabClickListener mTabClickListener;
- private LinearLayoutCompat mTabLayout;
+ LinearLayoutCompat mTabLayout;
private Spinner mTabSpinner;
private boolean mAllowCollapse;
@@ -285,7 +285,7 @@
}
}
- private TabView createTabView(ActionBar.Tab tab, boolean forAdapter) {
+ TabView createTabView(ActionBar.Tab tab, boolean forAdapter) {
final TabView tabView = new TabView(getContext(), tab, forAdapter);
if (forAdapter) {
tabView.setBackgroundDrawable(null);
@@ -543,6 +543,9 @@
}
private class TabAdapter extends BaseAdapter {
+ TabAdapter() {
+ }
+
@Override
public int getCount() {
return mTabLayout.getChildCount();
@@ -570,6 +573,9 @@
}
private class TabClickListener implements OnClickListener {
+ TabClickListener() {
+ }
+
@Override
public void onClick(View view) {
TabView tabView = (TabView) view;
diff --git a/v7/appcompat/src/android/support/v7/widget/SearchView.java b/v7/appcompat/src/android/support/v7/widget/SearchView.java
index bb703cc..7c264fa 100644
--- a/v7/appcompat/src/android/support/v7/widget/SearchView.java
+++ b/v7/appcompat/src/android/support/v7/widget/SearchView.java
@@ -112,22 +112,22 @@
*/
public class SearchView extends LinearLayoutCompat implements CollapsibleActionView {
- private static final boolean DBG = false;
- private static final String LOG_TAG = "SearchView";
+ static final boolean DBG = false;
+ static final String LOG_TAG = "SearchView";
/**
* Private constant for removing the microphone in the keyboard.
*/
private static final String IME_OPTION_NO_MICROPHONE = "nm";
- private final SearchAutoComplete mSearchSrcTextView;
+ final SearchAutoComplete mSearchSrcTextView;
private final View mSearchEditFrame;
private final View mSearchPlate;
private final View mSubmitArea;
- private final ImageView mSearchButton;
- private final ImageView mGoButton;
- private final ImageView mCloseButton;
- private final ImageView mVoiceButton;
+ final ImageView mSearchButton;
+ final ImageView mGoButton;
+ final ImageView mCloseButton;
+ final ImageView mVoiceButton;
private final View mDropDownAnchor;
private UpdatableTouchDelegate mTouchDelegate;
@@ -154,13 +154,13 @@
private OnQueryTextListener mOnQueryChangeListener;
private OnCloseListener mOnCloseListener;
- private OnFocusChangeListener mOnQueryTextFocusChangeListener;
+ OnFocusChangeListener mOnQueryTextFocusChangeListener;
private OnSuggestionListener mOnSuggestionListener;
private OnClickListener mOnSearchClickListener;
private boolean mIconifiedByDefault;
private boolean mIconified;
- private CursorAdapter mSuggestionsAdapter;
+ CursorAdapter mSuggestionsAdapter;
private boolean mSubmitButtonEnabled;
private CharSequence mQueryHint;
private boolean mQueryRefinement;
@@ -172,7 +172,7 @@
private boolean mExpandedInActionView;
private int mCollapsedImeOptions;
- private SearchableInfo mSearchable;
+ SearchableInfo mSearchable;
private Bundle mAppSearchData;
static final AutoCompleteTextViewReflector HIDDEN_METHOD_INVOKER = new AutoCompleteTextViewReflector();
@@ -976,7 +976,7 @@
post(mUpdateDrawableStateRunnable);
}
- private void updateFocusedState() {
+ void updateFocusedState() {
final boolean focused = mSearchSrcTextView.hasFocus();
final int[] stateSet = focused ? FOCUSED_STATE_SET : EMPTY_STATE_SET;
final Drawable searchPlateBg = mSearchPlate.getBackground();
@@ -997,7 +997,7 @@
super.onDetachedFromWindow();
}
- private void setImeVisibility(final boolean visible) {
+ void setImeVisibility(final boolean visible) {
if (visible) {
post(mShowImeRunnable);
} else {
@@ -1084,7 +1084,7 @@
* action keys. If not handled, try refocusing regular characters into the
* EditText.
*/
- private boolean onSuggestionsKey(View v, int keyCode, KeyEvent event) {
+ boolean onSuggestionsKey(View v, int keyCode, KeyEvent event) {
// guard against possible race conditions (late arrival after dismiss)
if (mSearchable == null) {
return false;
@@ -1216,7 +1216,7 @@
}
};
- private void onTextChanged(CharSequence newText) {
+ void onTextChanged(CharSequence newText) {
CharSequence text = mSearchSrcTextView.getText();
mUserQuery = text;
boolean hasText = !TextUtils.isEmpty(text);
@@ -1230,7 +1230,7 @@
mOldQueryText = newText.toString();
}
- private void onSubmitQuery() {
+ void onSubmitQuery() {
CharSequence query = mSearchSrcTextView.getText();
if (query != null && TextUtils.getTrimmedLength(query) > 0) {
if (mOnQueryChangeListener == null
@@ -1248,7 +1248,7 @@
mSearchSrcTextView.dismissDropDown();
}
- private void onCloseClicked() {
+ void onCloseClicked() {
CharSequence text = mSearchSrcTextView.getText();
if (TextUtils.isEmpty(text)) {
if (mIconifiedByDefault) {
@@ -1268,7 +1268,7 @@
}
- private void onSearchClicked() {
+ void onSearchClicked() {
updateViewsVisibility(false);
mSearchSrcTextView.requestFocus();
setImeVisibility(true);
@@ -1277,7 +1277,7 @@
}
}
- private void onVoiceClicked() {
+ void onVoiceClicked() {
// guard against possible race conditions
if (mSearchable == null) {
return;
@@ -1402,7 +1402,7 @@
requestLayout();
}
- private void adjustDropDownSizeAndPosition() {
+ void adjustDropDownSizeAndPosition() {
if (mDropDownAnchor.getWidth() > 1) {
Resources res = getContext().getResources();
int anchorPadding = mSearchPlate.getPaddingLeft();
@@ -1426,7 +1426,7 @@
}
}
- private boolean onItemClicked(int position, int actionKey, String actionMsg) {
+ boolean onItemClicked(int position, int actionKey, String actionMsg) {
if (mOnSuggestionListener == null
|| !mOnSuggestionListener.onSuggestionClick(position)) {
launchSuggestion(position, KeyEvent.KEYCODE_UNKNOWN, null);
@@ -1437,7 +1437,7 @@
return false;
}
- private boolean onItemSelected(int position) {
+ boolean onItemSelected(int position) {
if (mOnSuggestionListener == null
|| !mOnSuggestionListener.onSuggestionSelect(position)) {
rewriteQueryFromSuggestion(position);
@@ -1554,7 +1554,7 @@
mSearchSrcTextView.setSelection(TextUtils.isEmpty(query) ? 0 : query.length());
}
- private void launchQuerySearch(int actionKey, String actionMsg, String query) {
+ void launchQuerySearch(int actionKey, String actionMsg, String query) {
String action = Intent.ACTION_SEARCH;
Intent intent = createIntent(action, null, null, query, actionKey, actionMsg);
getContext().startActivity(intent);
@@ -1735,7 +1735,7 @@
}
}
- private void forceSuggestionQuery() {
+ void forceSuggestionQuery() {
HIDDEN_METHOD_INVOKER.doBeforeTextChanged(mSearchSrcTextView);
HIDDEN_METHOD_INVOKER.doAfterTextChanged(mSearchSrcTextView);
}
diff --git a/v7/appcompat/src/android/support/v7/widget/ShareActionProvider.java b/v7/appcompat/src/android/support/v7/widget/ShareActionProvider.java
index 8928130..046252b 100644
--- a/v7/appcompat/src/android/support/v7/widget/ShareActionProvider.java
+++ b/v7/appcompat/src/android/support/v7/widget/ShareActionProvider.java
@@ -176,14 +176,14 @@
/**
* Context for accessing resources.
*/
- private final Context mContext;
+ final Context mContext;
/**
* The name of the file with share history data.
*/
- private String mShareHistoryFileName = DEFAULT_SHARE_HISTORY_FILE_NAME;
+ String mShareHistoryFileName = DEFAULT_SHARE_HISTORY_FILE_NAME;
- private OnShareTargetSelectedListener mOnShareTargetSelectedListener;
+ OnShareTargetSelectedListener mOnShareTargetSelectedListener;
private OnChooseActivityListener mOnChooseActivityListener;
@@ -353,6 +353,9 @@
* Reusable listener for handling share item clicks.
*/
private class ShareMenuItemOnMenuItemClickListener implements OnMenuItemClickListener {
+ ShareMenuItemOnMenuItemClickListener() {
+ }
+
@Override
public boolean onMenuItemClick(MenuItem item) {
ActivityChooserModel dataModel = ActivityChooserModel.get(mContext,
@@ -390,6 +393,9 @@
* Policy that delegates to the {@link OnShareTargetSelectedListener}, if such.
*/
private class ShareActivityChooserModelPolicy implements OnChooseActivityListener {
+ ShareActivityChooserModelPolicy() {
+ }
+
@Override
public boolean onChooseActivity(ActivityChooserModel host, Intent intent) {
if (mOnShareTargetSelectedListener != null) {
@@ -400,7 +406,7 @@
}
}
- private void updateIntent(Intent intent) {
+ void updateIntent(Intent intent) {
if (Build.VERSION.SDK_INT >= 21) {
// If we're on Lollipop, we can open the intent as a document
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT |
diff --git a/v7/appcompat/src/android/support/v7/widget/SwitchCompat.java b/v7/appcompat/src/android/support/v7/widget/SwitchCompat.java
index f0ac9db..b41c814 100644
--- a/v7/appcompat/src/android/support/v7/widget/SwitchCompat.java
+++ b/v7/appcompat/src/android/support/v7/widget/SwitchCompat.java
@@ -160,7 +160,7 @@
private Layout mOnLayout;
private Layout mOffLayout;
private TransformationMethod mSwitchTransformationMethod;
- private ThumbAnimation mPositionAnimator;
+ ThumbAnimation mPositionAnimator;
@SuppressWarnings("hiding")
private final Rect mTempRect = new Rect();
@@ -1046,7 +1046,7 @@
*
* @param position new position between [0,1]
*/
- private void setThumbPosition(float position) {
+ void setThumbPosition(float position) {
mThumbPosition = position;
invalidate();
}
@@ -1424,7 +1424,7 @@
final float mEndPosition;
final float mDiff;
- private ThumbAnimation(float startPosition, float endPosition) {
+ ThumbAnimation(float startPosition, float endPosition) {
mStartPosition = startPosition;
mEndPosition = endPosition;
mDiff = endPosition - startPosition;
diff --git a/v7/appcompat/src/android/support/v7/widget/Toolbar.java b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
index a6e7434..2a0d970 100644
--- a/v7/appcompat/src/android/support/v7/widget/Toolbar.java
+++ b/v7/appcompat/src/android/support/v7/widget/Toolbar.java
@@ -149,7 +149,7 @@
private Drawable mCollapseIcon;
private CharSequence mCollapseDescription;
- private ImageButton mCollapseButtonView;
+ ImageButton mCollapseButtonView;
View mExpandedActionView;
/** Context against which to inflate popup menus. */
@@ -161,7 +161,7 @@
private int mTitleTextAppearance;
private int mSubtitleTextAppearance;
- private int mButtonGravity;
+ int mButtonGravity;
private int mMaxButtonHeight;
@@ -193,7 +193,7 @@
private final int[] mTempMargins = new int[2];
- private OnMenuItemClickListener mOnMenuItemClickListener;
+ OnMenuItemClickListener mOnMenuItemClickListener;
private final ActionMenuView.OnMenuItemClickListener mMenuViewItemClickListener =
new ActionMenuView.OnMenuItemClickListener() {
@@ -1361,7 +1361,7 @@
}
}
- private void ensureCollapseButtonView() {
+ void ensureCollapseButtonView() {
if (mCollapseButtonView == null) {
mCollapseButtonView = new AppCompatImageButton(getContext(), null,
R.attr.toolbarNavigationButtonStyle);
@@ -2284,6 +2284,9 @@
MenuBuilder mMenu;
MenuItemImpl mCurrentExpandedItem;
+ ExpandedActionViewMenuPresenter() {
+ }
+
@Override
public void initForMenu(Context context, MenuBuilder menu) {
// Clear the expanded action view when menus change.
diff --git a/v7/appcompat/src/android/support/v7/widget/ToolbarWidgetWrapper.java b/v7/appcompat/src/android/support/v7/widget/ToolbarWidgetWrapper.java
index 283151b..5e48a95 100644
--- a/v7/appcompat/src/android/support/v7/widget/ToolbarWidgetWrapper.java
+++ b/v7/appcompat/src/android/support/v7/widget/ToolbarWidgetWrapper.java
@@ -62,7 +62,7 @@
// Default fade duration for fading in/out tool bar.
private static final long DEFAULT_FADE_DURATION_MS = 200;
- private Toolbar mToolbar;
+ Toolbar mToolbar;
private int mDisplayOpts;
private View mTabView;
@@ -74,12 +74,12 @@
private Drawable mNavIcon;
private boolean mTitleSet;
- private CharSequence mTitle;
+ CharSequence mTitle;
private CharSequence mSubtitle;
private CharSequence mHomeDescription;
- private Window.Callback mWindowCallback;
- private boolean mMenuPrepared;
+ Window.Callback mWindowCallback;
+ boolean mMenuPrepared;
private ActionMenuPresenter mActionMenuPresenter;
private int mNavigationMode = ActionBar.NAVIGATION_MODE_STANDARD;
