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

am 926e1f01: Merge "When watch is docked, home key press should launch dock home." into klp-modular-dev

Browse Source 
* commit '926e1f01a5f2366c5d0eeab358822ba1d138d980':
  When watch is docked, home key press should launch dock home.
This commit is contained in:
Jeff Brown
2014-06-13 03:04:25 +00:00
committed by Android Git Automerger
parent 4849aa86b1 926e1f01a5
commit 1a073a8f55
1 changed files with 19 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -297,6 +297,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
boolean mSystemReady; boolean mSystemReady;
boolean mSystemBooted; boolean mSystemBooted;
boolean mHdmiPlugged; boolean mHdmiPlugged;
IUiModeManager mUiModeManager;
int mUiMode; int mUiMode;
int mDockMode = Intent.EXTRA_DOCK_STATE_UNDOCKED; int mDockMode = Intent.EXTRA_DOCK_STATE_UNDOCKED;
int mLidOpenRotation; int mLidOpenRotation;
@ -4756,6 +4757,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mKeyguardDelegate = new KeyguardServiceDelegate(mContext, null); mKeyguardDelegate = new KeyguardServiceDelegate(mContext, null);
mKeyguardDelegate.onSystemReady(); mKeyguardDelegate.onSystemReady();
updateUiMode();
synchronized (mLock) { synchronized (mLock) {
updateOrientationListenerLp(); updateOrientationListenerLp();
mSystemReady = true; 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) { void updateRotation(boolean alwaysSendConfiguration) {
try { try {
//set orientation on WindowManager //set orientation on WindowManager
@ -4977,6 +4990,12 @@ public class PhoneWindowManager implements WindowManagerPolicy {
if (ENABLE_DESK_DOCK_HOME_CAPTURE) { if (ENABLE_DESK_DOCK_HOME_CAPTURE) {
intent = mDeskDockIntent; 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) { if (intent == null) {