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
2016-12-30 09:42:54 +05:30
parent aef06881e3 4fa554a606
commit 5641ee2d6a
18 changed files with 731 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GSKMTOrange/src/main/AndroidManifest.xml
+4 -1
View File
@@ -40,7 +40,6 @@
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".autoupdate.AutoUpdateActivity" />
<activity
android:name=".SelectLanguageActivity"
android:label="@string/title_activity_select_language"
@@ -75,6 +74,10 @@
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan" />
<!--android:label="@string/title_activity_msl__availability"-->
<activity
android:name=".dailyentry.StoreListActivity"
android:label="@string/title_activity_store_list_geotag"
android:theme="@style/AppTheme.NoActionBar" />
<activity
android:name=".gsk_dailyentry.Stock_FacingActivity"