Commit Graph

3 Commits

Author SHA1 Message Date
Sunny Goyal 7c50b31f57 resolve merge conflicts of 3826bab27e to ub-launcher3-calgary.
Change-Id: I14ff2d67de4ba97628bdf651602724f9f4989173
2016-02-10 12:27:51 -08:00
Tony Wickham 9aae47f8a6 Added 'Cancel' drop target from all apps and widget picker.
- Reuse DeleteDropTarget since it's the same effect, but with "Cancel"
  instead of "Remove" if supportsDeleteDropTarget() returns false.
- Rename related strings (but not their values)

Bug: 24104015
Bug: 24099531
Change-Id: Ia9fbcaa17bb17f7aa31df1f830298da01544c178
2015-10-05 10:58:15 -07:00
Tony Wickham b54c4a3d86 Added BaseDropTargetBar, which SearchDropTargetBar extends.
This is to allow for a future AppInfoDropTargetBar.

Change-Id: I5e66129919226eaef1ba1ddb0c0c99d0a6dc48df
2015-09-15 10:42:24 -07:00