From 06655effa62439f31112a4f62b308aa49ddb8da2 Mon Sep 17 00:00:00 2001
From: JLo'w <Jean-Loup.Beaussart@polytech-lille.net>
Date: Thu, 5 May 2016 17:50:33 +0200
Subject: [PATCH] Le layout n'est pas réservé à l'API 21 et +

---
 PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml | 71 -----------------------------------------------------------------------
 PremiereActivite/app/src/main/res/layout/layout_commande.xml     | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 71 deletions(-)
 delete mode 100644 PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml
 create mode 100644 PremiereActivite/app/src/main/res/layout/layout_commande.xml

diff --git a/PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml b/PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml
deleted file mode 100644
index 57e5996..0000000
--- a/PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:baselineAligned="false"
-    android:weightSum="1"
-    android:nestedScrollingEnabled="true"
-    android:id="@+id/scrollView2">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <EditText
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:inputType="number"
-            android:ems="10"
-            android:id="@+id/commande_quantite"
-            android:editable="true"
-            android:elegantTextHeight="true"
-            android:enabled="true"
-            android:numeric="integer"
-            android:width="300dp"
-            android:hint="@string/quant"
-            android:textAlignment="center"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:height="150dp"
-            android:minHeight="50dp"
-            android:maxHeight="500dp"
-            android:minWidth="120dp" />
-
-        <EditText
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:inputType="numberDecimal"
-            android:ems="10"
-            android:id="@+id/commande_prix"
-            android:editable="true"
-            android:elegantTextHeight="true"
-            android:enabled="true"
-            android:numeric="decimal"
-            android:width="300dp"
-            android:hint="@string/prix"
-            android:textAlignment="center"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
-            android:height="80dp"
-            android:minHeight="50dp"
-            android:maxHeight="500dp"
-            android:minWidth="120dp"
-            android:textStyle="bold"/>
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/validate"
-            android:id="@+id/commande_validation"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="40dp"
-            android:width="180dp"
-            android:height="80dp"
-            android:onClick="valideCommande"
-            android:nestedScrollingEnabled="false"
-            android:enabled="true" />
-
-    </LinearLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_commande.xml b/PremiereActivite/app/src/main/res/layout/layout_commande.xml
new file mode 100644
index 0000000..57e5996
--- /dev/null
+++ b/PremiereActivite/app/src/main/res/layout/layout_commande.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical" android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:baselineAligned="false"
+    android:weightSum="1"
+    android:nestedScrollingEnabled="true"
+    android:id="@+id/scrollView2">
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:ems="10"
+            android:id="@+id/commande_quantite"
+            android:editable="true"
+            android:elegantTextHeight="true"
+            android:enabled="true"
+            android:numeric="integer"
+            android:width="300dp"
+            android:hint="@string/quant"
+            android:textAlignment="center"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp"
+            android:height="150dp"
+            android:minHeight="50dp"
+            android:maxHeight="500dp"
+            android:minWidth="120dp" />
+
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal"
+            android:ems="10"
+            android:id="@+id/commande_prix"
+            android:editable="true"
+            android:elegantTextHeight="true"
+            android:enabled="true"
+            android:numeric="decimal"
+            android:width="300dp"
+            android:hint="@string/prix"
+            android:textAlignment="center"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp"
+            android:height="80dp"
+            android:minHeight="50dp"
+            android:maxHeight="500dp"
+            android:minWidth="120dp"
+            android:textStyle="bold"/>
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/validate"
+            android:id="@+id/commande_validation"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="40dp"
+            android:width="180dp"
+            android:height="80dp"
+            android:onClick="valideCommande"
+            android:nestedScrollingEnabled="false"
+            android:enabled="true" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
--
libgit2 0.21.2