Bug 997996 - Make ToolbarComponent.dismissEditingMode use the cancel editing mode button. r=mcomella

mobile/android/base/tests/components/ToolbarComponent.java

@@ -86,6 +86,13 @@ public class ToolbarComponent extends BaseComponent {
         return (ImageButton) getToolbarView().findViewById(R.id.forward);
     }
 
+    /**
+     * Returns the View for the edit cancel button in the browser toolbar.
+     */
+    private ImageButton getEditCancelButton() {
+        return (ImageButton) getToolbarView().findViewById(R.id.edit_cancel);
+    }
+
     private CharSequence getTitle() {
         return getTitleHelper(true);
     }
@@ -145,6 +152,8 @@ public class ToolbarComponent extends BaseComponent {
     public ToolbarComponent dismissEditingMode() {
         assertIsEditing();
 
+        // Cancel Button not implemeneted in tablet.
+        if (DeviceHelper.isTablet()) {
             if (getUrlEditText().isInputMethodTarget()) {
                 // Drop the soft keyboard.
                 // TODO: Solo.hideSoftKeyboard() does not clear focus, causing unexpected
@@ -153,6 +162,9 @@ public class ToolbarComponent extends BaseComponent {
             }
 
             mSolo.goBack();
+        } else {
+            mSolo.clickOnView(getEditCancelButton());
+        }
 
         waitForNotEditing();