issue #842, #843 y #844 closed

android/Pictogram/commonlibrary/src/main/java/com/yottacode/net/RestapiWrapper.java

@@ -175,7 +175,7 @@ public class RestapiWrapper {
         }
         url = new URL(surl);
         HttpURLConnection urlConnection = null;
-        urlConnection = (HttpsURLConnection) url.openConnection();
+        urlConnection = (HttpURLConnection) url.openConnection();
         urlConnection.setReadTimeout(TIME_OUT);
         urlConnection.setConnectTimeout(TIME_OUT);
         urlConnection.setRequestMethod("GET");

android/Pictogram/commonlibrary/src/main/java/com/yottacode/pictogram/dao/PCBDBHelper.java

@@ -212,7 +212,7 @@ public class PCBDBHelper extends SQLiteOpenHelper {
         ContentValues values=new ContentValues(5);
         values.put("id_stu", id_stu);
         for (Picto picto : vocabulary) {
-            Log.e(LOG_TAG,"inserting "+picto.get_id()+":"+picto.get_translation()+":"+picto.get_json_attrs());
+            //Log.e(LOG_TAG,"inserting "+picto.get_id()+":"+picto.get_translation()+":"+picto.get_json_attrs());
                 newsize++;
                 values.put("id_picto", picto.get_id());
                 values.put("url", picto.get_url());

android/Pictogram/commonlibrary/src/main/java/com/yottacode/tools/WordTools.java

+package com.yottacode.tools;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+
+public class WordTools {
+
+    private static final String LOG_TAG = WordTools.class.getCanonicalName();
+    String[][] conversiones = {
+            {"ch", "@"},{"ll", "#"},{"gue", "%e"},{"gué", "%é"},{"gui", "%i"},{"guí", "%í"},
+            {"qu", "&"},{"rr", "$"},{"ya","|a"},{"ye","|e"},{"yi","|i"},{"yo","|o"},{"yu","|u"}
+        };
+        char[] abiertas = {'a', 'á', 'e', 'é', 'o', 'ó'};
+        char[] cerradas = {'i', 'u', 'ü', 'y'};
+        char[] cerradas_tilde = {'í', 'ú'};
+        public Pattern patron_tilde = Pattern.compile(".*(á|é|í|ó|ú).*");
+        Pattern patron_vocal_n_s = Pattern.compile(".*(á|é|í|ó|ú|a|e|i|o|u|n|s)");
+        char enye = 'ñ';
+
+        public char[] getVocales() {
+            int size = abiertas.length+cerradas.length+cerradas_tilde.length;
+            char[] vocales = new char[size];
+            int i = 0;
+            for(int j = 0; j<abiertas.length; j++) {
+                vocales[i]=abiertas[j];
+                i++;
+            }
+            for(int j = 0; j<cerradas.length; j++) {
+                vocales[i]=cerradas[j];
+                i++;
+            }
+            for(int j = 0; j<cerradas_tilde.length; j++) {
+                vocales[i]=cerradas_tilde[j];
+                i++;
+            }
+            return vocales;
+        }
+
+        public char[] getTierrasRaras() {
+            int size = getVocales().length+1;
+            char[] raras = new char[size];
+            for(int i = 0; i<getVocales().length; i++) {
+                raras[i]=abiertas[i];
+            }
+            raras[size]=enye;
+            return raras;
+        }
+
+        public Pattern getPattern()
+        {
+            StringBuffer regex = new StringBuffer(getTierrasRaras()[0]);
+            for (int i=1; i<getTierrasRaras().length; i++) {
+                regex.append("|").append(getTierrasRaras()[i]);
+            }
+            return Pattern.compile(regex.toString());
+        }
+
+        /**
+         * Devuelve una colección de sílabas representando la palabra <code>w</code>.
+         */
+        public ArrayList<String> silabear(String w)
+        {
+            w = format(w);
+            int corte;
+            String silaba;
+            ArrayList<String> silabas = new ArrayList<String>();
+            while(w.length()>0)
+            {
+                corte = next_s(w)+1;
+                silaba = unformat( w.substring(0,corte) );
+                w = w.substring(corte);
+                silabas.add(silaba);
+            }
+            return silabas;
+        }
+        public ArrayList<StringBuffer> getLines(String expresion, int max_len) {
+            ArrayList<String> silabas=silabear(expresion);
+            ArrayList<StringBuffer> lines=new ArrayList<>(2);
+            StringBuffer line=new StringBuffer(max_len);
+            for (String silaba: silabas) {
+                if (line.length() + silaba.length() > max_len) {
+                    lines.add(line);
+                    line = new StringBuffer(max_len);
+                }
+                line.append(silaba);
+            }
+            lines.add(line);
+            return lines;
+        }
+
+
+        public int next_s(String w)
+        {
+            int hacheIntercalada = 0;
+            char[] a = w.toCharArray();
+
+            // excepción: subrayar
+            if (a[0]=='s' && a[1]=='u' && a[2]=='b' && a[3]=='r') return 2;
+
+            int vocal=0;
+            boolean found=false;
+            while (vocal<a.length && !found) {
+                found = esVocal(a[vocal]);
+                if (!found) vocal++;
+            }
+
+            // sabemos que todas las letras anteriores a vocal + vocal forman parte de la sílaba, veamos las siguientes
+
+            // vocal es la última vocal de la palabra: no hay más sílabas
+            if (ultimaVocal(vocal, a)) return w.length()-1;
+
+            int l1 = vocal+1;
+            if (a[l1]=='h') {
+                l1++;
+                hacheIntercalada = 1;
+            }
+
+            // l1 es la última letra
+            if (l1+1==a.length)
+            {
+                if (esVocal(a[l1]) && isHiato(a[vocal], a[l1])) return vocal;
+                else return l1+hacheIntercalada;
+            }
+
+            int l2 = l1+1;
+            if (a[l2]=='h') {
+                l2++;
+                hacheIntercalada = 1;
+            }
+            if (esConsonante(a[l1]) && esVocal(a[l2])) // VCV
+            {
+                return vocal;
+            }
+            else if (esConsonante(a[l1]) && esConsonante(a[l2])) // VCC
+            {
+                String[] cc = {"tr","gr","pr","br","bl","fr","fl","cl","dr","pl"};
+                char[] tokenchar = {a[l1], a[l2]};
+                String token = new String(tokenchar).toLowerCase();
+                for (String s: cc) {
+                    if (s.equals(token)) return vocal;
+                }
+                if ("ns".equals(token))
+                {
+                    if (a.length>l2+1 && esConsonante(a[l2+1])) return l2; // caso traNSporte
+                }
+                return l1+hacheIntercalada; // baRCo
+            }
+            else if (esVocal(a[l1])) // VV?
+            {
+                if (isHiato(a[vocal], a[l1])) return vocal+hacheIntercalada;
+                else return vocal+next_s(w.substring(l1))+1+hacheIntercalada;
+            }
+            return 0;
+        }
+
+        public boolean ultimaVocal(int vocal, char[] a)
+        {
+            for (int i=vocal+1; i<a.length; i++)
+            {
+                if (esVocal(a[i]))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+
+        public boolean isHiato(char v1, char v2)
+        {
+            // si una de ellas es cerrada y lleva tilde
+            for (char c: cerradas_tilde) {
+                if (c==v1 || c==v2) return true;
+            }
+            // si las dos son abiertas
+            for (char c1: abiertas) {
+                if (c1==v1) {
+                    for (char c2: abiertas) {
+                        if (c2==v2) return true;
+                    }
+                }
+            }
+            // si son iguales (aa, ii)
+            return (v1==v2);
+        }
+
+        public boolean esVocal(Character l) {
+            for (char c: getVocales()) {
+                if (Character.toLowerCase(l)==c) return true;
+            }
+            return false;
+        }
+        public boolean esConsonante(char l) {
+            return (!esVocal(l));
+        }
+
+        public String format(String w)
+        {
+            if (w==null) w = "";
+            for (int i=0; i<conversiones.length; i++) {
+                w = w.replace(conversiones[i][0], conversiones[i][1]);
+            }
+            // caso cacahuete, la h intercalada sí dividide sílaba
+            if (w.startsWith("cacah")) w = w.replace("h", "¬");
+            return w;
+        }
+        public String unformat(String w)
+        {
+            if (w==null) w = "";
+            for (int i=0; i<conversiones.length; i++) {
+                w = w.replace(conversiones[i][1], conversiones[i][0]);
+            }
+            // caso cacahuete, la h intercalada sí dividide sílaba
+            w = w.replace("¬", "h");
+            return w;
+        }
+
+        /**
+         * Devuelve la tónica de un array de sílabas.
+         * @param silabas
+         * @return índice de la sílaba tónica
+         */
+        public int tonica(List<String> silabas)
+        {
+            if (silabas.size()==1) return 0;
+
+            int ret = -1;
+            // si una sílaba tiene tilde, esa es la tónica
+            for(int i=0; i<silabas.size(); i++) {
+                if (patron_tilde.matcher(silabas.get(i)).matches()) return i;
+            }
+
+            if (ret != -1) return ret;
+
+            // sólo puede ser aguda o llana
+            String ultima = silabas.get(silabas.size()-1);
+            if (patron_vocal_n_s.matcher(ultima).matches()) return silabas.size()-2; // llana
+            else return silabas.size()-1; // aguda
+        }
+
+        /**
+         * De una sílaba devuelve la posición de la vocal tónica:
+         * mía -> 1 (í)
+         * mia -> 2 (a)
+         */
+        public int vocalTonica(String silaba)
+        {
+            char[] letras = silaba.toLowerCase().toCharArray();
+            int ret = -1, j  = 0;
+            Pattern patron_vocales_todas = Pattern.compile("a|e|i|o|u|á|é|í|ó|ú");
+            Pattern patron_vocales_acentuadas = Pattern.compile("á|é|í|ó|ú");
+            Pattern patron_vocales_abiertas = Pattern.compile("a|á|e|é|o|ó");
+
+            // si hay sólo una vocal, es ésa: mas
+            for(int i=0; i<letras.length; i++) {
+                StringBuffer sb = new StringBuffer();
+                sb.append(letras[i]);
+                if (patron_vocales_todas.matcher(sb).matches())
+                {
+                    j++;
+                    ret = i;
+                }
+            }
+            if (j==1) return ret;
+
+            // si hay una acentuada: día, aVIÓN
+            ret = -1;
+            for(int i=0; i<letras.length; i++) {
+                StringBuffer sb = new StringBuffer();
+                sb.append(letras[i]);
+                if (patron_vocales_acentuadas.matcher(sb).matches())
+                {
+                    ret = i;
+                }
+            }
+            if (ret != -1) return ret;
+
+            // si no, la abierta: MIERda
+            ret = -1;
+            for(int i=0; i<letras.length; i++) {
+                StringBuffer sb = new StringBuffer();
+                sb.append(letras[i]);
+                if (patron_vocales_abiertas.matcher(sb).matches())
+                {
+                    ret = i;
+                }
+            }
+            return ret;
+        }
+    }
+

android/Pictogram/commonlibrary/src/main/res/raw/pcbdb_create.sql

@@ -58,7 +58,7 @@ CREATE TABLE collection (
 id_stu            INTEGER NOT NULL REFERENCES student ON DELETE CASCADE,
 id_picto          INTEGER NOT NULL REFERENCES picto ON DELETE CASCADE,
 attributes	      VARCHAR(1024),
-constraint ck_collection UNIQUE(id_stu,id_picto)
+constraint ck_collection UNIQUE(id_stu,id_picto,attributes)
 )
 ;--
 

android/Pictogram/supervisor_tablet/supervisor_tablet.iml

@@ -43,6 +43,13 @@
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/DevFlavor/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/DevFlavor/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/assets" type="java-test-resource" />
@@ -51,13 +58,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/DevFlavor/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/DevFlavor/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/assets" type="java-resource" />
@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -106,14 +106,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -122,6 +114,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoAnimation.java

@@ -14,6 +14,7 @@ import android.widget.FrameLayout;
 import android.widget.GridView;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
+import android.widget.TextView;
 
 import com.yottacode.pictogram.tabletlibrary.R;
 import com.yottacode.pictogram.tools.PCBcontext;
@@ -121,12 +122,14 @@ public class PictoAnimation {
 
 
 
-    public  void animateImageView(final PictogramActivity activity, View view, final int position) {
+    public  void animateOnDeleteView(final PictogramActivity activity, View view, final int position) {
 
         if (activity.deleting) return;
-        View borderlayout=((RelativeLayout)view).getChildAt(0);
+         View borderlayout=((RelativeLayout)view).getChildAt(0);
 
         final ImageView v=((ImageView)((FrameLayout)borderlayout).getChildAt(0));
+        final TextView t1=((TextView)((FrameLayout)borderlayout).getChildAt(1));
+        final TextView t2=((TextView)((FrameLayout)borderlayout).getChildAt(2));
 
 
         final int orange = ContextCompat.getColor(PCBcontext.getContext(),R.color.red);
@@ -136,14 +139,19 @@ public class PictoAnimation {
             @Override
             public void onAnimationUpdate(ValueAnimator animation) {
                 float mul = (Float) animation.getAnimatedValue();
-                int alphaOrange = PictoAnimation.adjustAlpha(orange, mul);
-                v.setColorFilter(alphaOrange, PorterDuff.Mode.SRC_ATOP);
-                v.setBackgroundColor(alphaOrange);
-                v.setPadding(0,0,0,0);
-                if (mul == 0.0) {
-                    v.setColorFilter(0);
+                if (t2.getVisibility()==View.VISIBLE)    {
+                    t2.setAlpha(1-mul);
+                    mul=1;
                 }
-
+                    int alphaOrange = PictoAnimation.adjustAlpha(orange, mul);
+                    v.setColorFilter(alphaOrange, PorterDuff.Mode.SRC_ATOP);
+                    v.setBackgroundColor(alphaOrange);
+                    v.setPadding(0,0,0,0);
+                    if (mul == 0.0) {
+                        v.setColorFilter(0);
+                    }
+
+                if (t1.getVisibility()==View.VISIBLE)    t1.setAlpha(1-mul);
             }
         });
 
@@ -151,6 +159,7 @@ public class PictoAnimation {
 
             @Override
             public void onAnimationStart(Animator animation) {
+                if (t2.getVisibility()==View.VISIBLE)   v.setBackgroundColor(0);
                 activity.deleting=true;
             }
 
@@ -158,8 +167,12 @@ public class PictoAnimation {
             public void onAnimationEnd(Animator animation) {
                 activity.tapeAdapter.deleteItem(position);
                 activity.tapeAdapter.notifyDataSetChanged();
+                if (t1.getVisibility()==View.VISIBLE)    t1.setAlpha(1);
+                if (t2.getVisibility()==View.VISIBLE)    t2.setAlpha(1);
+
                 v.setColorFilter(0);
-                v.setBackgroundColor(ContextCompat.getColor(PCBcontext.getContext(),R.color.picto_default_background));
+                v.setBackgroundColor(ContextCompat.getColor(PCBcontext.getContext(), R.color.picto_default_background));
+
                 activity.deleting=false;
                 if (activity.tapeAdapter.getCount()==0 && activity.tape_delivered) {
                     activity.showOnlyTape(false);

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictoItemViewGenerator.java

@@ -5,13 +5,10 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
-import android.graphics.PorterDuff;
-import android.util.TypedValue;
 import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.view.WindowManager;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
 import android.widget.RelativeLayout;
@@ -20,10 +17,10 @@ import android.widget.TextView;
 import com.yottacode.pictogram.dao.Picto;
 import com.yottacode.pictogram.tabletlibrary.R;
 import com.yottacode.pictogram.tools.PCBcontext;
-
-import org.w3c.dom.Text;
+import com.yottacode.tools.WordTools;
 
 import java.io.IOException;
+import java.util.ArrayList;
 
 /**
  * This class is used for generating PictoViews which will be inserted inside a picto grid
@@ -32,6 +29,7 @@ import java.io.IOException;
 public class PictoItemViewGenerator {
     public static final int LAYOUT = R.layout.picto_grid_item;
     public static final int LAYOUT_BIG = R.layout.picto_grid_item_big;
+    private static final byte MAX_LINE_LENGTH = 7;
     public static  int mirror_color=0;
 
 
@@ -40,63 +38,25 @@ public class PictoItemViewGenerator {
      * @param picto Pictogram to set the legend text
      * @return the text modified
      */
-    private static String format_legend(Picto picto) {
+    private static String format_legend(Picto picto, int maxlength) {
         String texto=picto.get_translation().toUpperCase();
-        String[] words = texto.split(" ");
-
-        StringBuffer txt = new StringBuffer();
-
-        if(picto.get_legend().equals("full")){
-            /**TODO: Codigo para cortar las palabras si superan 6 caracteres */
-                /*for (int i = 0; i < words.length; i++) {
-                    if (words[i].length() >= 6) {
-                        int mitad = words[i].length()/2 - 1;
-                        char r = words[i].charAt(mitad);
-                        char r2 = words[i].charAt(mitad + 1);
-
-
-                        while ((r2 == 'A' || r2 == 'E' || r2 == 'I' || r2 == 'O' || r2 == 'U') && (r != 'A' || r != 'E' || r != 'I' || r != 'O' || r != 'U')) {
-                            mitad++;
-                            r = words[i].charAt(mitad);
-                            r2 = words[i].charAt(mitad + 1);
-                        }
-                        int index = 0;
-                        while (index <= mitad) {
-                            txt.append(words[i].charAt(index));
-                            index++;
-                        }
-                        int diff = 6 - mitad;
-                        diff -= 1;
-                        txt.append("-");
-                        while (diff != 6) {
-                            txt.append(" ");
-                            diff++;
-                        }
-
-                        while (index < words[i].length()) {
-                            txt.append(words[i].charAt(index));
-                            index++;
-                        }
-                        texto = txt.toString();
-                    }else{
-                        texto += "\n"+words[i];
-                    }
-                }*/
-                    return texto;
-        }else{
-            if (words.length == 1) {
-                if (words[0].length() >= 11) {
-                    texto = "";
-                    for(int i = 0 ; i<words[0].length();i++){
-                        texto += words[0].charAt(i);
-                        if(i==10) break;
-                    }
-                }
-            }else{
-                texto = words[0];
+        WordTools wordTools=new WordTools();
+        if (texto.length()>maxlength) {
+            String[] words = texto.split(" ");
+            texto="";
+            for (String word: words) {
+                ArrayList<StringBuffer> separated_word=wordTools.getLines(word,maxlength);
+                StringBuffer last_word=separated_word.get(separated_word.size()-1);
+                separated_word.remove(separated_word.get(separated_word.size()-1));
+                    for (StringBuffer line: separated_word)
+                        texto+=line+"-\n";
+                    texto+=last_word+"\n";
             }
+            texto=texto.substring(0,texto.length()-1);
         }
         return texto;
+
+
     }
 
     /**
@@ -111,7 +71,7 @@ public class PictoItemViewGenerator {
             int width = bitmap.getWidth(); //Ancho original
             int height =  bitmap.getHeight(); //Alto original
 
-            String texto = format_legend(picto);
+            String texto = format_legend(picto,MAX_LINE_LENGTH);
             /*if(picto.get_legend().equals("normal")) {  //Normal legend
 
                 android.graphics.Bitmap.Config bitmapConfig = bitmap.getConfig();
@@ -222,8 +182,8 @@ public class PictoItemViewGenerator {
           legend.setVisibility(View.GONE);
           legend_full.setVisibility(View.GONE);
       } else {
-          legend.setText(format_legend(picto));
-          legend_full.setText(format_legend(picto));
+          legend.setText(format_legend(picto,MAX_LINE_LENGTH+2));
+          legend_full.setText(format_legend(picto,MAX_LINE_LENGTH));
 
           if (!picto.is_invisible()) {
               layoutWrapper.setAlpha(1.00f);

android/Pictogram/tabletlibrary/src/main/java/com/yottacode/pictogram/tabletlibrary/gui/communicator/PictogramActivity.java

@@ -212,7 +212,7 @@ public class PictogramActivity extends Activity implements VocabularyTalk.iVocab
             public void onItemClick(AdapterView<?> parent, View view,  int position, long id) {
                 if (!deleting) {
                     Log.i(PictogramActivity.class.getCanonicalName(), " Deleting item " + position + "-" + id + "(" + PictogramActivity.this.tapeAdapter.getItem(position).get_translation() + ")");
-                    new PictoAnimation().animateImageView(PictogramActivity.this,view, position);
+                    new PictoAnimation().animateOnDeleteView(PictogramActivity.this,view, position);
                     PictogramActivity.this.tapeAdapter.notifyDataSetChanged();
                     PCBcontext.getActionLog().log(new TalkAction(TalkAction.DELETE, PictogramActivity.this.tapeAdapter.getItem(position)));
                 }

android/Pictogram/tabletlibrary/src/main/res/layout/picto_grid_item_big.xml

@@ -20,7 +20,6 @@
             android:layout_height="match_parent" />
 
         <TextView
-            android:text="Legend"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/legend_text_big"
@@ -32,11 +31,10 @@
             android:background="@android:color/white" />
 
         <TextView
-            android:text="Legend"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:id="@+id/legend_text_big_full"
-
+            android:textSize="20sp"
             android:textColor="@android:color/black"
             android:textAlignment="center"
             android:gravity="center"

android/Pictogram/tabletlibrary/tabletlibrary.iml

@@ -73,14 +73,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -89,6 +81,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

android/Pictogram/watch/watch.iml

@@ -66,14 +66,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/DefaultFlavor/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/assets" type="java-test-resource" />
@@ -82,6 +74,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/testDefaultFlavor/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDefaultFlavor/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -106,14 +106,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -122,6 +114,15 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
@@ -134,10 +135,14 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.google.android.support/wearable/2.0.0-alpha2/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
       <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>

android/Pictogram/yotta_tablet/yotta_tablet.iml

@@ -8,12 +8,12 @@
     </facet>
     <facet type="android" name="Android">
       <configuration>
-        <option name="SELECTED_BUILD_VARIANT" value="PreFlavorDebug" />
+        <option name="SELECTED_BUILD_VARIANT" value="DevFlavorDebug" />
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
-        <option name="ASSEMBLE_TASK_NAME" value="assemblePreFlavorDebug" />
-        <option name="COMPILE_JAVA_TASK_NAME" value="compilePreFlavorDebugSources" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDevFlavorDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDevFlavorDebugSources" />
         <afterSyncTasks>
-          <task>generatePreFlavorDebugSources</task>
+          <task>generateDevFlavorDebugSources</task>
         </afterSyncTasks>
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -24,64 +24,64 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="false">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/PreFlavor/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/PreFlavor/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/classes/DevFlavor/debug" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/DevFlavor/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/PreFlavor/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/PreFlavor/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/PreFlavor/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/PreFlavor/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/PreFlavor/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/PreFlavor/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/PreFlavor/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavorDebug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/PreFlavor/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/PreFlavor/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/PreFlavor/debug" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavorDebug/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/assets" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/PreFlavor/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTestPreFlavor/shaders" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testPreFlavor/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/DevFlavor/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/DevFlavor/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/DevFlavor/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/DevFlavor/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/DevFlavor/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/DevFlavor/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/DevFlavor/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavorDebug/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavorDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/DevFlavor/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/DevFlavor/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/DevFlavor/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/assets" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/DevFlavor/shaders" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTestDevFlavor/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDevFlavor/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
@@ -106,14 +106,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -122,6 +114,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />