Safemobile/safedispatch-mobile
20
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into features/SD-188-Create_Permission_module_and_request_audio

Browse Source 
# Conflicts:
#	safeDispatch/src/main/java/com/safemobile/dispatch/HistoryActivity.java
#	safeDispatch/src/main/java/com/safemobile/safedispatch/TabLayoutActivity.java
This commit is contained in:
Bogdan Ungureanu
2022-03-24 12:29:12 +02:00
parent 81937a5e0f c70a1b71a1
commit c07986d604
55 changed files with 419 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
safeDispatch/src/main/AndroidManifest.xml
View File

@ -1,9 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.safemobile.dispatch"
android:versionCode="9"
android:versionName="1.0.9">
package="com.safemobile.safedispatch">
<!-- require OpenGL ES version 2 for Google Maps -->
<uses-feature
@ -30,7 +27,7 @@
<application
android:configChanges="orientation"
android:icon="@drawable/ic_launcher"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:screenOrientation="landscape"
android:theme="@style/AppTheme">
@ -45,7 +42,7 @@
<service android:name="com.safemobile.services.TCPService" />
<activity
android:name=".SDMobileActivity"
android:name="com.safemobile.safedispatch.SDMobileActivity"
android:configChanges="orientation"
android:exported="true"
android:label="@string/app_name_demo"
@ -57,41 +54,41 @@
</intent-filter>
</activity>
<activity
android:name=".SetupActivity"
android:name="com.safemobile.safedispatch.SetupActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".TabLayoutActivity"
android:name="com.safemobile.safedispatch.TabLayoutActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".LiveActivity"
android:name="com.safemobile.safedispatch.LiveActivity"
android:exported="false"
android:configChanges="orientation"
android:screenOrientation="landscape"
android:label="@string/title_activity_google_maps" />
<activity
android:name=".HistoryActivity"
android:name="com.safemobile.safedispatch.HistoryActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".MessagesActivity"
android:name="com.safemobile.safedispatch.MessagesActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".AlarmActivity"
android:name="com.safemobile.safedispatch.AlarmActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".RadioActivity"
android:name="com.safemobile.safedispatch.RadioActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".RecordingsActivity"
android:name="com.safemobile.safedispatch.RecordingsActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
<activity
android:name=".NotificationActivity"
android:name="com.safemobile.safedispatch.NotificationActivity"
android:configChanges="orientation"
android:screenOrientation="landscape" />
</application>