From f18ecfd87ba2dcad68d9d08b5966e8ec36904864 Mon Sep 17 00:00:00 2001
From: Alexander Lobas <Alexander.Lobas@jetbrains.com>
Date: Sun, 22 Apr 2012 22:02:43 +0400
Subject: [PATCH] GridLayout

---
 .../android/designer/icons/GridLayout.png     | Bin 0 -> 466 bytes
 .../designer/model/grid/RadGridLayout.java    |  51 ++++++++++++++++++
 .../model/grid/RadGridLayoutComponent.java    |  24 +++++++++
 .../designer/model/views-meta-model.xml       |  24 +++++++++
 4 files changed, 99 insertions(+)
 create mode 100644 plugins/android-designer/src/com/intellij/android/designer/icons/GridLayout.png
 create mode 100644 plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayout.java
 create mode 100644 plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayoutComponent.java

diff --git a/plugins/android-designer/src/com/intellij/android/designer/icons/GridLayout.png b/plugins/android-designer/src/com/intellij/android/designer/icons/GridLayout.png
new file mode 100644
index 0000000000000000000000000000000000000000..1aa4165754f3c89ff2b212d811d50af320cbefbb
GIT binary patch
literal 466
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Kw;
z@XqUVHb4>10*}aI1_o|n5N2eUHAey{$X?><>&kwcO^jL9q*YFF2~bEjGbEzKIX^cy
zHLnE7WngeFN=+<DO;IS%EXh!C_w)@&(Mx3qTBqsh;uvCadg<h|d50W$TG%_&7x`cC
zu)GjmX}hH8v}%)cvCb*ui&Hjz<7vNpR(^rk(d}oej(;;hw@AnP;rxpxXPHtXUnNc`
zD$m^>{Wng}>i?XprE~ZBt3N$-y86^42O%NHV{Ez+R>DfZ?{qS_o?u<(5;P%cQzV0G
z2aBn2f&bMY*QHvKD$gWr?w@5X+ud*9`1X7I?)%djKJ2^66RLWpwD;>T-bsf&P3H4<
zEqZZtf>UVdVnL@_{!A|qpHXJZlap7so6L9S^3x1E<JlZ6+>80rnA#7&tqD}<V`0d>
zZI>3XN36M2sW0ArM&x-GhA@5Y6E~wR6BF|OCR?h@YTVA4_U77Kxrn9{7bjIDJ(%ga
z;a+1j<M)e3nvSOh7Hc2mO)AmU7iZ9!_fL9$ueRCM-rn@46}h0$^mO%eS?83{1OUCI
BuT=m5

literal 0
HcmV?d00001

diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayout.java b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayout.java
new file mode 100644
index 000000000000..9ad9a94c2255
--- /dev/null
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayout.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.android.designer.model.grid;
+
+import com.intellij.android.designer.designSurface.TreeDropToOperation;
+import com.intellij.android.designer.model.RadViewLayoutWithData;
+import com.intellij.designer.componentTree.TreeEditOperation;
+import com.intellij.designer.designSurface.EditOperation;
+import com.intellij.designer.designSurface.OperationContext;
+import org.jetbrains.annotations.NotNull;
+
+/**
+ * @author Alexander Lobas
+ */
+public class RadGridLayout extends RadViewLayoutWithData {
+  private static final String[] LAYOUT_PARAMS = {"GridLayout_Layout", "ViewGroup_MarginLayout"};
+
+  @NotNull
+  @Override
+  public String[] getLayoutParams() {
+    return LAYOUT_PARAMS;
+  }
+
+  @Override
+  public EditOperation processChildOperation(OperationContext context) {
+    if (context.isCreate() || context.isPaste() || context.isAdd() || context.isMove()) {
+      if (context.isTree()) {
+        if (TreeEditOperation.isTarget(myContainer, context)) {
+          return new TreeDropToOperation(myContainer, context);
+        }
+        return null;
+      }
+      // XXX
+      return null;
+    }
+    return null;
+  }
+}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayoutComponent.java b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayoutComponent.java
new file mode 100644
index 000000000000..7cd3da281949
--- /dev/null
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/grid/RadGridLayoutComponent.java
@@ -0,0 +1,24 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.intellij.android.designer.model.grid;
+
+import com.intellij.android.designer.model.RadViewContainer;
+
+/**
+ * @author Alexander Lobas
+ */
+public class RadGridLayoutComponent extends RadViewContainer {
+}
\ No newline at end of file
diff --git a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
index c044e3abc922..e040f92995d9 100644
--- a/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
+++ b/plugins/android-designer/src/com/intellij/android/designer/model/views-meta-model.xml
@@ -1137,6 +1137,29 @@
     </creation>
   </meta>
 
+  <meta model="com.intellij.android.designer.model.grid.RadGridLayoutComponent"
+        layout="com.intellij.android.designer.model.grid.RadGridLayout"
+        class="android.widget.GridLayout"
+        tag="GridLayout">
+
+    <properties important="orientation rowCount columnCount"
+                top="rowCount columnCount orientation"
+                expert="layout:gravity.clip_vertical layout:gravity.clip_horizontal"
+        />
+
+    <palette title="GridLayout" icon="/com/intellij/android/designer/icons/GridLayout.png"
+             tooltip="A layout that places its children in a rectangular grid."/>
+
+    <creation>
+      <![CDATA[
+          <GridLayout
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent">
+          </GridLayout>
+      ]]>
+    </creation>
+  </meta>
+
   <!-- ================= Palette ================= -->
 
   <palette>
@@ -1200,6 +1223,7 @@
       <item tag="LinearLayout"/>
       <item tag="TableLayout"/>
       <item tag="TableRow"/>
+      <item tag="GridLayout"/>
     </group>
   </palette>