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

Merge branch 'master' into AshishDataImage

Browse Source
This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-18 09:54:14 +05:30
committed by GitHub
parent 370fc8127a 876088b79e
commit dfbc80a229
21 changed files with 662 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/res/values/dimens.xml
+1 -1
View File
@@ -7,7 +7,7 @@
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="fab_margin">16dp</dimen>
<dimen name="custom_margin">10dp</dimen>
<dimen name="custom_margin">5dp</dimen>
<dimen name="text_size_normal">20sp</dimen>
<dimen name="text_size_small">16sp</dimen>
GSKMTOrange/src/main/res/values/strings.xml
+7 -1
View File
@@ -196,7 +196,7 @@
<!--Gagan start new code 2-->
<string name="stock_facing_planogram_dialog_title">Planogram</string>
<string name="title_activity_settings">SettingsActivity</string>
<string name="title_activity_settings">Settings</string>
<string name="ok">OK</string>
<string name="check_save_message">Are you sure you want to save</string>
@@ -214,10 +214,16 @@
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="title_activity_checkout">CheckoutActivity</string>
<string name="checkout_successful">Checkout Success</string>
<string name="NetworkError">Network Error ,</string>
<string name="DataNot"> Data Not Uploaded ,</string>
<string name="displayname">Display Name</string>
<string name="adddatatoclick">Click Yes To Add Data</string>
<string name="title_activity_service">Service</string>
<string name="data_downloaded_successfully">Data downloaded successfully</string>
<string name="export_database">Export Database</string>
<string name="data_exported_successfully">Database Exported Successfully</string>
</resources>