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

Merge remote-tracking branch 'origin/GeoT' into GeoT

Browse Source 
# Conflicts:
#	GSKMTOrange/src/main/AndroidManifest.xml
#	GSKMTOrange/src/main/java/cpm/com/gskmtorange/GeoTag/GeoTagActivity.java
This commit is contained in:
ashishandroid
2017-01-11 12:13:08 +05:30
parent 5c3b06496f
commit 35878c7d51
4 changed files with 38 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/contentadditionalvisibility.xml
+15 -16
View File
@@ -71,7 +71,7 @@
android:id="@+id/tv_brandlayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="30"
android:layout_weight="40"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
@@ -90,7 +90,7 @@
<Spinner
android:id="@+id/spinner_Brand1"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="50dp"
android:layout_weight="2" />
</LinearLayout>
@@ -99,7 +99,7 @@
android:id="@+id/tv_displaylayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="30"
android:layout_weight="40"
android:background="@color/grey_background"
android:orientation="horizontal"
android:padding="5dp"
@@ -117,11 +117,10 @@
<Spinner
android:id="@+id/spinner_SkuMaster"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_height="50dp"
android:layout_weight="2"
/>
</LinearLayout>
<LinearLayout
@@ -181,7 +180,7 @@
</LinearLayout>
<RelativeLayout
<!--<RelativeLayout
android:id="@+id/tv_skulayout"
android:layout_width="match_parent"
android:layout_height="0dp"
@@ -189,15 +188,9 @@
android:background="@color/grey_background"
android:padding="5dp">
<Button
android:id="@+id/btn_sku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:background="@color/colorPrimary"
android:text="@string/sku" />
</RelativeLayout>
</RelativeLayout>-->
<RelativeLayout
android:layout_width="match_parent"
@@ -205,12 +198,18 @@
android:layout_weight="9"
android:background="@color/grey_background"
android:padding="5dp">
<Button
android:id="@+id/btn_sku"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:background="@color/colorPrimary"
android:text="@string/sku" />
<Button
android:id="@+id/btadd"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_alignParentRight="true"
android:background="@color/colorPrimary"
android:text="@string/add" />
</RelativeLayout>