Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aace4ae8 authored by Joe Onorato's avatar Joe Onorato Committed by Android Git Automerger
Browse files

am 5da799e0: Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that... 

am 5da799e0: Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we\'re doing so because of the home key.

Merge commit '5da799e012cc4427a4f656e2416bcd73c22acd83' into eclair-plus-aosp

* commit '5da799e012cc4427a4f656e2416bcd73c22acd83':
  Bug 2248173 - Tell listeners to ACTION_CLOSE_SYSTEM_DIALOGS that we're doing so because of the home
parents e83337b7 f275f0c0

policy/com/android/internal/policy/impl/PhoneWindowManager.java

+3 −2
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    static public final String SYSTEM_DIALOG_REASON_KEY = "reason";

    static public final String SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS = "globalactions";

    static public final String SYSTEM_DIALOG_REASON_RECENT_APPS = "recentapps";

    static public final String SYSTEM_DIALOG_REASON_HOME_KEY = "homekey";



    final Object mLock = new Object();
@@ -1120,7 +1121,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                            ActivityManagerNative.getDefault().stopAppSwitches();

                        } catch (RemoteException e) {

                        }

                        sendCloseSystemWindows();

                        sendCloseSystemWindows(SYSTEM_DIALOG_REASON_HOME_KEY);

                        startDockOrHome();

                    }

                }
@@ -1131,7 +1132,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                ActivityManagerNative.getDefault().stopAppSwitches();

            } catch (RemoteException e) {

            }

            sendCloseSystemWindows();

            sendCloseSystemWindows(SYSTEM_DIALOG_REASON_HOME_KEY);

            startDockOrHome();

        }

    }