Merge branch 'develop' into fix/possible-blink-in-members-list

rocket-chat-android-widgets/src/main/java/chat/rocket/android/widget/message/MessageFormLayout.java

@@ -164,8 +164,8 @@ public class MessageFormLayout extends LinearLayout {
   }
 
   public void setEnabled(boolean enabled) {
-    getEditor().setEnabled(enabled);
-    composer.findViewById(R.id.button_send).setEnabled(enabled);
+    sendButton.setEnabled(enabled);
+    attachButton.setEnabled(enabled);
   }
 
   public void setEditTextCommitContentListener(

rocket-chat-android-widgets/src/main/res/layout/message_composer.xml

@@ -25,7 +25,7 @@
       app:layout_constraintRight_toLeftOf="@+id/container"
       app:layout_constraintBottom_toBottomOf="parent"/>
 
-    <android.support.constraint.ConstraintLayout
+    <FrameLayout
       android:id="@+id/container"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
@@ -53,5 +53,5 @@
           android:tint="@color/color_accent"
           app:srcCompat="@drawable/ic_send_black_24dp"
           android:background="?attr/selectableItemBackgroundBorderless"/>
-    </android.support.constraint.ConstraintLayout>
+    </FrameLayout>
 </android.support.constraint.ConstraintLayout>
\ No newline at end of file