Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Teeting issue with learning to use GitHub: The commit to GitHub somehow was incomplete. :( - fixed with this commit.
Also, back button now goes "back" to index.html rather than closing the webkit.

Signed-off-by: Dawson Brown <[email protected]>
  • Loading branch information
DawsonLeBrown committed May 16, 2011
1 parent 7cd9e99 commit 581270b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
20 changes: 15 additions & 5 deletions src/com/geeksville/gaggle/AboutActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,24 +21,34 @@
package com.geeksville.gaggle;

import com.geeksville.gaggle.R;
import com.geeksville.webkit.WebViewClient;
import android.app.Activity;
import android.os.Bundle;
import android.view.KeyEvent;
import android.webkit.WebView;


public class AboutActivity extends Activity {

WebView mWebView;

/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {

setContentView(R.layout.about_main);
super.onCreate(savedInstanceState);

WebView view = (WebView) findViewById(R.id.main);
view.setWebViewClient(new WebViewClient());
mWebView = (WebView) findViewById(R.id.main);
mWebView.setWebViewClient(new WebViewClient());
//view.getSettings().setJavaScriptEnabled(true);
view.loadUrl("file:///android_asset/manual/index.html");
mWebView.loadUrl("file:///android_asset/manual/index.html");
}
@Override
public boolean onKeyDown(int keyCode, KeyEvent event) {
if ((keyCode == KeyEvent.KEYCODE_BACK) && mWebView.canGoBack()) {
mWebView.goBack();
return true;
}
return super.onKeyDown(keyCode, event);
}

}
2 changes: 1 addition & 1 deletion src/com/geeksville/webkit/WebViewClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/
public class WebViewClient extends android.webkit.WebViewClient {
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url)
public boolean shouldOverrideUrlLoading(WebView view, String url)
{
view.loadUrl(url);
return true;
Expand Down

0 comments on commit 581270b

Please sign in to comment.