Merge "Undo gradle awared quickfix would be able to automatically trigger gradle sync" into studio-1.4-dev automerge: 438da09

automerge: 4ea4d02

* commit '4ea4d021da4c2613ff0e3463cfd92283dd31b408':
  Undo gradle awared quickfix would be able to automatically trigger gradle sync

2 files changed, 19 insertions, 1 deletions

diff --git a/android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java b/android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java
index d3722172a90..1cf67ec1a0f 100644
--- a/android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java
+++ b/android/src/com/android/tools/idea/quickfix/AddGradleProjectDependencyFix.java
@@ -168,6 +168,7 @@ public class AddGradleProjectDependencyFix extends GradleDependencyFix {
               @Override
               public void run() {
                 addDependency(myCurrentModule, module, test);
+                registerUndoAction(project);
                 gradleSyncAndImportClass(module, editor, myReference, new Function<Void, List<PsiClass>>() {
                   @Override
                   public List<PsiClass> apply(@Nullable Void input) {
diff --git a/android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java b/android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java
index a360b3b3723..9da2bca82d1 100644
--- a/android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java
+++ b/android/src/com/android/tools/idea/quickfix/GradleDependencyFix.java
@@ -31,6 +31,9 @@ import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
 import com.intellij.openapi.editor.Editor;
+import com.intellij.openapi.command.undo.BasicUndoableAction;
+import com.intellij.openapi.command.undo.UndoManager;
+import com.intellij.openapi.command.undo.UnexpectedUndoException;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.Project;
@@ -120,4 +123,18 @@ abstract class GradleDependencyFix implements IntentionAction, LocalQuickFix, Hi
       }
     });
   }
-}
\ No newline at end of file
+
+  protected static void registerUndoAction(@NotNull final Project project) {
+    UndoManager.getInstance(project).undoableActionPerformed(new BasicUndoableAction() {
+      @Override
+      public void undo() throws UnexpectedUndoException {
+        GradleProjectImporter.getInstance().requestProjectSync(project, false, null);
+      }
+
+      @Override
+      public void redo() throws UnexpectedUndoException {
+        GradleProjectImporter.getInstance().requestProjectSync(project, false, null);
+      }
+    });
+  }
+}