Merge "Awaken dreams on home + recents." into jb-mr2-dev (04c83357) · Commits · e / os / android_frameworks_base

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -708,6 +708,7 @@ public class PhoneStatusBar extends BaseStatusBar {

		private View.OnClickListener mRecentsClickListener = new View.OnClickListener() {
		public void onClick(View v) {
		awakenDreams();
		toggleRecentApps();
		}
		};

+20 −1

Original line number	Diff line number	Diff line
		@@ -59,6 +59,8 @@ import android.os.UEventObserver;
		import android.os.UserHandle;
		import android.os.Vibrator;
		import android.provider.Settings;
		import android.service.dreams.DreamService;
		import android.service.dreams.IDreamManager;
		import android.util.DisplayMetrics;
		import android.util.EventLog;
		import android.util.Log;
		@@ -1802,6 +1804,22 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		: com.android.internal.R.anim.lock_screen_behind_enter);
		}

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

		static IDreamManager getDreamManager() {
		return IDreamManager.Stub.asInterface(
		ServiceManager.checkService(DreamService.DREAM_SERVICE));
		}

		static ITelephony getTelephonyService() {
		return ITelephony.Stub.asInterface(
		ServiceManager.checkService(Context.TELEPHONY_SERVICE));
		@@ -4550,6 +4568,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		}

		void startDockOrHome() {
		awakenDreams();
		// We don't have dock home anymore. Home is home. If you lived here, you'd be home by now.
		mContext.startActivityAsUser(mHomeIntent, UserHandle.CURRENT);
		}