diff --git a/app/src/main/java/com/slprojects/lab6android/MainActivity.java b/app/src/main/java/com/slprojects/lab6android/MainActivity.java
index fa1b522dc3d23ec69ab5ca242bc2a7ffb9835bd8..c83eaa78f744719d41c1cc12f37fb9bec266f36b 100644
--- a/app/src/main/java/com/slprojects/lab6android/MainActivity.java
+++ b/app/src/main/java/com/slprojects/lab6android/MainActivity.java
@@ -12,12 +12,14 @@ import android.util.TypedValue;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.GridLayout;
 import android.widget.TextView;
 
 public class MainActivity extends AppCompatActivity {
 
     private ConstraintLayout myLayout;
     private ConstraintSet set;
+    private TextView myTextView;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -44,7 +46,7 @@ public class MainActivity extends AppCompatActivity {
         myLayout.setBackgroundColor(Color.BLUE);
         myButton.setId(R.id.myButton);
 
-        TextView myTextView = new TextView(this);
+        myTextView = new TextView(this);
         myTextView.setId(R.id.myEditText);
         myTextView.setText("");
         myButton.setOnClickListener(new View.OnClickListener() {
@@ -103,6 +105,7 @@ public class MainActivity extends AppCompatActivity {
 
     private void exercice2(){
         // Exercice 2
+        // q1
         Button bottomRightBtn = new Button(this);
         bottomRightBtn.setText(getString(R.string.press_me));
         bottomRightBtn.setBackgroundColor(Color.RED);
@@ -121,5 +124,32 @@ public class MainActivity extends AppCompatActivity {
                 ConstraintSet.PARENT_ID, ConstraintSet.BOTTOM, 0);
 
         set.applyTo(myLayout);
+
+        // q2
+        GridLayout myGridLayout = new GridLayout(this);
+        myGridLayout.setColumnCount(3);
+
+        for (int i=0; i<10; i++){
+            Button b = new Button(this);
+            myGridLayout.addView(b);
+            b.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    myTextView.setText("Un btn de la grille a été pressé");
+                }
+            });
+        }
+
+        myLayout.addView(myGridLayout);
+
+        set.constrainHeight(myGridLayout.getId(),
+                ConstraintSet.WRAP_CONTENT);
+        set.constrainWidth(myGridLayout.getId(),
+                ConstraintSet.MATCH_CONSTRAINT);
+
+        set.connect(myGridLayout.getId(), ConstraintSet.LEFT,
+                ConstraintSet.PARENT_ID, ConstraintSet.LEFT, 0);
+        set.connect(myGridLayout.getId(), ConstraintSet.RIGHT,
+                ConstraintSet.PARENT_ID, ConstraintSet.RIGHT, 0);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/id.xml b/app/src/main/res/values/id.xml
index 5a89527b5c7c20c5beac36545c4596efdbd60721..be03f6e3e9cdb8244eb0e26aa8c2e59dfbf48207 100644
--- a/app/src/main/res/values/id.xml
+++ b/app/src/main/res/values/id.xml
@@ -3,4 +3,5 @@
     <item name="myButton" type="id" />
     <item name="myEditText" type="id" />
     <item name="bottomRightBtn" type="id" />
+    <item name="myGridLayout" type="id" />
 </resources>
\ No newline at end of file