resolve merge conflicts of fb4014daa3 to ub-launcher3-master.

Change-Id: I6d84a7f3fad757bf139b6ea0001ac6ab88850996
This commit is contained in:
Winson committed 2015-10-16 16:47:49 -07:00
commit 47ecbb85f3
5 files changed
+21 -6

No files matched your search

+2 -2
View File
@@ -33,7 +33,7 @@ public class Stats {
* Implemented by containers to provide a launch source for a given child.
*/
public interface LaunchSourceProvider {
void fillInLaunchSourceData(Bundle sourceData);
void fillInLaunchSourceData(View v, Bundle sourceData);
}
/**
@@ -72,7 +72,7 @@ public class Stats {
}
if (provider != null) {
provider.fillInLaunchSourceData(sourceData);
provider.fillInLaunchSourceData(v, sourceData);
} else if (ProviderConfig.IS_DOGFOOD_BUILD) {
throw new RuntimeException("Expected LaunchSourceProvider");
}