From 7501adf4b71bb17d0785a5939efbcac4b39125c3 Mon Sep 17 00:00:00 2001 From: Winson Chung Date: Tue, 2 Jun 2015 11:24:28 -0700 Subject: Ensure that we use the system long press duration when dragging from AllApps. - Removing some old code out of LauncherAppState Bug: 21559400 Change-Id: I3c586094efb7ad8a17d2169bc8aaccf6b0df40a2 --- src/com/android/launcher3/ButtonDropTarget.java | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/com/android/launcher3/ButtonDropTarget.java') diff --git a/src/com/android/launcher3/ButtonDropTarget.java b/src/com/android/launcher3/ButtonDropTarget.java index 09a71b0cc..b7f89d02a 100644 --- a/src/com/android/launcher3/ButtonDropTarget.java +++ b/src/com/android/launcher3/ButtonDropTarget.java @@ -51,7 +51,6 @@ public abstract class ButtonDropTarget extends TextView protected Launcher mLauncher; private int mBottomDragPadding; - protected TextView mText; protected SearchDropTargetBar mSearchDropTargetBar; /** Whether this drop target is active for the current drag */ @@ -82,11 +81,9 @@ public abstract class ButtonDropTarget extends TextView mOriginalTextColor = getTextColors(); // Remove the text in the Phone UI in landscape - int orientation = getResources().getConfiguration().orientation; - if (orientation == Configuration.ORIENTATION_LANDSCAPE) { - if (!LauncherAppState.getInstance().isScreenLarge()) { - setText(""); - } + DeviceProfile grid = ((Launcher) getContext()).getDeviceProfile(); + if (grid.isVerticalBarLayout()) { + setText(""); } } -- cgit v1.2.3