Merge branch 'master' of https://github.com/CPM-INDIA-SALES-AND-MARKETING-PVT-LTD/GSKORANGEV1 into Category_G

# Conflicts: # GSKMTOrange/src/main/AndroidManifest.xml # GSKMTOrange/src/main/java/cpm/com/gskmtorange/MainActivity.java
2016-12-29 14:43:28 +05:30
parent 2c077f5c3d
commit bc4ab85914
11 changed files with 796 additions and 8 deletions
@@ -76,5 +76,11 @@
            android:windowSoftInputMode="adjustPan" />
        <!--android:label="@string/title_activity_msl__availability"-->

+        <activity
+            android:name=".gsk_dailyentry.Stock_FacingActivity"
+            android:configChanges="screenSize|orientation|keyboardHidden"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan" />
+
    </application>
 </manifest>