Merge "Use app title for stack title & dialog title." (fcfbf2fc) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/app/ChooserActivity.java

+2 −3

Original line number	Diff line number	Diff line
		@@ -1377,9 +1377,8 @@ public class ChooserActivity extends ResolverActivity implements
		for (TargetInfo innerInfo : mti.getTargets()) {
		labels.add(innerInfo.getResolveInfo().loadLabel(getPackageManager()));
		}
		f = new ResolverTargetActionsDialogFragment(
		mti.getResolveInfo().loadLabel(getPackageManager()), name, mti.getTargets(),
		labels);
		f = new ResolverTargetActionsDialogFragment(mti.getDisplayLabel(), name,
		mti.getTargets(), labels);
		} else {
		f = new ResolverTargetActionsDialogFragment(
		ti.getResolveInfo().loadLabel(getPackageManager()), name, pinned);

+6 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,6 @@ import java.util.List;
		public class MultiDisplayResolveInfo extends DisplayResolveInfo {

		List<DisplayResolveInfo> mTargetInfos = new ArrayList<>();
		String mPackageName;
		// We'll use this DRI for basic presentation info - eg icon, name.
		final DisplayResolveInfo mBaseInfo;

		@@ -38,6 +37,12 @@ public class MultiDisplayResolveInfo extends DisplayResolveInfo {
		mTargetInfos.add(firstInfo);
		}

		@Override
		public CharSequence getExtendedInfo() {
		// Never show subtitle for stacked apps
		return null;
		}

		/**
		* Add another DisplayResolveInfo to the list included for this target.
		*/