Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / public / android / java / src / org / chromium / content / browser / ScreenOrientationProvider.java

diff --git a/src/content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java b/src/content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java
index 89913ed..47e79e6 100644 (file)
--- a/src/content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java
+++ b/src/content/public/android/java/src/org/chromium/content/browser/ScreenOrientationProvider.java
@@ -24,6 +24,8 @@ class ScreenOrientationProvider {
 
     private int getOrientationFromWebScreenOrientations(byte orientations) {
         switch (orientations) {
+            case ScreenOrientationValues.DEFAULT:
+                return ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED;
             case ScreenOrientationValues.PORTRAIT_PRIMARY:
                 return ActivityInfo.SCREEN_ORIENTATION_PORTRAIT;
             case ScreenOrientationValues.PORTRAIT_SECONDARY:
@@ -32,16 +34,11 @@ class ScreenOrientationProvider {
                 return ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE;
             case ScreenOrientationValues.LANDSCAPE_SECONDARY:
                 return ActivityInfo.SCREEN_ORIENTATION_REVERSE_LANDSCAPE;
-            case ScreenOrientationValues.PORTRAIT_PRIMARY |
-                    ScreenOrientationValues.PORTRAIT_SECONDARY:
+            case ScreenOrientationValues.PORTRAIT:
                 return ActivityInfo.SCREEN_ORIENTATION_SENSOR_PORTRAIT;
-            case ScreenOrientationValues.LANDSCAPE_PRIMARY |
-                    ScreenOrientationValues.LANDSCAPE_SECONDARY:
+            case ScreenOrientationValues.LANDSCAPE:
                 return ActivityInfo.SCREEN_ORIENTATION_SENSOR_LANDSCAPE;
-            case ScreenOrientationValues.PORTRAIT_PRIMARY |
-                    ScreenOrientationValues.PORTRAIT_SECONDARY |
-                    ScreenOrientationValues.LANDSCAPE_PRIMARY |
-                    ScreenOrientationValues.LANDSCAPE_SECONDARY:
+            case ScreenOrientationValues.ANY:
                 return ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR;
             default:
                 Log.w(TAG, "Trying to lock to unsupported orientation!");