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

Merge branch 'master' into ysy_latest_setting

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-13 18:03:13 +05:30
committed by GitHub
parent 385bd0a36d adc58aa2d4
commit 591cccc5b9
17 changed files with 772 additions and 369 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/layout/content_promo_compliance.xml
+7 -7
View File
@@ -160,9 +160,9 @@
android:id="@+id/toggle_add_InStock"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no"
android:textOn="@string/yes"
android:background="@drawable/toggle_selector_background"/>
android:textOn="@string/yes"/>
</LinearLayout>
</LinearLayout>
@@ -199,9 +199,9 @@
android:id="@+id/toggle_add_promoAnnouncer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no"
android:textOn="@string/yes"
android:background="@drawable/toggle_selector_background" />
android:textOn="@string/yes" />
</LinearLayout>
</LinearLayout>
@@ -238,9 +238,9 @@
android:id="@+id/toggle_add_runningPos"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/toggle_selector_background"
android:textOff="@string/no"
android:textOn="@string/yes"
android:background="@drawable/toggle_selector_background" />
android:textOn="@string/yes" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -258,7 +258,7 @@
android:id="@+id/btn_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="center"
android:background="@color/colorPrimaryDark"
android:text="@string/promo_compliance_add"
android:textColor="@color/white" />
GSKMTOrange/src/main/res/layout/item_stock_facing_child.xml
+2
View File
@@ -77,6 +77,7 @@
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"
@@ -105,6 +106,7 @@
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"