From b014ae331515d454f0fac46ec065575ac132afac Mon Sep 17 00:00:00 2001
From: Gagan290 <gagan290@gmail.com>
Date: Thu, 29 Dec 2016 16:39:41 +0530
Subject: [PATCH] Merge branch 'master' of
 https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into
 Category_G

# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
---
 .../MSL_AvailabilityActivity.java             |  3 +++
 .../gsk_dailyentry/Stock_FacingActivity.java  | 25 +++++++++++++++++++
 .../res/layout/item_stock_facing_header.xml   |  5 ++--
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
index 18a3bcb..abc3613 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
@@ -314,6 +314,9 @@ public class MSL_AvailabilityActivity extends AppCompatActivity {
             holder.txt_skuName.setText(childData.getBrandName());
             holder.ed_mbq.setText(childData.getMbq());
 
+            holder.toggle_available.setTextOff("No");
+            holder.toggle_available.setTextOn("Yes");
+
             return convertView;
         }
 
diff --git a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
index 853c01c..478891c 100644
--- a/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+++ b/GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
@@ -2,9 +2,12 @@ package cpm.com.gskmtorange.gsk_dailyentry;
 
 import android.content.Context;
 import android.content.Intent;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
 import android.graphics.Typeface;
 import android.net.Uri;
 import android.os.Bundle;
+import android.os.Environment;
 import android.provider.MediaStore;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.Snackbar;
@@ -73,6 +76,8 @@ public class Stock_FacingActivity extends AppCompatActivity {
 
         prepareList();
 
+        str = Environment.getExternalStorageState();
+
         FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
         fab.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -270,6 +275,7 @@ public class Stock_FacingActivity extends AppCompatActivity {
                 }
             }
 
+
             /*if (headerTitle.getImg_cam().equals("")) {
                 img_camera1.setBackgroundResource(R.drawable.ic_menu_camera);
             } else {
@@ -381,9 +387,28 @@ public class Stock_FacingActivity extends AppCompatActivity {
             File file = new File(path);
             Uri outputFileUri = Uri.fromFile(file);
 
+            /*String defaultCameraPackage = "";
+            final PackageManager packageManager = getPackageManager();
+            List<ApplicationInfo> list = packageManager.getInstalledApplications(PackageManager.GET_UNINSTALLED_PACKAGES);
+
+            for (int n = 0; n < list.size(); n++) {
+                if ((list.get(n).flags & ApplicationInfo.FLAG_SYSTEM) == 1) {
+//                    Log.d("TAG", "Installed Applications  : " + list.get(n).loadLabel(packageManager).toString());
+//                    Log.d("TAG", "package name  : " + list.get(n).packageName);
+                    if (list.get(n).loadLabel(packageManager).toString().equalsIgnoreCase("Camera")) {
+                        defaultCameraPackage = list.get(n).packageName;
+                        break;
+                    }
+                }
+            }
+
             Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
             intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
+            intent.setPackage(defaultCameraPackage);
+            startActivityForResult(intent, position);*/
 
+            Intent intent = new Intent(android.provider.MediaStore.ACTION_IMAGE_CAPTURE);
+            intent.putExtra(MediaStore.EXTRA_OUTPUT, outputFileUri);
             startActivityForResult(intent, position);
         } catch (Exception e) {
             e.printStackTrace();
diff --git a/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml b/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
index fd33a8a..0f749ac 100644
--- a/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
+++ b/GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
@@ -25,14 +25,15 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:gravity="center_vertical"
-                android:orientation="vertical">
+                android:orientation="vertical"
+                android:paddingRight="10dp">
 
                 <TextView
                     android:id="@+id/txt_stockFaceupHeader"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:paddingLeft="25dp"
-                    android:paddingRight="10dp"
+                    android:paddingRight="5dp"
                     android:text="Brand Name "
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="#222" />