From ac4cd9dae58bc753609aebd35ccda8785b806e3e Mon Sep 17 00:00:00 2001
From: 蔡瀚 <339726288@qq.com>
Date: 星期三, 23 一月 2019 12:01:10 +0800
Subject: [PATCH] Merge commit '1506bbf613d88c9c83179ef30c8a0a9da1ccaa3a'
---
ChannelDiff/Android/yjgame/AndroidManifest.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ChannelDiff/Android/yjgame/AndroidManifest.xml b/ChannelDiff/Android/yjgame/AndroidManifest.xml
index 4b97e01..e190d1f 100644
--- a/ChannelDiff/Android/yjgame/AndroidManifest.xml
+++ b/ChannelDiff/Android/yjgame/AndroidManifest.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
package="com.secondworld.univeralsdk"
android:installLocation="auto"
android:versionCode="1"
@@ -7,7 +8,7 @@
<uses-sdk
android:minSdkVersion="16"
- android:targetSdkVersion="26" />
+ android:targetSdkVersion="22" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -58,7 +59,9 @@
android:name="com.secondworld.univeralsdk.YJSplashActivity"
android:configChanges="keyboardHidden|orientation|screenSize"
android:label="@string/app_name"
- android:screenOrientation="landscape" >
+ android:launchMode="singleTop"
+ android:screenOrientation="landscape"
+ tools:replace="android:launchMode" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@@ -69,8 +72,9 @@
android:name="com.secondworld.univeralsdk.MainActivity"
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection"
android:label="@string/app_name"
- android:launchMode="singleTask"
- android:screenOrientation="sensorLandscape" >
+ android:launchMode="singleTop"
+ android:screenOrientation="sensorLandscape"
+ tools:replace="android:launchMode" >
<intent-filter>
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
--
Gitblit v1.8.0