Merge branch 'master' of https://github.com/MoSync/MoSync into MoSyncLib

Conflicts: runtimes/cpp/platforms/android/SyscallImpl.cpp runtimes/java/platforms/androidJNI/AndroidProject/src/com/mosync/java/android/MoSync.java testPrograms/DBTest/dbtest.cpp testPrograms/DBTest/dbutil.cpp testPrograms/ImagePickerTest/NativeScreen.cpp tools/idl2/maapi.idl
Bahsaa · Jul 8, 2013 · 19226d4 · 19226d4
2 parents a97d261 + 6e7c93b
commit 19226d4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
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
@@ -510,6 +510,11 @@ public boolean onPrepareOptionsMenu(Menu menu)
 			for (int i=0; i < items.size(); i++)
 			{
 				MenuItem item = menu.add ( 0, items.get(i).getId(), 0, items.get(i).getTitle() );
+				// When enabled, use ActionBar items.
+//				if (NativeUI.mActionBarEnabled)
+//				{
+//					item.setShowAsAction(items.get(i).getShowActionFlag());
+//				}
 
 				if ( items.get(i).hasPredefinedIcon() )
 				{

diff --git a/tools/idl2/maapi.idl b/tools/idl2/maapi.idl
@@ -6569,7 +6569,6 @@ group PurchaseAPI "Purchase API" {
 } // End of Purchase API
 
 group OrientationAPI "Orientation API" {
-// Testing modules
 #include "Modules/orientation.idl"
 } // End of Orientation API