Bug 1017276 - Do not close editing mode during animation. r=lucasr

mobile/android/base/toolbar/BrowserToolbar.java

@@ -377,10 +377,14 @@ public class BrowserToolbar extends ThemedRelativeLayout
             editCancel.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL,
-                                          TelemetryContract.Method.ACTIONBAR,
-                                          getResources().getResourceEntryName(editCancel.getId()));
-                    cancelEdit();
+                    // If we exit editing mode during the animation,
+                    // we're put into an inconsistent state (bug 1017276).
+                    if (!isAnimatingEntry) {
+                        Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL,
+                                              TelemetryContract.Method.ACTIONBAR,
+                                              getResources().getResourceEntryName(editCancel.getId()));
+                        cancelEdit();
+                    }
                 }
             });
         }
@@ -407,7 +411,9 @@ public class BrowserToolbar extends ThemedRelativeLayout
     }
 
     public boolean onBackPressed() {
-        if (isEditing()) {
+        // If we exit editing mode during the animation,
+        // we're put into an inconsistent state (bug 1017276).
+        if (isEditing() && !isAnimatingEntry) {
             Telemetry.sendUIEvent(TelemetryContract.Event.CANCEL,
                                   TelemetryContract.Method.BACK);
             cancelEdit();