Merge branch 'next' of https://github.com/blackberry/GamePlay into next

Conflicts:
	samples/mesh/android/AndroidManifest.xml

gameplay/src/PlatformAndroid.cpp

@@ -523,7 +523,7 @@ static Keyboard::Key getKey(int keycode, int metastate)
         case AKEYCODE_Y:
             return (shiftOn) ? Keyboard::KEY_CAPITAL_Y : Keyboard::KEY_Y;
         case AKEYCODE_Z:
-            return (shiftOn) ? Keyboard::KEY_CAPITAL_Y : Keyboard::KEY_Y;
+            return (shiftOn) ? Keyboard::KEY_CAPITAL_Z : Keyboard::KEY_Z;
         case AKEYCODE_COMMA:
             return Keyboard::KEY_COMMA;
         case AKEYCODE_PERIOD:

gameplay/src/TerrainPatch.cpp

@@ -48,6 +48,7 @@ TerrainPatch::~TerrainPatch()
     {
         deleteLayer(*_layers.begin());
     }
+    SAFE_RELEASE(_camera);
 }
 
 TerrainPatch* TerrainPatch::create(Terrain* terrain, unsigned int index,

samples/browser/android/AndroidManifest.xml

@@ -11,9 +11,9 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden"
+                  android:configChanges="screenSize|orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
-				  sandroid:screenOrientation="landscape">
+				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name" android:value="sample-browser" />
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

samples/character/android/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden"
+                  android:configChanges="screenSize|orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name" android:value="sample-character" />
@@ -22,4 +22,4 @@
         </activity>
     </application>
 
-</manifest> 
+</manifest> 

samples/lua/android/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                 android:label="@string/app_name"
-                android:configChanges="orientation|keyboardHidden"
+                android:configChanges="screenSize|orientation|keyboardHidden"
 				android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name" android:value="sample-lua" />

samples/mesh/android/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden|screenSize"
+                  android:configChanges="screenSize|orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name" android:value="sample-mesh" />
@@ -22,4 +22,4 @@
         </activity>
     </application>
 
-</manifest> 
+</manifest> 

samples/particles/android/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden"
+                  android:configChanges="screenSize|orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name" android:value="sample-particles" />

samples/racer/android/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden"
+                  android:configChanges="screenSize|orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name"

samples/spaceship/android/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden"
+                  android:configChanges="screenSize|orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name" android:value="sample-spaceship"/>
@@ -22,4 +22,4 @@
         </activity>
     </application>
 
-</manifest> 
+</manifest> 

template/android/template.AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden"
+                  android:configChanges="screenSize|orientation|keyboardHidden"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name"
@@ -23,4 +23,4 @@
         </activity>
     </application>
 
-</manifest> 
+</manifest>