Merge "Launch application details for correct profile from recents." into lmp-dev (fb7d2c4c) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -738,12 +738,12 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
		}
		}

		private void startApplicationDetailsActivity(String packageName) {
		private void startApplicationDetailsActivity(String packageName, int userId) {
		Intent intent = new Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
		Uri.fromParts("package", packageName, null));
		intent.setComponent(intent.resolveActivity(getContext().getPackageManager()));
		TaskStackBuilder.create(getContext())
		.addNextIntentWithParentStack(intent).startActivities();
		.addNextIntentWithParentStack(intent).startActivities(null, new UserHandle(userId));
		}

		public boolean onInterceptTouchEvent(MotionEvent ev) {
		@@ -769,7 +769,7 @@ public class RecentsPanelView extends FrameLayout implements OnItemClickListener
		ViewHolder viewHolder = (ViewHolder) selectedView.getTag();
		if (viewHolder != null) {
		final TaskDescription ad = viewHolder.taskDescription;
		startApplicationDetailsActivity(ad.packageName);
		startApplicationDetailsActivity(ad.packageName, ad.userId);
		show(false);
		} else {
		throw new IllegalStateException("Oops, no tag on view " + selectedView);

+3 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@ import android.graphics.Bitmap;
		import android.graphics.Canvas;
		import android.graphics.Rect;
		import android.net.Uri;
		import android.os.UserHandle;
		import android.provider.Settings;
		import android.util.AttributeSet;
		import android.view.LayoutInflater;
		@@ -474,7 +475,8 @@ public class RecentsView extends FrameLayout implements TaskStackView.TaskStackV
		Uri.fromParts("package", baseIntent.getComponent().getPackageName(), null));
		intent.setComponent(intent.resolveActivity(getContext().getPackageManager()));
		TaskStackBuilder.create(getContext())
		.addNextIntentWithParentStack(intent).startActivities();
		.addNextIntentWithParentStack(intent).startActivities(null,
		new UserHandle(t.userId));
		}

		@Override