From 9b4017e1e0df5af9eb8e1f33bfb9807c229fedff Mon Sep 17 00:00:00 2001
From: Carlo Abelli <carlo.abelli@gmail.com>
Date: Wed, 15 Aug 2018 00:06:27 -0400
Subject: [PATCH] Fix Android back button behavior

Pressing the back button should call mServoView.goBack if possible.
---
 .../main/java/com/mozilla/servo/MainActivity.java    | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java b/support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java
index 15a0d49e0c8..d17a0434679 100644
--- a/support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java
+++ b/support/android/apk/servoapp/src/main/java/com/mozilla/servo/MainActivity.java
@@ -37,7 +37,7 @@ public class MainActivity extends Activity implements Servo.Client {
     EditText mUrlField;
     ProgressBar mProgressBar;
     TextView mIdleText;
-
+    boolean mCanGoBack;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -52,6 +52,7 @@ public class MainActivity extends Activity implements Servo.Client {
         mUrlField = findViewById(R.id.urlfield);
         mProgressBar = findViewById(R.id.progressbar);
         mIdleText = findViewById(R.id.redrawing);
+        mCanGoBack = false;
 
         mBackButton.setEnabled(false);
         mFwdButton.setEnabled(false);
@@ -152,6 +153,7 @@ public class MainActivity extends Activity implements Servo.Client {
     public void onHistoryChanged(boolean canGoBack, boolean canGoForward) {
         mBackButton.setEnabled(canGoBack);
         mFwdButton.setEnabled(canGoForward);
+        mCanGoBack = canGoBack;
     }
 
     public void onRedrawing(boolean redrawing) {
@@ -173,4 +175,12 @@ public class MainActivity extends Activity implements Servo.Client {
         super.onResume();
     }
 
+    @Override
+    public void onBackPressed() {
+        if (mCanGoBack) {
+            mServoView.goBack();
+        } else {
+            super.onBackPressed();
+        }
+    }
 }