Skip to content

A
AloqaIM-Android
Unverified Commit f792e876 authored by Lucio Maciel's avatar Lucio Maciel Committed by GitHub
Browse files
Options

Merge branch 'develop-2.x' into layout/bug-authentication-screen

parents 4db0accc c850a651
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
app/src/main/AndroidManifest.xml
View file @ f792e876
...@@ -19,24 +19,24 @@ ...@@ -19,24 +19,24 @@
android:configChanges="orientation" android:configChanges="orientation"
android:screenOrientation="portrait" android:screenOrientation="portrait"
android:theme="@style/AuthenticationTheme"> android:theme="@style/AuthenticationTheme">
<intent-filter> <!--<intent-filter>-->
<action android:name="android.intent.action.MAIN" /> <!--<action android:name="android.intent.action.MAIN" />-->
<category android:name="android.intent.category.DEFAULT" /> <!--<category android:name="android.intent.category.DEFAULT" />-->
<category android:name="android.intent.category.LAUNCHER" /> <!--<category android:name="android.intent.category.LAUNCHER" />-->
</intent-filter> <!--</intent-filter>-->
</activity> </activity>
<activity <activity
android:name=".app.MainActivity" android:name=".app.MainActivity"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<!--<intent-filter>--> <intent-filter>
<!--<action android:name="android.intent.action.MAIN" />--> <action android:name="android.intent.action.MAIN" />
<!--<category android:name="android.intent.category.DEFAULT" />--> <category android:name="android.intent.category.DEFAULT" />
<!--<category android:name="android.intent.category.LAUNCHER" />--> <category android:name="android.intent.category.LAUNCHER" />
<!--</intent-filter>--> </intent-filter>
</activity> </activity>
</application> </application>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023