Galaxy apps

.cproject

@@ -33,7 +33,6 @@
 							</tool>
 						</toolChain>
 					</folderInfo>
-					<fileInfo id="com.android.toolchain.gcc.1245095277.993463686" name="openiab-0.9.8.6.jar" rcbsApplicability="disable" resourcePath="libs/openiab-0.9.8.6.jar" toolsToInvoke=""/>
 					<sourceEntries>
 						<entry excluding="src/com/almalence/opencam/Camera.java" flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name=""/>
 					</sourceEntries>

AndroidManifest.xml

@@ -43,6 +43,10 @@
 	<uses-permission android:name="org.onepf.openiab.permission.BILLING"/>
 <!--  -+- -->    
 
+	<!-- Uncomment for Samsung market
+	<uses-permission android:name="com.sec.android.iap.permission.BILLING" />
+	  -->	
+
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hardwareAccelerated="true" android:largeHeap="true">
     <!-- android:debuggable="true"> -->
 
@@ -220,9 +224,6 @@
  </application>
 
 
-	<!-- Uncomment for Samsung market 
-	<uses-permission android:name="com.sec.android.iap.permission.BILLING" />
-	-->
 
 	<uses-sdk 	android:minSdkVersion="14"
 	    		android:targetSdkVersion="24"/>

jni/Application.mk

@@ -1,10 +1,10 @@
-APP_ABI := armeabi-v7a 
+#APP_ABI := armeabi-v7a 
 #APP_ABI := x86
 
 #unlocked
-#APP_ABI := armeabi-v7a x86
+APP_ABI := armeabi-v7a x86
 
 APP_STL := gnustl_static
 APP_OPTIM := release
 APP_PLATFORM := android-21
-NDK_TOOLCHAIN_VERSION=4.9
+NDK_TOOLCHAIN_VERSION=4.9

res/xml/preferences_capture_panoramaaugmented_more.xml

@@ -17,10 +17,11 @@
         android:defaultValue="false" 
         android:summary="@string/pref_plugin_capture_panoramaaugmented_memory_summary" 
         android:key="pref_plugin_capture_panoramaaugmented_memory" />
+    <!-- 
     <CheckBoxPreference 
         android:title="@string/pref_plugin_capture_panoramaaugmented_usehardwaregyro_title" 
         android:defaultValue="false" 
         android:summary="@string/pref_plugin_capture_panoramaaugmented_usehardwaregyro_summary" 
         android:key="pref_plugin_capture_panoramaaugmented_usehardwaregyro" />
-
+ 	-->
 </PreferenceScreen>

res/xml/preferences_general_more.xml

@@ -32,7 +32,7 @@
 		 	android:value="save_configuration"/>
 	</PreferenceScreen>
 	+++ -->
-    <ListPreference
+	<ListPreference
         android:defaultValue="95"
         android:entries="@array/JPEGQualityArrayCommon"
         android:entryValues="@array/JPEGQualityValuesCommon"
@@ -100,4 +100,4 @@
         android:id="@+id/camera_parameters"
         android:key="camera_parameters"
         android:title="@string/Pref_CameraParameters_Title" />
-</PreferenceScreen>
+</PreferenceScreen>

res/xml/preferences_vf_common.xml

@@ -11,7 +11,7 @@
 	    <CheckBoxPreference
 	        android:title="@string/Pref_KeepScreenOn"
 	        android:summary="@string/Pref_KeepScreenOn_Summary"
-	        android:defaultValue="false"
+	        android:defaultValue="true"
             android:key="@string/Preference_KeepScreenOnValue" />
 
 	    <CheckBoxPreference
@@ -56,7 +56,7 @@
 	    <CheckBoxPreference
 	        android:title="@string/Pref_KeepScreenOn"
 	        android:summary="@string/Pref_KeepScreenOn_Summary"
-	        android:defaultValue="false"
+	        android:defaultValue="true"
             android:key="@string/Preference_KeepScreenOnValue" />
 
 	    <CheckBoxPreference
@@ -81,4 +81,4 @@
 		</PreferenceScreen>
 
 </PreferenceScreen>
-+++ -->
++++ -->

res/xml/preferences_vf_gyro.xml

@@ -3,9 +3,10 @@
 	        android:title="@string/Pref_ShowGyroVF"
 	        android:defaultValue="false"
             android:key="PrefGyroVF" />
-
+        <!-- 
         <CheckBoxPreference
 	        android:title="@string/Pref_GyroTypeVF"
 	        android:defaultValue="false"
             android:key="PrefGyroTypeVF" />
+             -->
 </PreferenceScreen>