MOSYNC-2730 Implemented MAW_EVENT_SCREEN_ORIENTATION_DID_CHANGE event…

… on Android
MoSync · Feb 8, 2013 · 95e9018 · 95e9018
1 parent 157ef1f
commit 95e9018
Show file tree

Hide file tree

Showing 9 changed files with 63 additions and 6 deletions.
diff --git a/libs/NativeUI/Screen.cpp b/libs/NativeUI/Screen.cpp
@@ -118,6 +118,7 @@ namespace NativeUI
 	 * Called just before the screen begins rotating.
 	 * Subclasses may override this method to perform additional actions
 	 * immediately prior to the rotation.
+	 * Note: available only on iOS and WP.
 	 */
 	void Screen::orientationWillChange()
 	{

diff --git a/libs/NativeUI/Screen.h b/libs/NativeUI/Screen.h
@@ -106,6 +106,7 @@ namespace NativeUI
 		 * Called just before the screen begins rotating.
 		 * Subclasses may override this method to perform additional actions
 		 * immediately prior to the rotation.
+		 * Note: available only on iOS and WP.
 		 */
 		virtual void orientationWillChange();
 

diff --git a/runtimes/cpp/platforms/android/MoSyncBridge.cpp b/runtimes/cpp/platforms/android/MoSyncBridge.cpp
@@ -502,6 +502,8 @@ static void nativePostEvent(JNIEnv* env, jobject jthis, jintArray eventBuffer)
 		 * intArray[4] - Handle to url data.
 		 *
 		 * WIDGET_EVENT_RATING_STAR_VALUE_CHANGED
+		 *
+		 * MAW_EVENT_SCREEN_ORIENTATION_DID_CHANGE
 		 */
 
 		// Allocate the widget event data structure.

diff --git a/.../java/platforms/androidJNI/AndroidProject/src/com/mosync/internal/android/EventQueue.java b/.../java/platforms/androidJNI/AndroidProject/src/com/mosync/internal/android/EventQueue.java
@@ -337,6 +337,17 @@ public void postSegmentedListItemClicked(int widgetHandle, int position, int ind
 				index);
 	}
 
+	/**
+	 * Sends a screen orientation changed event.
+	 * @param widgetHandle The screen widget that sends the event.
+	 */
+	public void postScreenOrientationChanged(int widgetHandle)
+	{
+		postWidgetEvent(
+				IX_WIDGET.MAW_EVENT_SCREEN_ORIENTATION_DID_CHANGE,
+				widgetHandle);
+	}
+
 	public static EventQueue getDefault()
 	{
 		return DEFAULT;

diff --git a/...ava/platforms/androidJNI/AndroidProject/src/com/mosync/internal/android/MoSyncThread.java b/...ava/platforms/androidJNI/AndroidProject/src/com/mosync/internal/android/MoSyncThread.java
@@ -3925,8 +3925,16 @@ else if (SCREEN_ORIENTATION_PORTRAIT == orientation)
 		}
 		else if (SCREEN_ORIENTATION_DYNAMIC == orientation)
 		{
-			maScreenSetOrientationHelper(
-				ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+			if ( Build.VERSION.SDK_INT >= Build.VERSION_CODES.GINGERBREAD )
+			{
+				maScreenSetOrientationHelper(
+						ActivityInfo.SCREEN_ORIENTATION_FULL_SENSOR);
+			}
+			else
+			{
+				maScreenSetOrientationHelper(
+						ActivityInfo.SCREEN_ORIENTATION_SENSOR);
+			}
 		}
 		else
 		{

diff --git a/runtimes/java/platforms/androidJNI/AndroidProject/src/com/mosync/java/android/MoSync.java b/runtimes/java/platforms/androidJNI/AndroidProject/src/com/mosync/java/android/MoSync.java
@@ -56,6 +56,7 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MotionEvent;
+import android.view.Surface;
 import android.view.View;
 import android.view.Window;
 
@@ -105,6 +106,11 @@ public class MoSync extends Activity
 	private BroadcastReceiver mShutdownListener;
 	private boolean mEventTypeCloseHasBeenSent = false;
 	private MoSyncNFCForegroundUtil nfcForegroundHandler;
+	/**
+	 * Keep the current screen rotation, and check it againts new
+	 * values retrieved when configuration changes.
+	 */
+	private int mScreenRotation = Surface.ROTATION_0;
 
 	/**
 	 * Sets screen and window properties.
@@ -219,9 +225,17 @@ else if(intent.getAction().equals(LocalNotificationsService.ACTION_NOTIFICATION_
 	@Override
 	public void onConfigurationChanged(Configuration newConfig)
 	{
-		Log.i("MoSync", "onConfigurationChanged");
-
+		SYSLOG("@@MoSync onConfigurationChanged");
 		super.onConfigurationChanged(newConfig);
+
+		SYSLOG("@@MoSync rotation = " + getWindowManager().getDefaultDisplay().getRotation());
+		if ( mScreenRotation != getWindowManager().getDefaultDisplay().getRotation() )
+		{
+			mScreenRotation = getWindowManager().getDefaultDisplay().getRotation();
+
+			EventQueue.getDefault().postScreenOrientationChanged(
+						mMoSyncThread.getCurrentScreen().getHandle());
+		}
 	}
 
 	@Override

diff --git a/testPrograms/orientationNativeUI/TestOrientationForNativeUI/FirstScreen.cpp b/testPrograms/orientationNativeUI/TestOrientationForNativeUI/FirstScreen.cpp
@@ -59,7 +59,8 @@ namespace OrientationTest
 		mOrientationLabel(NULL),
 		mSetOrientationDescriptionLabel(NULL),
 		mSetOrientationButton(NULL),
-		mOrientationOptionsListView(NULL)
+		mOrientationOptionsListView(NULL),
+		mOrientationChangesCount(0)
 	{
 		this->setTitle(SCREEN_TITLE);
 
@@ -397,6 +398,21 @@ namespace OrientationTest
 			case MA_SCREEN_ORIENTATION_LANDSCAPE_RIGHT:
 				orientationText = ORIENTATION_LANDSCAPE_RIGHT;
 				break;
+			default:
+			{
+				// maScreenGetCurrentOrientation is not yet implemented on Android.
+				mOrientationChangesCount ++;
+				if (mOrientationChangesCount > 0)
+				{
+					orientationText = "Orientation changed " +
+							MAUtil::integerToString(mOrientationChangesCount) + " times";
+				}
+				else
+				{
+					orientationText = "Orientation changed 1 time";
+				}
+				break;
+			}
 		}
 		return orientationText;
 	}

diff --git a/testPrograms/orientationNativeUI/TestOrientationForNativeUI/FirstScreen.h b/testPrograms/orientationNativeUI/TestOrientationForNativeUI/FirstScreen.h
@@ -192,6 +192,10 @@ namespace OrientationTest
 		 * 3 - SCREEN_ORIENTATION_DYNAMIC
 		 */
 		int mSelectedOrientation;
+		/**
+		 * Android only. Keep this until getOrientation is implemented.
+		 */
+		int mOrientationChangesCount;
 	};
 
 } // namespace OrientationTest

diff --git a/tools/idl2/NativeUI/WidgetEvent.idl b/tools/idl2/NativeUI/WidgetEvent.idl
@@ -353,7 +353,7 @@ group WidgetEvent "Widget event" {
 
 			/**
 			* Send by current screen after it finishes rotating.
-			* Platform: iOS and Windows Phone 7.1
+			* Platform: iOS, Android and Windows Phone 7.1
 			*/
 			SCREEN_ORIENTATION_DID_CHANGE = 24;