am ce4384aa: am d2cb9213: Merge "Make back button work in CaptivePortalLogin app like a web browser." into lmp-dev

* commit 'ce4384aa1aa4e94967f9a81ac740f2e435d1ba37': Make back button work in CaptivePortalLogin app like a web browser.
2014-07-18 17:40:43 +00:00
parent 59ac42915a 139d894741
commit 332bf0e2cd
1 changed files with 10 additions and 0 deletions
--- a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
+++ b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
@@ -96,6 +96,16 @@ public class CaptivePortalLoginActivity extends Activity {
        return true;
    }

+    @Override
+    public void onBackPressed() {
+        WebView myWebView = (WebView) findViewById(R.id.webview);
+        if (myWebView.canGoBack()) {
+            myWebView.goBack();
+        } else {
+            super.onBackPressed();
+        }
+    }
+
    @Override
    public boolean onOptionsItemSelected(MenuItem item) {
        int id = item.getItemId();