diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-02-17 13:24:20 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-02-17 13:27:13 -0800 |
commit | fc956e5a2a818c06ed3424e15b0aa20a3f604658 (patch) | |
tree | a53e5dc8c7946b39a858ee666e714dc740a12473 /src/com/android | |
parent | f1468af68ca8e2a7d0ff1d8a424d5b3b95c7357b (diff) | |
download | android_packages_apps_Trebuchet-fc956e5a2a818c06ed3424e15b0aa20a3f604658.tar.gz android_packages_apps_Trebuchet-fc956e5a2a818c06ed3424e15b0aa20a3f604658.tar.bz2 android_packages_apps_Trebuchet-fc956e5a2a818c06ed3424e15b0aa20a3f604658.zip |
Reverting refactoring of Folder and FolderIcon to avoid dependencies breakage
Change-Id: Ifd0d717d70aff4c83c9eb5cba397d04500b2c869
Diffstat (limited to 'src/com/android')
17 files changed, 31 insertions, 83 deletions
diff --git a/src/com/android/launcher3/BubbleTextView.java b/src/com/android/launcher3/BubbleTextView.java index dddd826c4..cc6df599a 100644 --- a/src/com/android/launcher3/BubbleTextView.java +++ b/src/com/android/launcher3/BubbleTextView.java @@ -40,7 +40,6 @@ import android.view.ViewParent; import android.widget.TextView; import com.android.launcher3.IconCache.IconLoadRequest; -import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.model.PackageItemInfo; import java.text.NumberFormat; diff --git a/src/com/android/launcher3/CellLayout.java b/src/com/android/launcher3/CellLayout.java index 5832b9f0d..9370e57b5 100644 --- a/src/com/android/launcher3/CellLayout.java +++ b/src/com/android/launcher3/CellLayout.java @@ -32,7 +32,6 @@ import android.graphics.Point; import android.graphics.Rect; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; -import android.graphics.drawable.GradientDrawable; import android.graphics.drawable.TransitionDrawable; import android.os.Build; import android.os.Parcelable; @@ -54,8 +53,7 @@ import com.android.launcher3.accessibility.FolderAccessibilityHelper; import com.android.launcher3.accessibility.WorkspaceAccessibilityHelper; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.config.ProviderConfig; -import com.android.launcher3.folder.FolderIcon; -import com.android.launcher3.folder.FolderIcon.FolderRingAnimator; +import com.android.launcher3.FolderIcon.FolderRingAnimator; import com.android.launcher3.util.ParcelableSparseArray; import com.android.launcher3.util.Thunk; diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 997ded2d3..173e6ab65 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -24,7 +24,6 @@ import android.view.View; import android.view.animation.AnimationUtils; import com.android.launcher3.dragndrop.DragLayer; -import com.android.launcher3.folder.Folder; import com.android.launcher3.util.FlingAnimation; import com.android.launcher3.util.Thunk; diff --git a/src/com/android/launcher3/FocusHelper.java b/src/com/android/launcher3/FocusHelper.java index f99c08a59..95b562328 100644 --- a/src/com/android/launcher3/FocusHelper.java +++ b/src/com/android/launcher3/FocusHelper.java @@ -23,7 +23,6 @@ import android.view.View; import android.view.ViewGroup; import com.android.launcher3.config.ProviderConfig; -import com.android.launcher3.folder.Folder; import com.android.launcher3.folder.FolderPagedView; import com.android.launcher3.util.FocusLogic; import com.android.launcher3.util.Thunk; diff --git a/src/com/android/launcher3/folder/Folder.java b/src/com/android/launcher3/Folder.java index a411c481c..f84bee27b 100644 --- a/src/com/android/launcher3/folder/Folder.java +++ b/src/com/android/launcher3/Folder.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.folder; +package com.android.launcher3; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -52,34 +52,16 @@ import android.view.inputmethod.InputMethodManager; import android.widget.LinearLayout; import android.widget.TextView; -import com.android.launcher3.Alarm; -import com.android.launcher3.CellLayout; import com.android.launcher3.CellLayout.CellInfo; -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.DragSource; -import com.android.launcher3.DropTarget; -import com.android.launcher3.ExtendedEditText; -import com.android.launcher3.FolderInfo; import com.android.launcher3.FolderInfo.FolderListener; -import com.android.launcher3.ItemInfo; -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAnimUtils; -import com.android.launcher3.LauncherModel; -import com.android.launcher3.LauncherSettings; -import com.android.launcher3.LogDecelerateInterpolator; -import com.android.launcher3.OnAlarmListener; -import com.android.launcher3.R; -import com.android.launcher3.ShortcutInfo; -import com.android.launcher3.Stats; import com.android.launcher3.UninstallDropTarget.UninstallSource; -import com.android.launcher3.Utilities; -import com.android.launcher3.Workspace; import com.android.launcher3.Workspace.ItemOperator; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate.AccessibilityDragSource; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragController.DragListener; import com.android.launcher3.dragndrop.DragLayer; +import com.android.launcher3.folder.FolderPagedView; import com.android.launcher3.util.Thunk; import com.android.launcher3.util.UiThreadCircularReveal; @@ -139,13 +121,15 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList private final InputMethodManager mInputMethodManager; - protected final Launcher mLauncher; + public final Launcher mLauncher; protected DragController mDragController; public FolderInfo mInfo; - @Thunk FolderIcon mFolderIcon; + @Thunk + FolderIcon mFolderIcon; - @Thunk FolderPagedView mContent; + @Thunk + FolderPagedView mContent; @Thunk View mContentWrapper; public ExtendedEditText mFolderName; diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/FolderIcon.java index 5c084d949..d61022f4d 100644 --- a/src/com/android/launcher3/folder/FolderIcon.java +++ b/src/com/android/launcher3/FolderIcon.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.launcher3.folder; +package com.android.launcher3; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -42,33 +42,13 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.TextView; -import com.android.launcher3.Alarm; -import com.android.launcher3.AppInfo; -import com.android.launcher3.BubbleTextView; -import com.android.launcher3.CellLayout; -import com.android.launcher3.CheckLongPressHelper; -import com.android.launcher3.DeviceProfile; import com.android.launcher3.DropTarget.DragObject; -import com.android.launcher3.FastBitmapDrawable; -import com.android.launcher3.FolderInfo; import com.android.launcher3.FolderInfo.FolderListener; -import com.android.launcher3.IconCache; -import com.android.launcher3.ItemInfo; -import com.android.launcher3.Launcher; -import com.android.launcher3.LauncherAnimUtils; -import com.android.launcher3.LauncherAppState; -import com.android.launcher3.LauncherSettings; -import com.android.launcher3.OnAlarmListener; -import com.android.launcher3.PreloadIconDrawable; -import com.android.launcher3.R; -import com.android.launcher3.ShortcutInfo; -import com.android.launcher3.SimpleOnStylusPressListener; -import com.android.launcher3.StylusEventHelper; -import com.android.launcher3.Utilities; -import com.android.launcher3.Workspace; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragView; +import com.android.launcher3.folder.ClippedFolderIconLayoutRule; +import com.android.launcher3.folder.StackFolderIconLayoutRule; import com.android.launcher3.util.Thunk; import java.util.ArrayList; @@ -539,18 +519,18 @@ public class FolderIcon extends FrameLayout implements FolderListener { computePreviewDrawingParams(d.getIntrinsicWidth(), getMeasuredWidth()); } - static class PreviewItemDrawingParams { - PreviewItemDrawingParams(float transX, float transY, float scale, float overlayAlpha) { + public static class PreviewItemDrawingParams { + public PreviewItemDrawingParams(float transX, float transY, float scale, float overlayAlpha) { this.transX = transX; this.transY = transY; this.scale = scale; this.overlayAlpha = overlayAlpha; } - float transX; - float transY; - float scale; - float overlayAlpha; - Drawable drawable; + public float transX; + public float transY; + public float scale; + public float overlayAlpha; + public Drawable drawable; } private float getLocalCenterForIndex(int index, int curNumItems, int[] center) { diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 545768f51..bda0ad9b2 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -107,8 +107,6 @@ import com.android.launcher3.config.ProviderConfig; import com.android.launcher3.dragndrop.DragController; import com.android.launcher3.dragndrop.DragLayer; import com.android.launcher3.dragndrop.DragView; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.LongArrayMap; diff --git a/src/com/android/launcher3/LauncherModel.java b/src/com/android/launcher3/LauncherModel.java index f707ec501..dcfd65b82 100644 --- a/src/com/android/launcher3/LauncherModel.java +++ b/src/com/android/launcher3/LauncherModel.java @@ -57,8 +57,6 @@ import com.android.launcher3.compat.PackageInstallerCompat.PackageInstallInfo; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; import com.android.launcher3.config.ProviderConfig; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderIcon; import com.android.launcher3.model.GridSizeMigrationTask; import com.android.launcher3.model.WidgetsModel; import com.android.launcher3.util.ComponentKey; diff --git a/src/com/android/launcher3/ShortcutInfo.java b/src/com/android/launcher3/ShortcutInfo.java index 128d695eb..9c6d71b37 100644 --- a/src/com/android/launcher3/ShortcutInfo.java +++ b/src/com/android/launcher3/ShortcutInfo.java @@ -21,15 +21,11 @@ import android.content.ContentValues; import android.content.Context; import android.content.Intent; import android.graphics.Bitmap; -import android.util.Log; import com.android.launcher3.LauncherSettings.Favorites; import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.compat.UserHandleCompat; import com.android.launcher3.compat.UserManagerCompat; -import com.android.launcher3.folder.FolderIcon; - -import java.util.ArrayList; /** * Represents a launchable icon on the workspaces and in folders. diff --git a/src/com/android/launcher3/Workspace.java b/src/com/android/launcher3/Workspace.java index 5d2f451bd..e6ab11160 100644 --- a/src/com/android/launcher3/Workspace.java +++ b/src/com/android/launcher3/Workspace.java @@ -53,9 +53,7 @@ import android.view.ViewGroup; import android.view.accessibility.AccessibilityManager; import android.widget.TextView; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderIcon; -import com.android.launcher3.folder.FolderIcon.FolderRingAnimator; +import com.android.launcher3.FolderIcon.FolderRingAnimator; import com.android.launcher3.Launcher.CustomContentCallbacks; import com.android.launcher3.Launcher.LauncherOverlay; import com.android.launcher3.UninstallDropTarget.UninstallSource; diff --git a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java index 8560b2167..03731d175 100644 --- a/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java +++ b/src/com/android/launcher3/accessibility/LauncherAccessibilityDelegate.java @@ -21,7 +21,7 @@ import com.android.launcher3.AppWidgetResizeFrame; import com.android.launcher3.CellLayout; import com.android.launcher3.DeleteDropTarget; import com.android.launcher3.DragSource; -import com.android.launcher3.folder.Folder; +import com.android.launcher3.Folder; import com.android.launcher3.FolderInfo; import com.android.launcher3.InfoDropTarget; import com.android.launcher3.ItemInfo; diff --git a/src/com/android/launcher3/allapps/AllAppsContainerView.java b/src/com/android/launcher3/allapps/AllAppsContainerView.java index 36acedee7..920e954e0 100644 --- a/src/com/android/launcher3/allapps/AllAppsContainerView.java +++ b/src/com/android/launcher3/allapps/AllAppsContainerView.java @@ -40,7 +40,7 @@ import com.android.launcher3.DeviceProfile; import com.android.launcher3.DragSource; import com.android.launcher3.DropTarget; import com.android.launcher3.ExtendedEditText; -import com.android.launcher3.folder.Folder; +import com.android.launcher3.Folder; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; import com.android.launcher3.LauncherTransitionable; diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index 3128db21e..743ba3705 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -53,8 +53,8 @@ import com.android.launcher3.ShortcutAndWidgetContainer; import com.android.launcher3.Utilities; import com.android.launcher3.Workspace; import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; -import com.android.launcher3.folder.Folder; -import com.android.launcher3.folder.FolderIcon; +import com.android.launcher3.Folder; +import com.android.launcher3.FolderIcon; import com.android.launcher3.util.Thunk; import java.util.ArrayList; diff --git a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java index 44d7ac6e9..b73c04f81 100644 --- a/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java +++ b/src/com/android/launcher3/folder/ClippedFolderIconLayoutRule.java @@ -1,15 +1,12 @@ package com.android.launcher3.folder; import android.graphics.Path; -import android.graphics.Point; -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.LauncherAppState; -import com.android.launcher3.Utilities; +import com.android.launcher3.FolderIcon; public class ClippedFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule { - static final int MAX_NUM_ITEMS_IN_PREVIEW = 4; + public static final int MAX_NUM_ITEMS_IN_PREVIEW = 4; private static final int MIN_NUM_ITEMS_IN_PREVIEW = 2; final float MIN_SCALE = 0.48f; diff --git a/src/com/android/launcher3/folder/FolderPagedView.java b/src/com/android/launcher3/folder/FolderPagedView.java index c25444e06..7fc5d2b04 100644 --- a/src/com/android/launcher3/folder/FolderPagedView.java +++ b/src/com/android/launcher3/folder/FolderPagedView.java @@ -33,6 +33,8 @@ import com.android.launcher3.CellLayout; import com.android.launcher3.DeviceProfile; import com.android.launcher3.FocusHelper.PagedFolderKeyEventListener; import com.android.launcher3.FocusIndicatorView; +import com.android.launcher3.Folder; +import com.android.launcher3.FolderIcon; import com.android.launcher3.IconCache; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.ItemInfo; diff --git a/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java b/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java index 87f5f897b..01eeecd43 100644 --- a/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java +++ b/src/com/android/launcher3/folder/StackFolderIconLayoutRule.java @@ -18,11 +18,12 @@ package com.android.launcher3.folder; import android.graphics.Path; -import com.android.launcher3.folder.FolderIcon.PreviewItemDrawingParams; +import com.android.launcher3.FolderIcon; +import com.android.launcher3.FolderIcon.PreviewItemDrawingParams; public class StackFolderIconLayoutRule implements FolderIcon.PreviewLayoutRule { - static final int MAX_NUM_ITEMS_IN_PREVIEW = 3; + public static final int MAX_NUM_ITEMS_IN_PREVIEW = 3; // The degree to which the item in the back of the stack is scaled [0...1] // (0 means it's not scaled at all, 1 means it's scaled to nothing) diff --git a/src/com/android/launcher3/widget/WidgetsContainerView.java b/src/com/android/launcher3/widget/WidgetsContainerView.java index 7ad478ead..9a0c50bac 100644 --- a/src/com/android/launcher3/widget/WidgetsContainerView.java +++ b/src/com/android/launcher3/widget/WidgetsContainerView.java @@ -20,7 +20,6 @@ import android.content.Context; import android.graphics.Bitmap; import android.graphics.Rect; import android.graphics.drawable.Drawable; -import android.graphics.drawable.InsetDrawable; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView.State; import android.util.AttributeSet; @@ -34,7 +33,7 @@ import com.android.launcher3.DeleteDropTarget; import com.android.launcher3.DeviceProfile; import com.android.launcher3.DragSource; import com.android.launcher3.DropTarget.DragObject; -import com.android.launcher3.folder.Folder; +import com.android.launcher3.Folder; import com.android.launcher3.IconCache; import com.android.launcher3.ItemInfo; import com.android.launcher3.Launcher; |