Merge branch 'master' into GG_StorePerformance

This commit is contained in:
YadavendraSinghYaduvanshi
2017-01-12 10:07:23 +05:30
committed by GitHub
34 changed files with 3203 additions and 203 deletions
+11 -3
View File
@@ -68,7 +68,6 @@
android:label="@string/title_activity_store_geotag"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
<meta-data
android:name="com.google.android.maps.v2.API_KEY"
android:value="AIzaSyD02po19go2JMhXJeAnKDiZSiNloPsWqzI" />
@@ -80,6 +79,7 @@
android:name=".dailyentry.T2PComplianceActivity"
android:label="@string/title_activity_t2_pcompliance"
android:screenOrientation="portrait"
android:configChanges="screenSize|orientation|keyboardHidden"
android:theme="@style/AppTheme.NoActionBar" />
<!-- Gagan Start Declaration -->
@@ -130,12 +130,20 @@
<activity
android:name=".dailyentry.NonWorkingReason"
android:label="@string/title_activity_t2_pcompliance"
android:label="@string/title_activity_Non_Work"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar" />
android:theme="@style/AppTheme.NoActionBar"/>
<activity
android:name=".dailyentry.AdditionalVisibility"
android:label="@string/title_activity_Additional_visibility"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"/>
<activity
android:name=".upload.UploadActivity"
android:label="@string/title_activity_upload" />
</application>
</manifest>