diff options
| author | Michael Jurka <mikejurka@google.com> | 2013-10-10 15:40:23 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-10-10 15:40:23 -0700 |
| commit | 1c6c1d493fa8240bd71727a94ac963563f0392ad (patch) | |
| tree | 505dee1313c0f73b4f03c8b44ad0afdff9687d42 /src | |
| parent | bf18889a3072acd7719784051ddb22b0cd875219 (diff) | |
| parent | 773824cdfe68a27c7df8ef1410a4e875655f4acc (diff) | |
| download | android_packages_apps_Trebuchet-1c6c1d493fa8240bd71727a94ac963563f0392ad.tar.gz android_packages_apps_Trebuchet-1c6c1d493fa8240bd71727a94ac963563f0392ad.tar.bz2 android_packages_apps_Trebuchet-1c6c1d493fa8240bd71727a94ac963563f0392ad.zip | |
am 773824cd: Merge "Change drop target to "uninstall" when in All Apps" into jb-ub-now-indigo-rose
* commit '773824cdfe68a27c7df8ef1410a4e875655f4acc':
Change drop target to "uninstall" when in All Apps
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/launcher3/DeleteDropTarget.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/launcher3/DeleteDropTarget.java b/src/com/android/launcher3/DeleteDropTarget.java index da6f2f79b..4023dafb6 100644 --- a/src/com/android/launcher3/DeleteDropTarget.java +++ b/src/com/android/launcher3/DeleteDropTarget.java @@ -173,7 +173,8 @@ public class DeleteDropTarget extends ButtonDropTarget { @Override public void onDragStart(DragSource source, Object info, int dragAction) { boolean isVisible = true; - boolean isUninstall = false; + boolean useUninstallLabel = !AppsCustomizePagedView.DISABLE_ALL_APPS && + isAllAppsApplication(source, info); // If we are dragging an application from AppsCustomize, only show the control if we can // delete the app (it was downloaded), and rename the string to "uninstall" in such a case. @@ -182,7 +183,7 @@ public class DeleteDropTarget extends ButtonDropTarget { isVisible = false; } - if (isUninstall) { + if (useUninstallLabel) { setCompoundDrawablesRelativeWithIntrinsicBounds(mUninstallDrawable, null, null, null); } else { setCompoundDrawablesRelativeWithIntrinsicBounds(mRemoveDrawable, null, null, null); @@ -193,7 +194,7 @@ public class DeleteDropTarget extends ButtonDropTarget { resetHoverColor(); ((ViewGroup) getParent()).setVisibility(isVisible ? View.VISIBLE : View.GONE); if (getText().length() > 0) { - setText(isUninstall ? R.string.delete_target_uninstall_label + setText(useUninstallLabel ? R.string.delete_target_uninstall_label : R.string.delete_target_label); } } |