Removing some synthetic method creation

> Make package-private and @Thunk all private methods and constructors accessed from inner classes.

Change-Id: Ie5913860a0c33e48e9bf68f9b5b1699f64c2f174

3 files changed, 10 insertions, 9 deletions

diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java
index c05f7c0b9..84a6462e5 100644
--- a/src/com/android/launcher3/allapps/AllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java
@@ -191,14 +191,14 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
     private RecyclerView.LayoutManager mLayoutManager;
     private RecyclerView.ItemDecoration mItemDecoration;
 
-    private FrameLayout mContentView;
+    @Thunk FrameLayout mContentView;
     @Thunk AllAppsRecyclerView mAppsRecyclerView;
-    private ViewGroup mPredictionBarView;
+    @Thunk ViewGroup mPredictionBarView;
     private View mHeaderView;
-    private View mSearchBarContainerView;
+    @Thunk View mSearchBarContainerView;
     private View mSearchButtonView;
     private View mDismissSearchButtonView;
-    private AllAppsSearchEditView mSearchBarEditView;
+    @Thunk AllAppsSearchEditView mSearchBarEditView;
 
     private HeaderElevationController mElevationController;
 
@@ -215,7 +215,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
     private int mContainerInset;
     private int mPredictionBarHeight;
     private int mLastRecyclerViewScrollPos = -1;
-    private boolean mFocusPredictionBarOnFirstBind;
+    @Thunk boolean mFocusPredictionBarOnFirstBind;
 
     private CheckLongPressHelper mPredictionIconCheckForLongPress;
     private View mPredictionIconUnderTouch;
@@ -936,7 +936,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
     /**
      * Hides the search field.
      */
-    private void hideSearchField(boolean animated, final boolean returnFocusToRecyclerView) {
+    @Thunk void hideSearchField(boolean animated, final boolean returnFocusToRecyclerView) {
         mSearchManager.cancel(true);
 
         final boolean resetTextField = mSearchBarEditView.getText().toString().length() > 0;
@@ -1001,7 +1001,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
     /**
      * Returns an input method manager.
      */
-    private InputMethodManager getInputMethodManager() {
+    @Thunk InputMethodManager getInputMethodManager() {
         return (InputMethodManager) getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
     }
 }
diff --git a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
index e010270ce..307d9403d 100644
--- a/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
+++ b/src/com/android/launcher3/allapps/AllAppsGridAdapter.java
@@ -288,7 +288,7 @@ class AllAppsGridAdapter extends RecyclerView.Adapter<AllAppsGridAdapter.ViewHol
     private GridLayoutManager mGridLayoutMgr;
     private GridSpanSizer mGridSizer;
     private GridItemDecoration mItemDecoration;
-    private PredictionBarSpacerCallbacks mPredictionBarCb;
+    @Thunk PredictionBarSpacerCallbacks mPredictionBarCb;
     private View.OnTouchListener mTouchListener;
     private View.OnClickListener mIconClickListener;
     private View.OnLongClickListener mIconLongClickListener;
diff --git a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
index 0dc2d1e63..725616fb3 100644
--- a/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
+++ b/src/com/android/launcher3/allapps/AlphabeticalAppsList.java
@@ -27,6 +27,7 @@ import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.compat.AlphabeticIndexCompat;
 import com.android.launcher3.model.AbstractUserComparator;
 import com.android.launcher3.model.AppNameComparator;
+import com.android.launcher3.util.Thunk;
 
 import java.nio.charset.CharsetEncoder;
 import java.nio.charset.StandardCharsets;
@@ -151,7 +152,7 @@ public class AlphabeticalAppsList {
      * The logic we use to merge sections on tablets.  Currently, we don't show section names on
      * tablet layouts, so just merge all the sections indiscriminately.
      */
-    private static class TabletMergeAlgorithm implements MergeAlgorithm {
+    @Thunk static class TabletMergeAlgorithm implements MergeAlgorithm {
 
         @Override
         public boolean continueMerging(SectionInfo section, SectionInfo withSection,