diff options
| author | Jeff Brown <jeffbrown@google.com> | 2014-06-13 03:00:41 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-06-12 05:34:42 +0000 |
| commit | 926e1f01a5f2366c5d0eeab358822ba1d138d980 (patch) | |
| tree | 4d746b2cd4e8da453662014e82cc8bf53fccc3bb | |
| parent | be63495101dba3b0c3c496cdd810df9e30e926d4 (diff) | |
| parent | 4f5fa285a8be63522a3530dca4b6b549cb49ae9b (diff) | |
| download | frameworks_base-926e1f01a5f2366c5d0eeab358822ba1d138d980.zip frameworks_base-926e1f01a5f2366c5d0eeab358822ba1d138d980.tar.gz frameworks_base-926e1f01a5f2366c5d0eeab358822ba1d138d980.tar.bz2 | |
Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindowManager.java | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java index 38845b5..17c29ce 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindowManager.java @@ -297,6 +297,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { boolean mSystemReady; boolean mSystemBooted; boolean mHdmiPlugged; + IUiModeManager mUiModeManager; int mUiMode; int mDockMode = Intent.EXTRA_DOCK_STATE_UNDOCKED; int mLidOpenRotation; @@ -4756,6 +4757,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { mKeyguardDelegate = new KeyguardServiceDelegate(mContext, null); mKeyguardDelegate.onSystemReady(); + updateUiMode(); synchronized (mLock) { updateOrientationListenerLp(); mSystemReady = true; @@ -4932,6 +4934,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { } } + void updateUiMode() { + if (mUiModeManager == null) { + mUiModeManager = IUiModeManager.Stub.asInterface( + ServiceManager.getService(Context.UI_MODE_SERVICE)); + } + try { + mUiMode = mUiModeManager.getCurrentModeType(); + } catch (RemoteException e) { + } + } + void updateRotation(boolean alwaysSendConfiguration) { try { //set orientation on WindowManager @@ -4977,6 +4990,12 @@ public class PhoneWindowManager implements WindowManagerPolicy { if (ENABLE_DESK_DOCK_HOME_CAPTURE) { intent = mDeskDockIntent; } + } else if (mUiMode == Configuration.UI_MODE_TYPE_WATCH + && (mDockMode == Intent.EXTRA_DOCK_STATE_DESK + || mDockMode == Intent.EXTRA_DOCK_STATE_HE_DESK + || mDockMode == Intent.EXTRA_DOCK_STATE_LE_DESK)) { + // Always launch dock home from home when watch is docked, if it exists. + intent = mDeskDockIntent; } if (intent == null) { |