diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2016-03-24 17:28:25 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2016-03-24 17:29:23 -0700 |
commit | f37a21412afb16f61ca23b5aca2e90691b57e171 (patch) | |
tree | 6e4281017ab0a7247ca4d98f2e77e9b33d4711ff /src/com/android/launcher3/DeleteDropTarget.java | |
parent | 17763cb1d2060fb95873a8920196720c862f0e14 (diff) | |
download | android_packages_apps_Trebuchet-f37a21412afb16f61ca23b5aca2e90691b57e171.tar.gz android_packages_apps_Trebuchet-f37a21412afb16f61ca23b5aca2e90691b57e171.tar.bz2 android_packages_apps_Trebuchet-f37a21412afb16f61ca23b5aca2e90691b57e171.zip |
Defining separate layouts for horizontal and vertical drop target bars
instead of chaning the layouts in DeviceProfile
Bug: 27721989
Change-Id: I9a22c21e643f4fd0058c9be5e9d705aaf7649204
Diffstat (limited to 'src/com/android/launcher3/DeleteDropTarget.java')
-rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index 997ded2d3..f24e00b5c 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -19,6 +19,7 @@ package com.android.launcher3; import android.animation.TimeInterpolator; import android.content.Context; import android.graphics.PointF; +import android.text.TextUtils; import android.util.AttributeSet; import android.view.View; import android.view.animation.AnimationUtils; @@ -69,7 +70,7 @@ public class DeleteDropTarget extends ButtonDropTarget { * Set the drop target's text to either "Remove" or "Cancel" depending on the drag source. */ public void setTextBasedOnDragSource(DragSource dragSource) { - if (!mDeviceProfile.isVerticalBarLayout()) { + if (!TextUtils.isEmpty(getText())) { setText(dragSource.supportsDeleteDropTarget() ? R.string.remove_drop_target_label : android.R.string.cancel); } |