diff options
author | Adam Cohen <adamcohen@google.com> | 2015-03-18 14:16:05 -0700 |
---|---|---|
committer | Adam Cohen <adamcohen@google.com> | 2015-03-20 11:15:54 -0700 |
commit | 091440a9cb9d4f42406631004aa484cbb79214ca (patch) | |
tree | 828aaa4033c73fe84a2e7e567c9cc4909c5a014f /src/com/android/launcher3/Folder.java | |
parent | f846b9054c90e73cb824310e75ea904b5a459c01 (diff) | |
download | android_packages_apps_Trebuchet-091440a9cb9d4f42406631004aa484cbb79214ca.tar.gz android_packages_apps_Trebuchet-091440a9cb9d4f42406631004aa484cbb79214ca.tar.bz2 android_packages_apps_Trebuchet-091440a9cb9d4f42406631004aa484cbb79214ca.zip |
Reducing method count by eliminating synthetic accessors
Elimates 304 methods based on dex analysis
The java compiler generates sythetic accessor methods for all private
fields, methods and contructors accessed from inner classes. By marking them
package-private and @Thunk instead, sythentic accessor methods are no
longer needeed. These annotated elements should be treated as private.
Change-Id: Id0dc2c92733474250d8ff12fa793d3a8adeb1f26
Diffstat (limited to 'src/com/android/launcher3/Folder.java')
-rw-r--r-- | src/com/android/launcher3/Folder.java | 35 |
1 files changed, 18 insertions, 17 deletions
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java index 5d8a865f7..23582cec8 100644 --- a/src/com/android/launcher3/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -51,6 +51,7 @@ import android.widget.TextView; import com.android.launcher3.FolderInfo.FolderListener; import com.android.launcher3.Workspace.ItemOperator; +import com.android.launcher3.util.Thunk; import java.util.ArrayList; import java.util.Collections; @@ -106,7 +107,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList private final Alarm mReorderAlarm = new Alarm(); private final Alarm mOnExitAlarm = new Alarm(); - private final ArrayList<View> mItemsInReadingOrder = new ArrayList<View>(); + @Thunk final ArrayList<View> mItemsInReadingOrder = new ArrayList<View>(); private final int mExpandDuration; private final int mMaterialExpandDuration; @@ -118,19 +119,19 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList protected DragController mDragController; protected FolderInfo mInfo; - private FolderIcon mFolderIcon; + @Thunk FolderIcon mFolderIcon; - private FolderContent mContent; - private View mContentWrapper; + @Thunk FolderContent mContent; + @Thunk View mContentWrapper; FolderEditText mFolderName; private View mFooter; private int mFooterHeight; // Cell ranks used for drag and drop - private int mTargetRank, mPrevTargetRank, mEmptyCellRank; + @Thunk int mTargetRank, mPrevTargetRank, mEmptyCellRank; - private int mState = STATE_NONE; + @Thunk int mState = STATE_NONE; private boolean mRearrangeOnClose = false; boolean mItemsInvalidated = false; private ShortcutInfo mCurrentDragInfo; @@ -141,26 +142,26 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList private boolean mDeleteFolderOnDropCompleted = false; private boolean mSuppressFolderDeletion = false; private boolean mItemAddedBackToSelfViaIcon = false; - private float mFolderIconPivotX; - private float mFolderIconPivotY; + @Thunk float mFolderIconPivotX; + @Thunk float mFolderIconPivotY; private boolean mIsEditingName = false; private boolean mDestroyed; - private Runnable mDeferredAction; + @Thunk Runnable mDeferredAction; private boolean mDeferDropAfterUninstall; private boolean mUninstallSuccessful; // Folder scrolling private int mScrollAreaOffset; private Alarm mOnScrollHintAlarm; - private Alarm mScrollPauseAlarm; + @Thunk Alarm mScrollPauseAlarm; // TODO: Use {@link #mContent} once {@link #ALLOW_FOLDER_SCROLL} is removed. - private FolderPagedView mPagedView; + @Thunk FolderPagedView mPagedView; - private int mScrollHintDir = DragController.SCROLL_NONE; - private int mCurrentScrollDir = DragController.SCROLL_NONE; + @Thunk int mScrollHintDir = DragController.SCROLL_NONE; + @Thunk int mCurrentScrollDir = DragController.SCROLL_NONE; /** * Used to inflate the Workspace from XML. @@ -556,7 +557,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList } - private void sendCustomAccessibilityEvent(int type, String text) { + @Thunk void sendCustomAccessibilityEvent(int type, String text) { AccessibilityManager accessibilityManager = (AccessibilityManager) getContext().getSystemService(Context.ACCESSIBILITY_SERVICE); if (accessibilityManager.isEnabled()) { @@ -635,7 +636,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList (int) recycle[0] - getPaddingLeft(), (int) recycle[1] - getPaddingTop()); } - private void onDragOver(DragObject d, int reorderDelay) { + @Thunk void onDragOver(DragObject d, int reorderDelay) { if (ALLOW_FOLDER_SCROLL && mScrollPauseAlarm.alarmPending()) { return; } @@ -997,7 +998,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList return mContent.getItemCount(); } - private void onCloseComplete() { + @Thunk void onCloseComplete() { DragLayer parent = (DragLayer) getParent(); if (parent != null) { parent.removeView(this); @@ -1020,7 +1021,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList mSuppressFolderDeletion = false; } - private void replaceFolderWithFinalItem() { + @Thunk void replaceFolderWithFinalItem() { // Add the last remaining child to the workspace in place of the folder Runnable onCompleteRunnable = new Runnable() { @Override |