am 69509926: Merge "More termination conditions for Dreams." into jb-mr1-dev (4f924dd2) · Commits · e / os / android_frameworks_base

core/java/android/service/dreams/Dream.java

+14 −2

Original line number	Original line	Diff line number	Diff line
	@@ -70,7 +70,13 @@ public class Dream extends Service implements Window.Callback {
	// begin Window.Callback methods		// begin Window.Callback methods
	@Override		@Override
	public boolean dispatchKeyEvent(KeyEvent event) {		public boolean dispatchKeyEvent(KeyEvent event) {
			// TODO: create more flexible version of mInteractive that allows use of KEYCODE_BACK
	if (!mInteractive) {		if (!mInteractive) {
			if (DEBUG) Slog.v(TAG, "finishing on keyEvent");
			finish();
			return true;
			} else if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
			if (DEBUG) Slog.v(TAG, "finishing on back key");
	finish();		finish();
	return true;		return true;
	}		}
	@@ -80,6 +86,7 @@ public class Dream extends Service implements Window.Callback {
	@Override		@Override
	public boolean dispatchKeyShortcutEvent(KeyEvent event) {		public boolean dispatchKeyShortcutEvent(KeyEvent event) {
	if (!mInteractive) {		if (!mInteractive) {
			if (DEBUG) Slog.v(TAG, "finishing on keyShortcutEvent");
	finish();		finish();
	return true;		return true;
	}		}
	@@ -88,7 +95,10 @@ public class Dream extends Service implements Window.Callback {

	@Override		@Override
	public boolean dispatchTouchEvent(MotionEvent event) {		public boolean dispatchTouchEvent(MotionEvent event) {
			// TODO: create more flexible version of mInteractive that allows clicks
			// but finish()es on any other kind of activity
	if (!mInteractive) {		if (!mInteractive) {
			if (DEBUG) Slog.v(TAG, "finishing on touchEvent");
	finish();		finish();
	return true;		return true;
	}		}
	@@ -98,6 +108,7 @@ public class Dream extends Service implements Window.Callback {
	@Override		@Override
	public boolean dispatchTrackballEvent(MotionEvent event) {		public boolean dispatchTrackballEvent(MotionEvent event) {
	if (!mInteractive) {		if (!mInteractive) {
			if (DEBUG) Slog.v(TAG, "finishing on trackballEvent");
	finish();		finish();
	return true;		return true;
	}		}
	@@ -107,6 +118,7 @@ public class Dream extends Service implements Window.Callback {
	@Override		@Override
	public boolean dispatchGenericMotionEvent(MotionEvent event) {		public boolean dispatchGenericMotionEvent(MotionEvent event) {
	if (!mInteractive) {		if (!mInteractive) {
			if (DEBUG) Slog.v(TAG, "finishing on genericMotionEvent");
	finish();		finish();
	return true;		return true;
	}		}

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

+17 −0

Original line number	Original line	Diff line number	Diff line
	@@ -48,6 +48,7 @@ import android.os.ServiceManager;
	import android.os.SystemClock;		import android.os.SystemClock;
	import android.os.UserId;		import android.os.UserId;
	import android.provider.Settings;		import android.provider.Settings;
			import android.service.dreams.IDreamManager;
	import android.util.DisplayMetrics;		import android.util.DisplayMetrics;
	import android.util.Log;		import android.util.Log;
	import android.util.Slog;		import android.util.Slog;
	@@ -153,6 +154,7 @@ public class PhoneStatusBar extends BaseStatusBar {
	Display mDisplay;		Display mDisplay;

	IWindowManager mWindowManager;		IWindowManager mWindowManager;
			IDreamManager mDreamManager;

	StatusBarWindowView mStatusBarWindow;		StatusBarWindowView mStatusBarWindow;
	PhoneStatusBarView mStatusBarView;		PhoneStatusBarView mStatusBarView;
	@@ -302,6 +304,9 @@ public class PhoneStatusBar extends BaseStatusBar {
	mWindowManager = IWindowManager.Stub.asInterface(		mWindowManager = IWindowManager.Stub.asInterface(
	ServiceManager.getService(Context.WINDOW_SERVICE));		ServiceManager.getService(Context.WINDOW_SERVICE));

			mDreamManager = IDreamManager.Stub.asInterface(
			ServiceManager.checkService("dreams"));

	super.start(); // calls createAndAddWindows()		super.start(); // calls createAndAddWindows()

	addNavigationBar();		addNavigationBar();
	@@ -606,6 +611,7 @@ public class PhoneStatusBar extends BaseStatusBar {
	private Runnable mShowSearchPanel = new Runnable() {		private Runnable mShowSearchPanel = new Runnable() {
	public void run() {		public void run() {
	showSearchPanel();		showSearchPanel();
			awakenDreams();
	}		}
	};		};

	@@ -622,12 +628,23 @@ public class PhoneStatusBar extends BaseStatusBar {
	case MotionEvent.ACTION_UP:		case MotionEvent.ACTION_UP:
	case MotionEvent.ACTION_CANCEL:		case MotionEvent.ACTION_CANCEL:
	mHandler.removeCallbacks(mShowSearchPanel);		mHandler.removeCallbacks(mShowSearchPanel);
			awakenDreams();
	break;		break;
	}		}
	return false;		return false;
	}		}
	};		};

			private void awakenDreams() {
			if (mDreamManager != null) {
			try {
			mDreamManager.awaken();
			} catch (RemoteException e) {
			// fine, stay asleep then
			}
			}
			}

	private void prepareNavigationBarView() {		private void prepareNavigationBarView() {
	mNavigationBarView.reorient();		mNavigationBarView.reorient();