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

Rotation lock fix for sensor{Landscape,Portrait} activities.

Browse Source 
E.g. if an app is sensorLandscape and the device rotation is
locked to landscape, the activity should not be allowed to
flip to seascape even if the device is inverted.

If the rotation is locked 90° from the activity's
supported orientations, we must override the lock as before,
but we now suppress the sensor input (confining the activity
to one of its two orientations). This best preserves the
spirit of the rotation lock while still allowing the
activity to run in a supported configuration.

Bug: 3453407
Change-Id: I8ee255e0250ba7e4534f4622ac37b82d31cf9936
This commit is contained in:
Daniel Sandler
2011-02-22 16:10:21 -05:00
parent 2ed6ad6aec
commit e7e5ac250c
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2553,6 +2553,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
private int getCurrentLandscapeRotation(int lastRotation) {
// if the user has locked rotation, we ignore the sensor
if (mUserRotationMode == WindowManagerPolicy.USER_ROTATION_LOCKED) {
if (isLandscapeOrSeascape(mUserRotation)) {
return mUserRotation;
} else {
// it seems odd to obey the sensor at all if rotation lock is enabled
return mLandscapeRotation;
}
}
int sensorRotation = mOrientationListener.getCurrentRotation(lastRotation);
if (isLandscapeOrSeascape(sensorRotation)) {
return sensorRotation;
@@ -2570,6 +2580,16 @@ public class PhoneWindowManager implements WindowManagerPolicy {
}
private int getCurrentPortraitRotation(int lastRotation) {
// if the user has locked rotation, we ignore the sensor
if (mUserRotationMode == WindowManagerPolicy.USER_ROTATION_LOCKED) {
if (isAnyPortrait(mUserRotation)) {
return mUserRotation;
} else {
// it seems odd to obey the sensor at all if rotation lock is enabled
return mPortraitRotation;
}
}
int sensorRotation = mOrientationListener.getCurrentRotation(lastRotation);
if (isAnyPortrait(sensorRotation)) {
return sensorRotation;