Merge branch 'master' into CategoryPictureNewAC

2017-02-22 15:29:14 +05:30
parent 22743480f6 3073fa2676
commit 812065fce4
8 changed files with 541 additions and 220 deletions
@@ -5,6 +5,8 @@
    android:background="@color/white"
    android:orientation="vertical">

+    <!--android:descendantFocusability="blocksDescendants"-->
+
    <android.support.v7.widget.CardView xmlns:card_view="http://schemas.android.com/apk/res-auto"
        android:id="@+id/card_view"
        android:layout_width="match_parent"