Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
f792e876
Unverified
Commit
f792e876
authored
Dec 04, 2017
by
Lucio Maciel
Committed by
GitHub
Dec 04, 2017
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop-2.x' into layout/bug-authentication-screen
parents
4db0accc
c850a651
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
10 deletions
+10
-10
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+10
-10
No files found.
app/src/main/AndroidManifest.xml
View file @
f792e876
...
...
@@ -19,24 +19,24 @@
android:configChanges=
"orientation"
android:screenOrientation=
"portrait"
android:theme=
"@style/AuthenticationTheme"
>
<
intent-filter
>
<
action
android:name=
"android.intent.action.MAIN"
/
>
<
!--<intent-filter>--
>
<
!--<action android:name="android.intent.action.MAIN" />--
>
<
category
android:name=
"android.intent.category.DEFAULT"
/
>
<
category
android:name=
"android.intent.category.LAUNCHER"
/
>
<
/intent-filter
>
<
!--<category android:name="android.intent.category.DEFAULT" />--
>
<
!--<category android:name="android.intent.category.LAUNCHER" />--
>
<
!--</intent-filter>--
>
</activity>
<activity
android:name=
".app.MainActivity"
android:theme=
"@style/AppTheme"
>
<
!--<intent-filter>--
>
<
!--<action android:name="android.intent.action.MAIN" />--
>
<
intent-filter
>
<
action
android:name=
"android.intent.action.MAIN"
/
>
<
!--<category android:name="android.intent.category.DEFAULT" />--
>
<
!--<category android:name="android.intent.category.LAUNCHER" />--
>
<
!--</intent-filter>--
>
<
category
android:name=
"android.intent.category.DEFAULT"
/
>
<
category
android:name=
"android.intent.category.LAUNCHER"
/
>
<
/intent-filter
>
</activity>
</application>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment