am ca1a265c: Merge change 26169 into eclair

Merge commit 'ca1a265cc3a44590b685cad2d5d081565c684d83'

* commit 'ca1a265cc3a44590b685cad2d5d081565c684d83':
  Dock event overrides SCREEN_ORIENTATION_NOSENSOR so Home will rotate in the car dock.
This commit is contained in:
Mike Lockwood
2009-09-21 11:24:14 -07:00
committed by Android Git Automerger

View File

@@ -323,6 +323,8 @@ public class PhoneWindowManager implements WindowManagerPolicy {
(mCarDockEnablesAccelerometer && mDockState == Intent.EXTRA_DOCK_STATE_CAR) ||
(mDeskDockEnablesAccelerometer && mDockState == Intent.EXTRA_DOCK_STATE_DESK))
&& (appOrientation == ActivityInfo.SCREEN_ORIENTATION_USER ||
// dock overrides SCREEN_ORIENTATION_NOSENSOR
appOrientation == ActivityInfo. SCREEN_ORIENTATION_NOSENSOR ||
appOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)) {
return true;
}