|
@@ -1,6 +1,6 @@
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
<?xml version="1.0" encoding="utf-8"?>
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
|
- package="app.brest.testmin3d">
|
|
|
|
|
|
+ package="app.ara.activities">
|
|
|
|
|
|
<uses-permission android:name="android.permission.CAMERA" />
|
|
<uses-permission android:name="android.permission.CAMERA" />
|
|
|
|
|
|
@@ -28,18 +28,25 @@
|
|
<activity
|
|
<activity
|
|
android:name=".ResourceListActivity"
|
|
android:name=".ResourceListActivity"
|
|
android:configChanges="orientation|keyboardHidden|screenSize"
|
|
android:configChanges="orientation|keyboardHidden|screenSize"
|
|
- android:label="@string/title_activity_resource_list" />
|
|
|
|
|
|
+ android:label="@string/title_activity_resource_list"
|
|
|
|
+ android:screenOrientation="portrait"/>
|
|
<activity
|
|
<activity
|
|
android:name=".SettingsActivity"
|
|
android:name=".SettingsActivity"
|
|
- android:label="@string/title_activity_settings" />
|
|
|
|
|
|
+ android:configChanges="orientation|keyboardHidden"
|
|
|
|
+ android:label="@string/title_activity_settings"
|
|
|
|
+ android:screenOrientation="portrait"></activity>
|
|
<activity android:name=".TransferActivity" />
|
|
<activity android:name=".TransferActivity" />
|
|
<activity android:name=".EndActivity" />
|
|
<activity android:name=".EndActivity" />
|
|
- <activity android:name=".MARMenuActivity">
|
|
|
|
- </activity>
|
|
|
|
-
|
|
|
|
- <activity android:name=".SEMenuActivity">
|
|
|
|
|
|
+ <activity
|
|
|
|
+ android:name=".MARMenuActivity"
|
|
|
|
+ android:configChanges="orientation|keyboardHidden"
|
|
|
|
+ android:screenOrientation="portrait"></activity>
|
|
|
|
+ <activity
|
|
|
|
+ android:name=".SEMenuActivity"
|
|
|
|
+ android:configChanges="orientation|keyboardHidden"
|
|
|
|
+ android:screenOrientation="portrait">
|
|
|
|
+ >
|
|
</activity>
|
|
</activity>
|
|
-
|
|
|
|
<activity
|
|
<activity
|
|
android:name=".PuzzleActivity"
|
|
android:name=".PuzzleActivity"
|
|
android:configChanges="orientation|keyboardHidden|screenSize"
|
|
android:configChanges="orientation|keyboardHidden|screenSize"
|
|
@@ -52,6 +59,8 @@
|
|
<category android:name="android.intent.category.LAUNCHER" />
|
|
<category android:name="android.intent.category.LAUNCHER" />
|
|
</intent-filter>
|
|
</intent-filter>
|
|
</activity>
|
|
</activity>
|
|
|
|
+ <activity android:name=".MediaAcitvity"
|
|
|
|
+ android:theme="@style/AppTheme.NoActionBar.Fullscreen"></activity>
|
|
</application>
|
|
</application>
|
|
|
|
|
|
</manifest>
|
|
</manifest>
|