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

am 3a931d02: Merge "Show correct locked orientation on phones" into mnc-dev

Browse Source 
* commit '3a931d028a0c43fe276b0adfdc6b87ac48dd5df3':
  Show correct locked orientation on phones
This commit is contained in:
Adrian Roos
2015-07-15 22:28:02 +00:00
committed by Android Git Automerger
parent 9139d5b0fd 3a931d028a
commit 2fc6e2b57d
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/qs/tiles/RotationLockTile.java
View File

@@ -78,8 +78,7 @@ public class RotationLockTile extends QSTile<QSTile.BooleanState> {
return; return;
} }
state.value = rotationLocked; state.value = rotationLocked;
final boolean portrait = mContext.getResources().getConfiguration().orientation final boolean portrait = isCurrentOrientationLockPortrait();
!= Configuration.ORIENTATION_LANDSCAPE;
final AnimationIcon icon; final AnimationIcon icon;
if (rotationLocked) { if (rotationLocked) {
final int label = portrait ? R.string.quick_settings_rotation_locked_portrait_label final int label = portrait ? R.string.quick_settings_rotation_locked_portrait_label
@@ -98,6 +97,17 @@ public class RotationLockTile extends QSTile<QSTile.BooleanState> {
R.string.accessibility_rotation_lock_off); R.string.accessibility_rotation_lock_off);
} }
private boolean isCurrentOrientationLockPortrait() {
int lockOrientation = mController.getRotationLockOrientation();
if (lockOrientation == Configuration.ORIENTATION_UNDEFINED) {
// Freely rotating device; use current rotation
return mContext.getResources().getConfiguration().orientation
!= Configuration.ORIENTATION_LANDSCAPE;
} else {
return lockOrientation != Configuration.ORIENTATION_LANDSCAPE;
}
}
@Override @Override
public int getMetricsCategory() { public int getMetricsCategory() {
return MetricsLogger.QS_ROTATIONLOCK; return MetricsLogger.QS_ROTATIONLOCK;
@@ -116,9 +126,7 @@ public class RotationLockTile extends QSTile<QSTile.BooleanState> {
int idWhenOff) { int idWhenOff) {
int stringID; int stringID;
if (locked) { if (locked) {
final boolean portrait = mContext.getResources().getConfiguration().orientation stringID = isCurrentOrientationLockPortrait() ? idWhenPortrait: idWhenLandscape;
!= Configuration.ORIENTATION_LANDSCAPE;
stringID = portrait ? idWhenPortrait: idWhenLandscape;
} else { } else {
stringID = idWhenOff; stringID = idWhenOff;
} }