Merge "Send next alarm's show intent via PendingIntent" (0a5e256d) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/qs/QSTile.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.qs;

		import android.app.PendingIntent;
		import android.content.Context;
		import android.content.Intent;
		import android.graphics.drawable.Animatable;
		@@ -325,6 +326,7 @@ public abstract class QSTile<TState extends State> implements Listenable {

		public interface Host {
		void startActivityDismissingKeyguard(Intent intent);
		void startActivityDismissingKeyguard(PendingIntent intent);
		void warn(String message, Throwable t);
		void collapsePanels();
		Looper getLooper();

packages/SystemUI/src/com/android/systemui/qs/tiles/IntentTile.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -99,7 +99,7 @@ public class IntentTile extends QSTile<QSTile.State> {
		try {
		if (pi != null) {
		if (pi.isActivity()) {
		getHost().startActivityDismissingKeyguard(pi.getIntent());
		getHost().startActivityDismissingKeyguard(pi);
		} else {
		pi.send();
		}

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+53 −0

Original line number	Diff line number	Diff line
		@@ -1617,6 +1617,59 @@ public abstract class BaseStatusBar extends SystemUI implements
		return null;
		}

		public void startPendingIntentDismissingKeyguard(final PendingIntent intent) {
		if (!isDeviceProvisioned()) return;

		final boolean keyguardShowing = mStatusBarKeyguardViewManager.isShowing();
		final boolean afterKeyguardGone = intent.isActivity()
		&& PreviewInflater.wouldLaunchResolverActivity(mContext, intent.getIntent(),
		mCurrentUserId);
		dismissKeyguardThenExecute(new OnDismissAction() {
		public boolean onDismiss() {
		new Thread() {
		@Override
		public void run() {
		try {
		if (keyguardShowing && !afterKeyguardGone) {
		ActivityManagerNative.getDefault()
		.keyguardWaitingForActivityDrawn();
		}

		// The intent we are sending is for the application, which
		// won't have permission to immediately start an activity after
		// the user switches to home. We know it is safe to do at this
		// point, so make sure new activity switches are now allowed.
		ActivityManagerNative.getDefault().resumeAppSwitches();
		} catch (RemoteException e) {
		}

		try {
		intent.send();
		} catch (PendingIntent.CanceledException e) {
		// the stack trace isn't very helpful here.
		// Just log the exception message.
		Log.w(TAG, "Sending intent failed: " + e);

		// TODO: Dismiss Keyguard.
		}
		if (intent.isActivity()) {
		mAssistManager.hideAssist();
		overrideActivityPendingAppTransition(keyguardShowing
		&& !afterKeyguardGone);
		}
		}
		}.start();

		// close the shade if it was open
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
		true /* force /, true / delayed */);
		visibilityChanged(false);

		return true;
		}
		}, afterKeyguardGone);
		}

		private final class NotificationClicker implements View.OnClickListener {
		public void onClick(final View v) {
		if (!(v instanceof ExpandableNotificationRow)) {

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package com.android.systemui.statusbar.phone;

		import android.app.PendingIntent;
		import android.content.Intent;

		/**
		@@ -24,6 +25,7 @@ import android.content.Intent;
		* Keyguard.
		*/
		public interface ActivityStarter {
		void startPendingIntentDismissingKeyguard(PendingIntent intent);
		void startActivity(Intent intent, boolean dismissShade);
		void startActivity(Intent intent, boolean dismissShade, Callback callback);
		void preventNextAnimation();

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -3261,6 +3261,15 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		return !isDeviceProvisioned() \|\| (mDisabled1 & StatusBarManager.DISABLE_SEARCH) != 0;
		}

		public void postStartActivityDismissingKeyguard(final PendingIntent intent) {
		mHandler.post(new Runnable() {
		@Override
		public void run() {
		startPendingIntentDismissingKeyguard(intent);
		}
		});
		}

		public void postStartActivityDismissingKeyguard(final Intent intent, int delay) {
		mHandler.postDelayed(new Runnable() {
		@Override