github/cordova-android
github/cordova-android
3
0
Fork 1
mirror of https://github.com/apache/cordova-android.git synced 2025-01-19 23:42:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix for merge problem. Tests passing again

Browse Source
This commit is contained in:
Dave Johnson 2010-08-25 20:37:25 -07:00
parent 4eec4c0801
commit fbcaf15353
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/src/com/phonegap/DroidGap.java
View File

@ -272,7 +272,7 @@ public class DroidGap extends Activity {
appView.addJavascriptInterface(mKey, "BackButton"); appView.addJavascriptInterface(mKey, "BackButton");
appView.addJavascriptInterface(audio, "GapAudio"); appView.addJavascriptInterface(audio, "GapAudio");
appView.addJavascriptInterface(callbackServer, "CallbackServer"); appView.addJavascriptInterface(callbackServer, "CallbackServer");
//appView.addJavascriptInterface(new SplashScreen(this), "SplashScreen"); appView.addJavascriptInterface(new SplashScreen(this), "SplashScreen");
if (android.os.Build.VERSION.RELEASE.startsWith("1.")) if (android.os.Build.VERSION.RELEASE.startsWith("1."))
{ {

2
updategap
View File

@ -52,7 +52,7 @@ class Build
phonegapjs << "\n\n" phonegapjs << "\n\n"
end end
File.open(File.join(@path, "assets", "www", "js", "phonegap.js"), 'w') {|f| f.write(phonegapjs) } File.open(File.join(@path, "assets", "www", "phonegap.js"), 'w') {|f| f.write(phonegapjs) }
end end
# #
end end