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

am 154bb559: Merge "Fix PhoneWindowManager#getUserRotationMode" into jb-mr2-dev

Browse Source 
* commit '154bb5597cbd3985e3ab86647c5feaa2e289e1a9':
  Fix PhoneWindowManager#getUserRotationMode
This commit is contained in:
Brett Chabot
2013-05-17 17:16:47 -07:00
committed by Android Git Automerger
parent 8e3f01e90e 154bb5597c
commit 6ffce75fa7
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4369,8 +4369,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
public int getUserRotationMode() { public int getUserRotationMode() {
return Settings.System.getIntForUser(mContext.getContentResolver(), return Settings.System.getIntForUser(mContext.getContentResolver(),
Settings.System.USER_ROTATION, WindowManagerPolicy.USER_ROTATION_FREE, Settings.System.ACCELEROMETER_ROTATION, 0, UserHandle.USER_CURRENT) != 0 ?
UserHandle.USER_CURRENT); WindowManagerPolicy.USER_ROTATION_FREE :
WindowManagerPolicy.USER_ROTATION_LOCKED;
} }
// User rotation: to be used when all else fails in assigning an orientation to the device // User rotation: to be used when all else fails in assigning an orientation to the device