diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-05-25 18:56:41 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-06-06 16:15:46 -0700 |
commit | 47328fd53f43fd0c2ed14ad925dd04483f9229a0 (patch) | |
tree | 68584a0a8662f18241748b22f061c564acae790b /src/com/android/launcher3/ButtonDropTarget.java | |
parent | 63741779e564ea9c6814800199b994f7464906db (diff) | |
download | android_packages_apps_Trebuchet-47328fd53f43fd0c2ed14ad925dd04483f9229a0.tar.gz android_packages_apps_Trebuchet-47328fd53f43fd0c2ed14ad925dd04483f9229a0.tar.bz2 android_packages_apps_Trebuchet-47328fd53f43fd0c2ed14ad925dd04483f9229a0.zip |
Removing the SearchDropTarget bar as it no longer contains the QSB
> Renaming it to simply DropTargetBar
> Moving AppInfo to the top bar as well
> The workspace pages will extend to the top edge (minus some padding).
Since the QSB is no longer displayed on top of every page, there is
no reason to reserve the space.
> In spring-loaded mode, the workspace cell layout will scale enough
to make room for the drop target bar at the top
Change-Id: I2baf607310335dd576c9d9fcbb75ab708f47ac03
Diffstat (limited to 'src/com/android/launcher3/ButtonDropTarget.java')
-rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 43afbe59e..61ac713a5 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -55,10 +55,10 @@ public abstract class ButtonDropTarget extends TextView private static final int DRAG_VIEW_DROP_DURATION = 285; private final boolean mHideParentOnDisable; + protected final Launcher mLauncher; - protected Launcher mLauncher; private int mBottomDragPadding; - protected BaseDropTargetBar mDropTargetBar; + protected DropTargetBar mDropTargetBar; /** Whether this drop target is active for the current drag */ protected boolean mActive; @@ -80,6 +80,8 @@ public abstract class ButtonDropTarget extends TextView public ButtonDropTarget(Context context, AttributeSet attrs, int defStyle) { super(context, attrs, defStyle); + mLauncher = (Launcher) context; + Resources resources = getResources(); mBottomDragPadding = resources.getDimensionPixelSize(R.dimen.drop_target_drag_padding); @@ -109,11 +111,7 @@ public abstract class ButtonDropTarget extends TextView } } - public void setLauncher(Launcher launcher) { - mLauncher = launcher; - } - - public void setDropTargetBar(BaseDropTargetBar dropTargetBar) { + public void setDropTargetBar(DropTargetBar dropTargetBar) { mDropTargetBar = dropTargetBar; } |