Fix issue with source params not reporting predicted apps. (a49b1f75) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/Folder.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1347,7 +1347,7 @@ public class Folder extends LinearLayout implements DragSource, View.OnClickList
	}		}

	@Override		@Override
	public void fillInLaunchSourceData(Bundle sourceData) {		public void fillInLaunchSourceData(View v, Bundle sourceData) {
	// Fill in from the folder icon's launch source provider first		// Fill in from the folder icon's launch source provider first
	Stats.LaunchSourceUtils.populateSourceDataFromAncestorProvider(mFolderIcon, sourceData);		Stats.LaunchSourceUtils.populateSourceDataFromAncestorProvider(mFolderIcon, sourceData);
	sourceData.putString(Stats.SOURCE_EXTRA_SUB_CONTAINER, Stats.SUB_CONTAINER_FOLDER);		sourceData.putString(Stats.SOURCE_EXTRA_SUB_CONTAINER, Stats.SUB_CONTAINER_FOLDER);

src/com/android/launcher3/Hotseat.java

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,6 +23,7 @@ import android.os.Bundle;
	import android.util.AttributeSet;		import android.util.AttributeSet;
	import android.view.LayoutInflater;		import android.view.LayoutInflater;
	import android.view.MotionEvent;		import android.view.MotionEvent;
			import android.view.View;
	import android.widget.FrameLayout;		import android.widget.FrameLayout;
	import android.widget.TextView;		import android.widget.TextView;

	@@ -153,7 +154,7 @@ public class Hotseat extends FrameLayout
	}		}

	@Override		@Override
	public void fillInLaunchSourceData(Bundle sourceData) {		public void fillInLaunchSourceData(View v, Bundle sourceData) {
	sourceData.putString(Stats.SOURCE_EXTRA_CONTAINER, Stats.CONTAINER_HOTSEAT);		sourceData.putString(Stats.SOURCE_EXTRA_CONTAINER, Stats.CONTAINER_HOTSEAT);
	}		}
	}		}

src/com/android/launcher3/Stats.java

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -31,7 +31,7 @@ public class Stats {
	* Implemented by containers to provide a launch source for a given child.		* Implemented by containers to provide a launch source for a given child.
	*/		*/
	public interface LaunchSourceProvider {		public interface LaunchSourceProvider {
	void fillInLaunchSourceData(Bundle sourceData);		void fillInLaunchSourceData(View v, Bundle sourceData);
	}		}

	/**		/**
	@@ -70,7 +70,7 @@ public class Stats {
	}		}

	if (provider != null) {		if (provider != null) {
	provider.fillInLaunchSourceData(sourceData);		provider.fillInLaunchSourceData(v, sourceData);
	} else if (LauncherAppState.isDogfoodBuild()) {		} else if (LauncherAppState.isDogfoodBuild()) {
	throw new RuntimeException("Expected LaunchSourceProvider");		throw new RuntimeException("Expected LaunchSourceProvider");
	}		}

src/com/android/launcher3/Workspace.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -4500,7 +4500,7 @@ public class Workspace extends PagedView
	}		}

	@Override		@Override
	public void fillInLaunchSourceData(Bundle sourceData) {		public void fillInLaunchSourceData(View v, Bundle sourceData) {
	sourceData.putString(Stats.SOURCE_EXTRA_CONTAINER, Stats.CONTAINER_HOMESCREEN);		sourceData.putString(Stats.SOURCE_EXTRA_CONTAINER, Stats.CONTAINER_HOMESCREEN);
	sourceData.putInt(Stats.SOURCE_EXTRA_CONTAINER_PAGE, getCurrentPage());		sourceData.putInt(Stats.SOURCE_EXTRA_CONTAINER_PAGE, getCurrentPage());
	}		}

src/com/android/launcher3/allapps/AllAppsRecyclerView.java

+15 −1

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ import android.util.AttributeSet;
	import android.view.View;		import android.view.View;

	import com.android.launcher3.BaseRecyclerView;		import com.android.launcher3.BaseRecyclerView;
			import com.android.launcher3.BubbleTextView;
	import com.android.launcher3.DeviceProfile;		import com.android.launcher3.DeviceProfile;
	import com.android.launcher3.R;		import com.android.launcher3.R;
	import com.android.launcher3.Stats;		import com.android.launcher3.Stats;
	@@ -155,12 +156,25 @@ public class AllAppsRecyclerView extends BaseRecyclerView
	}		}

	@Override		@Override
	public void fillInLaunchSourceData(Bundle sourceData) {		public void fillInLaunchSourceData(View v, Bundle sourceData) {
	sourceData.putString(Stats.SOURCE_EXTRA_CONTAINER, Stats.CONTAINER_ALL_APPS);		sourceData.putString(Stats.SOURCE_EXTRA_CONTAINER, Stats.CONTAINER_ALL_APPS);
	if (mApps.hasFilter()) {		if (mApps.hasFilter()) {
	sourceData.putString(Stats.SOURCE_EXTRA_SUB_CONTAINER,		sourceData.putString(Stats.SOURCE_EXTRA_SUB_CONTAINER,
	Stats.SUB_CONTAINER_ALL_APPS_SEARCH);		Stats.SUB_CONTAINER_ALL_APPS_SEARCH);
	} else {		} else {
			if (v instanceof BubbleTextView) {
			BubbleTextView icon = (BubbleTextView) v;
			int position = getChildPosition(icon);
			if (position != NO_POSITION) {
			List<AlphabeticalAppsList.AdapterItem> items = mApps.getAdapterItems();
			AlphabeticalAppsList.AdapterItem item = items.get(position);
			if (item.viewType == AllAppsGridAdapter.PREDICTION_ICON_VIEW_TYPE) {
			sourceData.putString(Stats.SOURCE_EXTRA_SUB_CONTAINER,
			Stats.SUB_CONTAINER_ALL_APPS_PREDICTION);
			return;
			}
			}
			}
	sourceData.putString(Stats.SOURCE_EXTRA_SUB_CONTAINER,		sourceData.putString(Stats.SOURCE_EXTRA_SUB_CONTAINER,
	Stats.SUB_CONTAINER_ALL_APPS_A_Z);		Stats.SUB_CONTAINER_ALL_APPS_A_Z);
	}		}