From 2f0e4a3995684c986afad55db7715c15393a9df0 Mon Sep 17 00:00:00 2001
From: Angus Kong <shkong@google.com>
Date: Tue, 3 Dec 2013 10:02:35 -0800
Subject: Make onLayoutOrientationChanged to take a boolean.

ModuleController.onLayoutOrientationChanged() call back can just take a boolean
to know whether the layout orientation is in landscape or portrait.

Change-Id: I1675cbea263b12bb0b568a6038f0fc17dd03799a
---
 src/com/android/camera/CameraActivity.java          | 8 +++++++-
 src/com/android/camera/PhotoModule.java             | 2 +-
 src/com/android/camera/VideoModule.java             | 2 +-
 src/com/android/camera/WideAnglePanoramaModule.java | 4 ++--
 src/com/android/camera/WideAnglePanoramaUI.java     | 2 +-
 src/com/android/camera/module/ModuleController.java | 8 ++++----
 6 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'src/com/android')

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 33ce126fe..79fa34363 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -1450,9 +1450,15 @@ public class CameraActivity extends Activity
     @Override
     public void onConfigurationChanged(Configuration config) {
         super.onConfigurationChanged(config);
+
+        if (config.orientation == Configuration.ORIENTATION_UNDEFINED) {
+            return;
+        }
+
         if (mLastLayoutOrientation != config.orientation) {
             mLastLayoutOrientation = config.orientation;
-            mCurrentModule.onLayoutOrientationChanged(mLastLayoutOrientation);
+            mCurrentModule.onLayoutOrientationChanged(
+                    mLastLayoutOrientation == Configuration.ORIENTATION_LANDSCAPE);
         }
     }
 
diff --git a/src/com/android/camera/PhotoModule.java b/src/com/android/camera/PhotoModule.java
index 787f84fe4..8a6d66d21 100644
--- a/src/com/android/camera/PhotoModule.java
+++ b/src/com/android/camera/PhotoModule.java
@@ -1250,7 +1250,7 @@ public class PhotoModule
     }
 
     @Override
-    public void onLayoutOrientationChanged(int orientation) {
+    public void onLayoutOrientationChanged(boolean isLandscape) {
         setDisplayOrientation();
     }
 
diff --git a/src/com/android/camera/VideoModule.java b/src/com/android/camera/VideoModule.java
index c2ebcd57f..ee81f5c9c 100644
--- a/src/com/android/camera/VideoModule.java
+++ b/src/com/android/camera/VideoModule.java
@@ -1455,7 +1455,7 @@ public class VideoModule extends CameraModule
     }
 
     @Override
-    public void onLayoutOrientationChanged(int orientation) {
+    public void onLayoutOrientationChanged(boolean isLandscape) {
         setDisplayOrientation();
     }
 
diff --git a/src/com/android/camera/WideAnglePanoramaModule.java b/src/com/android/camera/WideAnglePanoramaModule.java
index c75a20b78..7981bae2b 100644
--- a/src/com/android/camera/WideAnglePanoramaModule.java
+++ b/src/com/android/camera/WideAnglePanoramaModule.java
@@ -893,8 +893,8 @@ public class WideAnglePanoramaModule
     }
 
     @Override
-    public void onLayoutOrientationChanged(int orientation) {
-        mUI.onConfigurationChanged(orientation, mThreadRunning);
+    public void onLayoutOrientationChanged(boolean isLandscape) {
+        mUI.onConfigurationChanged(isLandscape, mThreadRunning);
     }
 
     @Override
diff --git a/src/com/android/camera/WideAnglePanoramaUI.java b/src/com/android/camera/WideAnglePanoramaUI.java
index 76a95ec4f..58a1a3231 100644
--- a/src/com/android/camera/WideAnglePanoramaUI.java
+++ b/src/com/android/camera/WideAnglePanoramaUI.java
@@ -262,7 +262,7 @@ public class WideAnglePanoramaUI implements
     }
 
     public void onConfigurationChanged(
-            int orientation, boolean threadRunning) {
+            boolean isLandscape, boolean threadRunning) {
         Drawable lowResReview = null;
         if (threadRunning) lowResReview = mReview.getDrawable();
 
diff --git a/src/com/android/camera/module/ModuleController.java b/src/com/android/camera/module/ModuleController.java
index 0d4466830..e32b8d7e9 100644
--- a/src/com/android/camera/module/ModuleController.java
+++ b/src/com/android/camera/module/ModuleController.java
@@ -69,15 +69,15 @@ public interface ModuleController {
     /**
      * Called when the framework layout orientation changed.
      *
-     * @param orientation {@link Configuration#ORIENTATION_LANDSCAPE} or
-     *                    {@link Configuration#ORIENTATION_PORTRAIT}.
+     * @param isLandscape Whether the new orientation is landscape or portrait.
      */
-    public void onLayoutOrientationChanged(int orientation);
+    public void onLayoutOrientationChanged(boolean isLandscape);
 
     /**
      * Called when the UI orientation is changed.
      *
-     * @param orientation The new orientation.
+     * @param orientation The new orientation, valid values are 0, 90, 180 and
+     *                    270.
      */
     public void onOrientationChanged(int orientation);
 
-- 
cgit v1.2.3