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

Merge branch 'master' into saturdayNEWAC

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-21 13:40:05 +05:30
committed by GitHub
parent 2321b02268 25343167d4
commit 12ef109266
18 changed files with 399 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/item_additional_promo_list.xml
+3 -1
View File
@@ -9,7 +9,9 @@
android:id="@+id/card_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
card_view:cardCornerRadius="10dp">
<LinearLayout
GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
+2 -2
View File
@@ -77,12 +77,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:hint="@string/stock_facing_stock"
android:inputType="number"
android:maxLength="7"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<!--android:hint="@string/stock_facing_stock"-->
</LinearLayout>
<LinearLayout
@@ -106,12 +106,12 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:hint="@string/stock_facing_faceup"
android:inputType="number"
android:maxLength="7"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222"
android:textColorHint="#666" />
<!--android:hint="@string/stock_facing_faceup"-->
</LinearLayout>
</LinearLayout>
GSKMTOrange/src/main/res/layout/item_stock_facing_header.xml
+1 -1
View File
@@ -46,7 +46,7 @@
android:layout_height="match_parent"
android:layout_weight=".6"
android:paddingRight="5dp"
android:text="@string/stock_facing_sos"
android:text="-"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="#222" />
</LinearLayout>