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"
@@ -275,7 +275,15 @@

    <!--Stock Facing Planogram Tracker-->
    <string name="stock_planogram_data_uploading">Stock Planogram Data Uploading</string>
+
    <string name="daily_data_menu_category_picture">Category Pictures</string>
    <string name="title_activity_category_picture">CategoryPicture</string>

+    <string name="stock_planogram_data_noCamera_data">Please fill the no camera data</string>
+    <string name="stock_planogram_shelf">Shelf </string>
+    <string name="stock_planogram_shelf_position"> Position </string>
+    <string name="stock_planogram_already_exists">is already exists</string>
+    <string name="stock_planogram_data_select_one_sku">Please select atleast one sku</string>
+    <string name="stock_planogram_data_add_shelf">Add sku, shelf can not be empty</string>
+
 </resources>