Milan Jurkulak 3 лет назад
Родитель
Сommit
2e51f1166e
1 измененных файлов с 31 добавлено и 10 удалено
  1. 31 10
      app/src/main/AndroidManifest.xml

+ 31 - 10
app/src/main/AndroidManifest.xml

@@ -59,6 +59,9 @@
 
 
         <activity
         <activity
             android:name=".activity.MainActivity"
             android:name=".activity.MainActivity"
+            android:clearTaskOnLaunch="true"
+            android:finishOnTaskLaunch="true"
+            android:launchMode="singleInstance"
             android:exported="true">
             android:exported="true">
 
 
             <intent-filter>
             <intent-filter>
@@ -66,6 +69,12 @@
 
 
                 <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>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             </intent-filter>
 
 
@@ -74,7 +83,6 @@
 
 
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.HOME" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="fireos.intent.category.MAIN_HOME" />
                 <category android:name="fireos.intent.category.MAIN_HOME" />
             </intent-filter>
             </intent-filter>
 
 
@@ -83,12 +91,20 @@
         <activity
         <activity
             android:name=".activity.IPTVActivity"
             android:name=".activity.IPTVActivity"
             android:exported="true"
             android:exported="true"
+            android:launchMode="singleInstance"
+            android:clearTaskOnLaunch="true"
+            android:finishOnTaskLaunch="true"
             android:label="@string/title_iptv">
             android:label="@string/title_iptv">
 
 
             <intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MAIN" />
 
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             </intent-filter>
 
 
@@ -97,6 +113,9 @@
         <activity
         <activity
             android:name=".activity.WebActivity"
             android:name=".activity.WebActivity"
             android:exported="true"
             android:exported="true"
+            android:launchMode="singleInstance"
+            android:clearTaskOnLaunch="true"
+            android:finishOnTaskLaunch="true"
             android:label="@string/title_web">
             android:label="@string/title_web">
 
 
             <intent-filter>
             <intent-filter>
@@ -110,6 +129,11 @@
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.MAIN" />
 
 
                 <category android:name="android.intent.category.LAUNCHER" />
                 <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
                 <category android:name="android.intent.category.LEANBACK_LAUNCHER" />
             </intent-filter>
             </intent-filter>
 
 
@@ -123,15 +147,6 @@
                 <data android:scheme="https" />
                 <data android:scheme="https" />
             </intent-filter>
             </intent-filter>
 
 
-<!--            <intent-filter>-->
-<!--                <action android:name="android.intent.action.VIEW" />-->
-
-<!--                <category android:name="android.intent.category.DEFAULT" />-->
-<!--                <category android:name="android.intent.category.BROWSABLE" />-->
-
-<!--                <data android:scheme="demo" />-->
-<!--            </intent-filter>-->
-
             <intent-filter>
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.VIEW" />
 
 
@@ -156,23 +171,29 @@
         <service
         <service
             android:name=".sync.SyncService"
             android:name=".sync.SyncService"
             android:exported="false">
             android:exported="false">
+
             <intent-filter>
             <intent-filter>
                 <action android:name="android.content.SyncAdapter" />
                 <action android:name="android.content.SyncAdapter" />
             </intent-filter>
             </intent-filter>
+
             <meta-data
             <meta-data
                 android:name="android.content.SyncAdapter"
                 android:name="android.content.SyncAdapter"
                 android:resource="@xml/sync_adapter" />
                 android:resource="@xml/sync_adapter" />
+
         </service>
         </service>
 
 
         <service
         <service
             android:name=".sync.AuthenticatorService"
             android:name=".sync.AuthenticatorService"
             android:exported="false">
             android:exported="false">
+
             <intent-filter>
             <intent-filter>
                 <action android:name="android.accounts.AccountAuthenticator" />
                 <action android:name="android.accounts.AccountAuthenticator" />
             </intent-filter>
             </intent-filter>
+
             <meta-data
             <meta-data
                 android:name="android.accounts.AccountAuthenticator"
                 android:name="android.accounts.AccountAuthenticator"
                 android:resource="@xml/authenticator" />
                 android:resource="@xml/authenticator" />
+
         </service>
         </service>
 
 
         <provider
         <provider