From b6ea9ee6fe6fc205f4f8be593ca993d594e8d504 Mon Sep 17 00:00:00 2001
From: Paul Jensen <pauljensen@google.com>
Date: Fri, 18 Jul 2014 12:27:23 -0400
Subject: [PATCH] Make back button work in CaptivePortalLogin app like a web
 browser.

Users will be using the app to navigate web pages like they are used to in
web browsers, so the back button should act similarly.  There also isn't
an in-app back button so this adds essentially necessary functionality.

bug:16397616
Change-Id: Idd73d4a048d79e56bf981a8f477336f00eaafc3b
---
 .../captiveportallogin/CaptivePortalLoginActivity.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java b/packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java
index 2c1db02d6e7dc..09525b2572c09 100644
--- 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();