diff options
author | Winson Chung <winsonc@google.com> | 2015-06-02 11:24:28 -0700 |
---|---|---|
committer | Winson Chung <winsonc@google.com> | 2015-06-05 10:52:57 -0700 |
commit | 7501adf4b71bb17d0785a5939efbcac4b39125c3 (patch) | |
tree | d2b135f6257d7693a926c20d17d5f46323843269 /src/com/android/launcher3/ButtonDropTarget.java | |
parent | 8d8c73b591bf58f93f8841938ad8ce92085f7105 (diff) | |
download | android_packages_apps_Trebuchet-7501adf4b71bb17d0785a5939efbcac4b39125c3.tar.gz android_packages_apps_Trebuchet-7501adf4b71bb17d0785a5939efbcac4b39125c3.tar.bz2 android_packages_apps_Trebuchet-7501adf4b71bb17d0785a5939efbcac4b39125c3.zip |
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
Diffstat (limited to 'src/com/android/launcher3/ButtonDropTarget.java')
-rw-r--r-- | src/com/android/launcher3/ButtonDropTarget.java | 9 |
1 files changed, 3 insertions, 6 deletions
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(""); } } |