Revision: 49789
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49789
Author: alexk
Date: 2012-08-11 00:11:01 +0000 (Sat, 11 Aug 2012)
Log Message:
-----------
Small android config fixes
makesActivity shouldn't be in deploy.sh
No internet download: no need for permission and button
Updated app version to 1.1 so this rlease would replace 1.0 release lib
Modified Paths:
--------------
branches/soc-2012-swiss_cheese/source/android/app/AndroidManifest.xml
branches/soc-2012-swiss_cheese/source/android/app/deploy.sh
branches/soc-2012-swiss_cheese/source/android/app/res/layout/main.xml
Modified: branches/soc-2012-swiss_cheese/source/android/app/AndroidManifest.xml
===================================================================
--- branches/soc-2012-swiss_cheese/source/android/app/AndroidManifest.xml
2012-08-11 00:05:57 UTC (rev 49788)
+++ branches/soc-2012-swiss_cheese/source/android/app/AndroidManifest.xml
2012-08-11 00:11:01 UTC (rev 49789)
@@ -2,10 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android";
package="org.blender.play"
android:versionCode="1"
- android:versionName="1.0">
+ android:versionName="1.1">
<uses-permission
android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
- <uses-permission android:name="android.permission.INTERNET" />
- <uses-permission
android:name="android.permission.ACCESS_NETWORK_STATE" />
<supports-screens android:resizeable="true"
android:xlargeScreens="true"
android:largeScreens="true" android:normalScreens="true"
android:anyDensity="true"></supports-screens>
@@ -26,6 +24,8 @@
<category
android:name="android.intent.category.BROWSABLE" />
<data android:scheme="file" android:host="*"
android:pathPattern=".*\\.blend"/>
+ <data android:scheme="file" android:host="*"
+ android:pathPattern=".*\\.blend"
android:mimeType="*/*"/>
</intent-filter>
</activity>
<activity android:name="makesActivity"
android:launchMode="singleTask">
Modified: branches/soc-2012-swiss_cheese/source/android/app/deploy.sh
===================================================================
--- branches/soc-2012-swiss_cheese/source/android/app/deploy.sh 2012-08-11
00:05:57 UTC (rev 49788)
+++ branches/soc-2012-swiss_cheese/source/android/app/deploy.sh 2012-08-11
00:11:01 UTC (rev 49789)
@@ -1,10 +1,8 @@
#!/bin/sh
-#if !(ndk-build) then
-#echo "!!!\tStopped. Compilation failed."
-#exit
-#fi
+if !(ndk-build) then
+echo "!!!\tStopped. Compilation failed."
+exit
+fi
ant clean
ant debug install
adb shell am start -a android.intent.action.MAIN -n
org.blender.play/.GhostActivity
-
-adb shell am start -n org.blender.play/.makesActivity --es exec
/sdcard/libmakesrna.so --es par1 /sdcard/rna/ --es par2 /sdcard/rna/
\ No newline at end of file
Modified: branches/soc-2012-swiss_cheese/source/android/app/res/layout/main.xml
===================================================================
--- branches/soc-2012-swiss_cheese/source/android/app/res/layout/main.xml
2012-08-11 00:05:57 UTC (rev 49788)
+++ branches/soc-2012-swiss_cheese/source/android/app/res/layout/main.xml
2012-08-11 00:11:01 UTC (rev 49789)
@@ -12,20 +12,6 @@
android:text=""
android:textAppearance="?android:attr/textAppearanceMedium" />
- <ProgressBar
- android:id="@+id/progressBar1"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-
- <Button
- android:id="@+id/downloadbutton"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="Download Binaries"
- android:enabled="false"
- />
-
<Button
android:id="@+id/gameselecterbutton"
android:layout_width="match_parent"
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
