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
2017-01-05 09:58:16 +05:30
parent e0ed5b560e
commit 2f84b3ecea
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/content_stock_facing.xml
+4 -5
View File
@@ -5,8 +5,7 @@
android:id="@+id/content_msl__availability" android:id="@+id/content_msl__availability"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior">
tools:showIn="@layout/activity_msl__availability">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -46,7 +45,7 @@
android:gravity="center" android:gravity="center"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="SKU" android:text="@string/stock_facing_sku_name"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" /> android:textColor="#222" />
</LinearLayout> </LinearLayout>
@@ -63,7 +62,7 @@
android:gravity="center" android:gravity="center"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="Stock" android:text="@string/stock_facing_stock"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" /> android:textColor="#222" />
</LinearLayout> </LinearLayout>
@@ -80,7 +79,7 @@
android:gravity="center" android:gravity="center"
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:paddingTop="5dp" android:paddingTop="5dp"
android:text="Faceup" android:text="@string/stock_facing_faceup"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" /> android:textColor="#222" />
</LinearLayout> </LinearLayout>
GSKMTOrange/src/main/res/values/strings.xml
+2 -1
View File
@@ -56,8 +56,9 @@
<string name="msl_availability_availability">Availability</string> <string name="msl_availability_availability">Availability</string>
<string name="stock_facing_reference_image">Reference Image</string> <string name="stock_facing_reference_image">Reference Image</string>
<string name="stock_facing_sku_name">SKU Name</string>
<string name="stock_facing_stock">Stock</string> <string name="stock_facing_stock">Stock</string>
<string name="stock_facing_facing">Facing</string> <string name="stock_facing_faceup">Facing</string>
<string name="stock_facing_sos_target">SOS Target</string> <string name="stock_facing_sos_target">SOS Target</string>