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

am 25642f0b: Merge "Make desk mode work again." into froyo

Browse Source 
Merge commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e' into froyo-plus-aosp

* commit '25642f0b16bc0584605ab1d0c327b1b1b3c1909e':
  Make desk mode work again.
This commit is contained in:
Daniel Sandler
2010-04-02 10:59:41 -07:00
committed by Android Git Automerger
parent 3667b9b471 25642f0b16
commit 750edffbc0
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
services/java/com/android/server/UiModeManagerService.java
View File

@@ -383,7 +383,7 @@ class UiModeManagerService extends IUiModeManager.Stub {
} }
final void updateConfigurationLocked(boolean sendIt) { final void updateConfigurationLocked(boolean sendIt) {
int uiMode = 0; int uiMode = Configuration.UI_MODE_TYPE_NORMAL;
if (mCarModeEnabled) { if (mCarModeEnabled) {
uiMode = Configuration.UI_MODE_TYPE_CAR; uiMode = Configuration.UI_MODE_TYPE_CAR;
} else if (mDockState == Intent.EXTRA_DOCK_STATE_DESK) { } else if (mDockState == Intent.EXTRA_DOCK_STATE_DESK) {
@@ -399,8 +399,15 @@ class UiModeManagerService extends IUiModeManager.Stub {
} }
} else { } else {
// Disabling the car mode clears the night mode. // Disabling the car mode clears the night mode.
uiMode = Configuration.UI_MODE_TYPE_NORMAL | uiMode = (uiMode & ~Configuration.UI_MODE_NIGHT_MASK) | Configuration.UI_MODE_NIGHT_NO;
Configuration.UI_MODE_NIGHT_NO; }
if (LOG) {
Slog.d(TAG,
"updateConfigurationLocked: mDockState=" + mDockState
+ "; mCarMode=" + mCarModeEnabled
+ "; mNightMode=" + mNightMode
+ "; uiMode=" + uiMode);
} }
mCurUiMode = uiMode; mCurUiMode = uiMode;