ADT fix GLE configuration change.

SDK Bug: 6036506

Change-Id: I92f86940bf158ca8da8597a7f387d1f2595c0131

2 files changed, 4 insertions, 3 deletions

diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/common/CommonXmlEditor.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/common/CommonXmlEditor.java
index b9168ba..0790d6e 100755
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/common/CommonXmlEditor.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/common/CommonXmlEditor.java
@@ -271,7 +271,7 @@ public class CommonXmlEditor extends AndroidXmlEditor implements IShowEditorInpu
     }
 
     @Override
-    protected void setInputWithNotify(IEditorInput input) {
+    public void setInputWithNotify(IEditorInput input) {
         super.setInputWithNotify(input);
         if (mDelegate instanceof LayoutEditorDelegate) {
             ((LayoutEditorDelegate) mDelegate).setInputWithNotify(input);
diff --git a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditorDelegate.java b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditorDelegate.java
index 9883ff5..1c9ec1e 100644
--- a/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditorDelegate.java
+++ b/eclipse/plugins/com.android.ide.eclipse.adt/src/com/android/ide/eclipse/adt/internal/editors/layout/LayoutEditorDelegate.java
@@ -307,8 +307,9 @@ public class LayoutEditorDelegate extends CommonXmlDelegate
             getEditor().removePage(i);
         }
 
-        // set the current input.
-        setInputWithNotify(editorInput);
+        // set the current input. We're in the delegate, the input must
+        // be set into the actual editor instance.
+        getEditor().setInputWithNotify(editorInput);
 
         // re-create or reload the pages with the default page shown as the previous active page.
         getEditor().createAndroidPages();