Revert "Merging from ub-launcher3-master @ build 6294827"
Revert "Merging from ub-launcher3-master @ build 6294827" Revert "Merging from ub-launcher3-master @ build 6294827" Revert "Merging from ub-launcher3-master @ build 6294827" Revert "Merging from ub-launcher3-master @ build 6294827" Revert submission 10673936-merge_ub-launcher3-master_6294827 Reason for revert: b/151611270 Reverted Changes: I38a587a1b:Merging from ub-launcher3-master @ build 6294827 I74ae8bea8:Merging from ub-launcher3-master @ build 6294827 I115742e03:Merging from ub-launcher3-master @ build 6294827 Iceb1e8523:Merging from ub-launcher3-master @ build 6294827 Ie242e3907:Merging from ub-launcher3-master @ build 6294827 I609b18fdd:Merging from ub-launcher3-master @ build 6294827 Change-Id: I96f08492cb92e2f670375269423d8b45a81312cf
This commit is contained in:
1 parent
8674a882f6
commit
70a76a61bf
224 files changed
+5748
-2683
No files matched your search
@@ -41,7 +41,6 @@ import com.android.launcher3.util.PackageManagerHelper;
|
||||
import com.android.launcher3.util.Themes;
|
||||
|
||||
import java.net.URISyntaxException;
|
||||
import java.util.ArrayList;
|
||||
|
||||
/**
|
||||
* Drop target which provides a secondary option for an item.
|
||||
@@ -323,9 +322,9 @@ public class SecondaryDropTarget extends ButtonDropTarget implements OnAlarmList
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillInLogContainerData(ItemInfo childInfo, Target child,
|
||||
ArrayList<Target> parents) {
|
||||
mOriginal.fillInLogContainerData(childInfo, child, parents);
|
||||
public void fillInLogContainerData(View v, ItemInfo info, Target target,
|
||||
Target targetParent) {
|
||||
mOriginal.fillInLogContainerData(v, info, target, targetParent);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user