AndroidNative2026/Haleon_All_Country
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
This commit is contained in:
Gagan290
2016-12-29 16:39:41 +05:30
parent 22e94b0e88
commit b014ae3315
3 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/MSL_AvailabilityActivity.java
+3
View File
@@ -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;
}
GSKMTOrange/src/main/java/cpm/com/gskmtorange/gsk_dailyentry/Stock_FacingActivity.java
+25
View File
@@ -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();
GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
+3 -2
View File
@@ -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" />