Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '1a073a8f550695342e8e3902d2223fd237941e95':
  When watch is docked, home key press should launch dock home.
This commit is contained in:
Jeff Brown
2014-06-13 10:24:29 +00:00
committed by Android Git Automerger
parent 19b8fe225d 1a073a8f55
commit 49f186a295
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

@@ -306,6 +306,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;
@@ -4984,6 +4985,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
mKeyguardDelegate = new KeyguardServiceDelegate(mContext, null);
mKeyguardDelegate.onSystemReady();
updateUiMode();
synchronized (mLock) {
updateOrientationListenerLp();
mSystemReady = true;
@@ -5172,6 +5174,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
@@ -5217,6 +5230,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) {