resolve merge conflicts of fb4014daa3 to ub-launcher3-master.
Change-Id: I6d84a7f3fad757bf139b6ea0001ac6ab88850996
This commit is contained in:
commit
47ecbb85f3
5 files changed
+21
-6
No files matched your search
@@ -4393,7 +4393,7 @@ public class Workspace extends PagedView
|
||||
}
|
||||
|
||||
@Override
|
||||
public void fillInLaunchSourceData(Bundle sourceData) {
|
||||
public void fillInLaunchSourceData(View v, Bundle sourceData) {
|
||||
sourceData.putString(Stats.SOURCE_EXTRA_CONTAINER, Stats.CONTAINER_HOMESCREEN);
|
||||
sourceData.putInt(Stats.SOURCE_EXTRA_CONTAINER_PAGE, getCurrentPage());
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user