Merge "Not showing hover menu for trivial selections." (b2b360b6) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarApps.java

+7 −19

Original line number	Original line	Diff line number	Diff line
	@@ -740,10 +740,6 @@ class NavigationBarApps extends LinearLayout {
	private void populateLaunchMenu(AppButtonData appButtonData) {		private void populateLaunchMenu(AppButtonData appButtonData) {
	Menu menu = mPopupMenu.getMenu();		Menu menu = mPopupMenu.getMenu();
	int taskCount = appButtonData.getTaskCount();		int taskCount = appButtonData.getTaskCount();
	if (taskCount == 0) {
	menu.add("- TBD MENU ITEM -"); // adding something so that the menu is not empty.
	return;
	}
	for (int i = 0; i < taskCount; ++i) {		for (int i = 0; i < taskCount; ++i) {
	final RecentTaskInfo taskInfo = appButtonData.tasks.get(i);		final RecentTaskInfo taskInfo = appButtonData.tasks.get(i);
	MenuItem item = menu.add(getActivityForTask(taskInfo).flattenToShortString());		MenuItem item = menu.add(getActivityForTask(taskInfo).flattenToShortString());
	@@ -758,10 +754,14 @@ class NavigationBarApps extends LinearLayout {
	}		}

	/**		/**
	* Shows a task selection menu for an apps icon.		* Shows a task selection menu for clicked or hovered-over apps that have more than 1 running
			* tasks.
	*/		*/
	private void showLaunchMenu(ImageView appIcon) {		void maybeShowLaunchMenu(ImageView appIcon) {
			if (isPopupInUse()) return;
	AppButtonData appButtonData = (AppButtonData) appIcon.getTag();		AppButtonData appButtonData = (AppButtonData) appIcon.getTag();
			if (appButtonData.getTaskCount() <= 1) return;

	populateLaunchMenu(appButtonData);		populateLaunchMenu(appButtonData);
	showPopupMenu(appIcon);		showPopupMenu(appIcon);
	}		}
	@@ -779,8 +779,7 @@ class NavigationBarApps extends LinearLayout {
	mShowMenuCallback = new Runnable() {		mShowMenuCallback = new Runnable() {
	@Override		@Override
	public void run() {		public void run() {
	if (isPopupInUse()) return;		maybeShowLaunchMenu((ImageView) v);
	showLaunchMenu((ImageView) v);
	}		}
	};		};
	}		}
	@@ -824,17 +823,6 @@ class NavigationBarApps extends LinearLayout {
	mContext.startActivityAsUser(launchIntent, optsBundle, appInfo.getUser());		mContext.startActivityAsUser(launchIntent, optsBundle, appInfo.getUser());
	}		}

	/**
	* Shows a task selection menu for clicked apps that have more than 1 running tasks.
	*/
	void maybeShowLaunchMenu(ImageView appIcon) {
	if (isPopupInUse()) return;
	AppButtonData appButtonData = (AppButtonData) appIcon.getTag();
	if (appButtonData.getTaskCount() <= 1) return;

	showLaunchMenu(appIcon);
	}

	@Override		@Override
	public void onClick(View v) {		public void onClick(View v) {
	AppButtonData appButtonData = (AppButtonData) v.getTag();		AppButtonData appButtonData = (AppButtonData) v.getTag();