merge from tools_r9

Change-Id: If87bb7e1e0adfe107c1a26132d63f7d779a06a3b

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/api/IClientRulesEngine.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/api/IClientRulesEngine.java
index d6ff1bd..6a01e8a 100755 (executable)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/api/IClientRulesEngine.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/api/IClientRulesEngine.java
@@ -108,5 +108,15 @@ public interface IClientRulesEngine {
      */
     String displayReferenceInput(String currentValue);
 
+    /**
+     * Displays an input dialog where the user can enter an Android resource name of the
+     * given resource type ("id", "string", "drawable", and so on.)
+     *
+     * @param currentValue the current reference to select
+     * @param resourceTypeName resource type, such as "id", "string", and so on (never
+     *            null)
+     * @return the resource selected by the user, or null
+     */
+    String displayResourceInput(String resourceTypeName, String currentValue);
 }
 

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java
index 131bf7a..3674633 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/common/layout/BaseViewRule.java
@@ -186,7 +186,7 @@ public class BaseViewRule implements IViewRule {
                 } else if (fullActionId.equals(EDIT_TEXT_ID)) {
                     String oldText = node.getStringAttr(ANDROID_URI, ATTR_TEXT);
                     oldText = ensureValidString(oldText);
-                    String newText = mRulesEngine.displayReferenceInput(oldText);
+                    String newText = mRulesEngine.displayResourceInput("string", oldText); //$NON-NLS-1$
                     if (newText != null) {
                         node.editXml("Change text", new PropertySettingNodeHandler(ANDROID_URI,
                                 ATTR_TEXT, newText));
@@ -264,6 +264,20 @@ public class BaseViewRule implements IViewRule {
                         && IAttributeInfo.Format.REFERENCE.in(attributeInfo.getFormats())) {
                     return mRulesEngine.displayReferenceInput(oldValue);
                 } else {
+                    // A single resource type? If so use a resource chooser initialized
+                    // to this specific type
+                    /* This does not work well, because the metadata is a bit misleading:
+                     * for example a Button's "text" property and a Button's "onClick" property
+                     * both claim to be of type [string], but @string/ is NOT valid for
+                     * onClick..
+                    if (attributeInfo != null && attributeInfo.getFormats().length == 1) {
+                        // Resource chooser
+                        Format format = attributeInfo.getFormats()[0];
+                        return mRulesEngine.displayResourceInput(format.name(), oldValue);
+                    }
+                    */
+
+                    // Fallback: just edit the raw XML string
                     String message = String.format("New %1$s Value:", attribute);
                     return mRulesEngine.displayInput(message, oldValue, null);
                 }

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java
index 03a446a..7d32f78 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gle2/PlayAnimationMenu.java
@@ -51,7 +51,7 @@ import java.util.List;
  * "Play Animation" context menu which lists available animations in the project and in
  * the framework, as well as a "Create Animation" shortcut, and allows the animation to be
  * run on the selection
- * <p>
+ * <p/>
  * TODO: Add transport controls for play/rewind/pause/loop, and (if possible) scrubbing
  */
 public class PlayAnimationMenu extends SubmenuAction {

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java
index 24366da..2bcc32f 100755 (executable)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/gre/RulesEngine.java
@@ -36,11 +36,13 @@ import com.android.ide.eclipse.adt.internal.editors.layout.gle2.GraphicalEditorP
 import com.android.ide.eclipse.adt.internal.editors.layout.gle2.SimpleElement;
 import com.android.ide.eclipse.adt.internal.editors.layout.uimodel.UiViewElementNode;
 import com.android.ide.eclipse.adt.internal.resources.IResourceRepository;
+import com.android.ide.eclipse.adt.internal.resources.ResourceType;
 import com.android.ide.eclipse.adt.internal.resources.manager.ResourceManager;
 import com.android.ide.eclipse.adt.internal.sdk.AndroidTargetData;
 import com.android.ide.eclipse.adt.internal.sdk.ProjectState;
 import com.android.ide.eclipse.adt.internal.sdk.Sdk;
 import com.android.ide.eclipse.adt.internal.ui.ReferenceChooserDialog;
+import com.android.ide.eclipse.adt.internal.ui.ResourceChooser;
 import com.android.sdklib.IAndroidTarget;
 import com.android.sdklib.internal.project.ProjectProperties;
 
@@ -816,5 +818,36 @@ public class RulesEngine {
 
             return null;
         }
+
+        public String displayResourceInput(String resourceTypeName, String currentValue) {
+            AndroidXmlEditor editor = mEditor.getLayoutEditor();
+            IProject project = editor.getProject();
+            ResourceType type = ResourceType.valueOf(resourceTypeName.toUpperCase());
+            if (project != null) {
+                // get the resource repository for this project and the system resources.
+                IResourceRepository projectRepository = ResourceManager.getInstance()
+                        .getProjectResources(project);
+                Shell shell = AdtPlugin.getDisplay().getActiveShell();
+                if (shell == null) {
+                    return null;
+                }
+
+                AndroidTargetData data = editor.getTargetData();
+                IResourceRepository systemRepository = data.getSystemResources();
+
+                // open a resource chooser dialog for specified resource type.
+                ResourceChooser dlg = new ResourceChooser(project, type, projectRepository,
+                        systemRepository, shell);
+
+                dlg.setCurrentResource(currentValue);
+
+                if (dlg.open() == Window.OK) {
+                    return dlg.getCurrentResource();
+                }
+            }
+
+            return null;
+        }
+
     }
 }

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
index b3f34aa..b8162b6 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/wizards/newxmlfile/NewXmlFileCreationPage.java
@@ -728,8 +728,8 @@ class NewXmlFileCreationPage extends WizardPage {
      * <li>The project name, valid if it's an android nature.</li>
      * <li>The current folder, valid if it's a folder under /res</li>
      * <li>An existing filename, in which case the user will be asked whether to override it.</li>
-     * <ul>
-     * <p>
+     * </ul>
+     * <p/>
      * The selection can also be set to a {@link Pair} of {@link IProject} and a workspace
      * resource path (where the resource path does not have to exist yet, such as res/anim/).
      *

diff --git a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java
index 4cdbad0..21e4597 100644 (file)
--- a/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java
+++ b/eclipse/plugins/com.android.ide.eclipse.tests/unittests/com/android/ide/common/layout/LayoutTestBase.java
@@ -234,6 +234,10 @@ public abstract class LayoutTestBase extends TestCase {
             return null;
         }
 
+        public String displayResourceInput(String resourceTypeName, String currentValue) {
+            fail("Not supported in tests yet");
+            return null;
+        }
     }
 
     public void testDummy() {

diff --git a/traceview/.classpath b/traceview/.classpath
index e71cb61..400289f 100644 (file)
--- a/traceview/.classpath
+++ b/traceview/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" path="src"/>
+       <classpathentry excluding="resources/" kind="src" path="src"/>
+       <classpathentry kind="src" path="src/resources"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
        <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANDROID_SWT"/>
        <classpathentry combineaccessrules="false" kind="src" path="/SdkStatsService"/>