diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 21e549a0e5..dd500f64d8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,7 @@ android:label="@string/app_shell_name" android:supportsRtl="true" android:theme="@style/AppTheme.App" + android:resizeableActivity="false" tools:replace="android:label"> diff --git a/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml b/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml index 0d4d401316..965be80a22 100644 --- a/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml +++ b/main-extensions/mogo-module-main-independent/src/main/AndroidManifest.xml @@ -7,7 +7,7 @@ android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize" android:enabled="true" android:launchMode="singleInstance" - android:resizeableActivity="true" + android:resizeableActivity="false" android:resumeWhilePausing="true" android:screenOrientation="landscape" android:stateNotNeeded="true" diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java index 6eb8f5fe61..3da48ac1f3 100644 --- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java +++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java @@ -1,14 +1,16 @@ package com.zhidao.mogo.module.main.independent; +import android.annotation.TargetApi; +import android.os.Build; import android.os.Bundle; import android.view.View; import android.widget.FrameLayout; import androidx.annotation.Nullable; -import com.mogo.commons.debug.DebugConfig; import com.mogo.module.common.map.CustomNaviInterrupter; import com.mogo.module.main.MainActivity; +import com.mogo.utils.TipToast; /** * 针对独立应用形式,做单独定制 @@ -47,8 +49,19 @@ public class MainIndependentActivity extends MainActivity { if ( mCoverUpLayout.getVisibility() != View.VISIBLE ) { mServiceApis.getAdasControllerApi().setUseAlgorithm( true ); } + if( Build.VERSION.SDK_INT >= Build.VERSION_CODES.N){ + fixInMultiWindowMode(); + } } + @TargetApi( Build.VERSION_CODES.N ) + private void fixInMultiWindowMode(){ + if ( isInMultiWindowMode() ) { + TipToast.shortTip( R.string.module_main_unsupport_multi_window_mode ); + } + } + + @Override protected void onPause() { super.onPause(); diff --git a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml index b59a0bf53e..bbca1838ed 100644 --- a/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml +++ b/main-extensions/mogo-module-main-launcher/src/main/AndroidManifest.xml @@ -8,7 +8,7 @@ android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize" android:enabled="true" android:launchMode="singleInstance" - android:resizeableActivity="true" + android:resizeableActivity="false" android:resumeWhilePausing="true" android:screenOrientation="landscape" android:stateNotNeeded="true" diff --git a/modules/mogo-module-apps/src/main/AndroidManifest.xml b/modules/mogo-module-apps/src/main/AndroidManifest.xml index d6de6be910..711a26f5af 100644 --- a/modules/mogo-module-apps/src/main/AndroidManifest.xml +++ b/modules/mogo-module-apps/src/main/AndroidManifest.xml @@ -26,7 +26,7 @@ android:name=".AppsListActivity" android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|screenLayout|fontScale|uiMode|orientation|screenSize|smallestScreenSize" android:launchMode="singleTask" - android:resizeableActivity="true" + android:resizeableActivity="false" android:resumeWhilePausing="true" android:screenOrientation="landscape" android:stateNotNeeded="true"