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

Merge "Override app requested orientation when docked." into ics-mr1

Browse Source
This commit is contained in:
Jeff Brown
2011-11-15 14:46:17 -08:00
committed by Android (Google) Code Review
parent 5f11d73c91 dec6cf4f30
commit d5713179a0
1 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3097,7 +3097,7 @@ public class PhoneWindowManager implements WindowManagerPolicy {
sensorRotation = lastRotation;
}
int preferredRotation = -1;
final int preferredRotation;
if (mHdmiPlugged) {
// Ignore sensor when plugged into HDMI.
preferredRotation = mHdmiRotation;
@@ -3146,28 +3146,39 @@ public class PhoneWindowManager implements WindowManagerPolicy {
} else if (mUserRotationMode == WindowManagerPolicy.USER_ROTATION_LOCKED) {
// Apply rotation lock.
preferredRotation = mUserRotation;
} else {
// No overriding preference.
// We will do exactly what the application asked us to do.
preferredRotation = -1;
}
// TODO: Sometimes, we might want to override the application-requested
// orientation, such as when HDMI is plugged in or when docked.
// We can do that by modifying the appropriate cases above to return
// the preferred orientation directly instead of continuing on down here.
switch (orientation) {
case ActivityInfo.SCREEN_ORIENTATION_PORTRAIT:
// Always return portrait if orientation set to portrait.
// Return portrait unless overridden.
if (isAnyPortrait(preferredRotation)) {
return preferredRotation;
}
return mPortraitRotation;
case ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE:
// Always return landscape if orientation set to landscape.
// Return landscape unless overridden.
if (isLandscapeOrSeascape(preferredRotation)) {
return preferredRotation;
}
return mLandscapeRotation;
case ActivityInfo.SCREEN_ORIENTATION_REVERSE_PORTRAIT:
// Always return portrait if orientation set to portrait.
// Return reverse portrait unless overridden.
if (isAnyPortrait(preferredRotation)) {
return preferredRotation;
}
return mUpsideDownRotation;
case ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE:
// Always return seascape if orientation set to reverse landscape.
// Return seascape unless overridden.
if (isLandscapeOrSeascape(preferredRotation)) {
return preferredRotation;
}
return mSeascapeRotation;
case ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE: