drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 04c83357: Merge "Awaken dreams on home + recents." into jb-mr2-dev

Browse Source 
* commit '04c83357c3dee87f08e63a11e67e89d78df81938':
  Awaken dreams on home + recents.
This commit is contained in:
John Spurlock
2013-04-08 13:09:35 -07:00
committed by Android Git Automerger
parent 8bfa40aea7 04c83357c3
commit fc9b371e90
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -708,6 +708,7 @@ public class PhoneStatusBar extends BaseStatusBar {
private View.OnClickListener mRecentsClickListener = new View.OnClickListener() { private View.OnClickListener mRecentsClickListener = new View.OnClickListener() {
public void onClick(View v) { public void onClick(View v) {
awakenDreams();
toggleRecentApps(); toggleRecentApps();
} }
}; };

21
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@ -59,6 +59,8 @@ import android.os.UEventObserver;
import android.os.UserHandle; import android.os.UserHandle;
import android.os.Vibrator; import android.os.Vibrator;
import android.provider.Settings; import android.provider.Settings;
import android.service.dreams.DreamService;
import android.service.dreams.IDreamManager;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.util.EventLog; import android.util.EventLog;
import android.util.Log; import android.util.Log;
@ -1801,7 +1803,23 @@ public class PhoneWindowManager implements WindowManagerPolicy {
? com.android.internal.R.anim.lock_screen_wallpaper_behind_enter ? com.android.internal.R.anim.lock_screen_wallpaper_behind_enter
: com.android.internal.R.anim.lock_screen_behind_enter); : 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() { static ITelephony getTelephonyService() {
return ITelephony.Stub.asInterface( return ITelephony.Stub.asInterface(
ServiceManager.checkService(Context.TELEPHONY_SERVICE)); ServiceManager.checkService(Context.TELEPHONY_SERVICE));
@ -4550,6 +4568,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} }
void startDockOrHome() { void startDockOrHome() {
awakenDreams();
// We don't have dock home anymore. Home is home. If you lived here, you'd be home by now. // 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); mContext.startActivityAsUser(mHomeIntent, UserHandle.CURRENT);
} }