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

am 9217e0fc: The nosensor flag wasn\'t being honored.

Browse Source 
Merge commit '9217e0fc7f11e53e3501b590d8c3ff848dc5dba3'

* commit '9217e0fc7f11e53e3501b590d8c3ff848dc5dba3':
  The nosensor flag wasn't being honored.
This commit is contained in:
Joe Onorato
2009-09-23 11:39:56 -07:00
committed by Android Git Automerger
parent c9bd29d5ff 1b58b3ebee
commit c6fce9a31c
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
policy/com/android/internal/policy/impl/PhoneWindowManager.java
View File

@@ -321,18 +321,27 @@ public class PhoneWindowManager implements WindowManagerPolicy {
MyOrientationListener mOrientationListener;
boolean useSensorForOrientationLp(int appOrientation) {
// The app says use the sensor.
if (appOrientation == ActivityInfo.SCREEN_ORIENTATION_SENSOR) {
return true;
}
if ((mAccelerometerDefault != 0 ||
(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)) {
// The user preference says we can rotate, and the app is willing to rotate.
if (mAccelerometerDefault != 0 &&
(appOrientation == ActivityInfo.SCREEN_ORIENTATION_USER
|| appOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED)) {
return true;
}
// We're in a dock that has a rotation affinity, an the app is willing to rotate.
if ((mCarDockEnablesAccelerometer && mDockState == Intent.EXTRA_DOCK_STATE_CAR)
|| (mDeskDockEnablesAccelerometer && mDockState == Intent.EXTRA_DOCK_STATE_DESK)) {
// Note we override the nosensor flag here.
if (appOrientation == ActivityInfo.SCREEN_ORIENTATION_USER
|| appOrientation == ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED
|| appOrientation == ActivityInfo.SCREEN_ORIENTATION_NOSENSOR) {
return true;
}
}
// Else, don't use the sensor.
return false;
}