From a18d04ca5fb636de691e0a5dc9e6e3e337ed3128 Mon Sep 17 00:00:00 2001 From: Gagan290 Date: Tue, 10 Jan 2017 18:15:48 +0530 Subject: [PATCH] Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into GG_Update_Manifest # Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml --- .../src/main/res/layout/item_msl_availability_child.xml | 3 ++- GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml index 3970b89..48ccb95 100644 --- a/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml +++ b/GSKMTOrange/src/main/res/layout/item_msl_availability_child.xml @@ -23,7 +23,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:padding="5dp" + android:paddingLeft="5dp" + android:paddingRight="5dp" android:weightSum="5">