Merge branch 'develop' of http://scm.ujaen.es/softuno/pictogram into develop

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

@@ -43,6 +43,10 @@ public class PictoItemViewGenerator {
 
         StringBuffer txt = new StringBuffer();
 
+
+        if(picto.get_legend().equals("full")){
+                    return texto;
+        }else{
             if (words.length == 1) {
                 if (words[0].length() >= 11) {
                     texto = "";
@@ -83,6 +87,7 @@ public class PictoItemViewGenerator {
             }else{
                 texto = words[0];
             }
+        }
         return texto;
     }
 
@@ -146,11 +151,11 @@ public class PictoItemViewGenerator {
 
                 textView.layout(0, 0, 100, 100);
                 textView.setPadding(0, 0, 0, 0);
-                textView.setTextSize(TypedValue.COMPLEX_UNIT_PX, 13);
+                textView.setTextSize(PCBcontext.getPcbdb().getCurrentUser().is_picto_size_big() ? 13 : 11);
                 textView.setTextColor(Color.BLACK);
                 textView.setWidth(100);
                 textView.setGravity(Gravity.CENTER_HORIZONTAL);
-                textView.setMaxLines(2);
+                textView.setMaxLines(3);
                 textView.setText(texto);
                 textView.setDrawingCacheEnabled(true);
 
@@ -219,6 +224,7 @@ public class PictoItemViewGenerator {
                         legend.setVisibility(View.VISIBLE);
                     }else {
                         bm = set_legend(PCBcontext.getContext(), bm, picto);
+                        legend.setVisibility(View.GONE);
                     }
                 }else{
                     legend.setVisibility(View.GONE);