[VXP]: feature, directly back.

Author: weishu.tws

VirtualApp/app/src/main/AndroidManifest.xml

@@ -59,7 +59,7 @@
             android:name=".settings.SettingsActivity"
             android:label="@string/settings_title"
             android:screenOrientation="portrait"
-            android:theme="@android:style/Theme.Material.Settings" />
+            android:theme="@android:style/Theme.Material.Light" />
 
         <activity
             android:name=".settings.AppManageActivity"

VirtualApp/app/src/main/java/io/virtualapp/home/NewHomeActivity.java

@@ -6,6 +6,7 @@
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
@@ -23,6 +24,7 @@
 import android.view.WindowManager;
 import android.widget.Toast;
 
+import com.android.launcher3.LauncherFiles;
 import com.google.android.apps.nexuslauncher.NexusLauncherActivity;
 import com.lody.virtual.client.core.VirtualCore;
 import com.lody.virtual.helper.utils.DeviceUtil;
@@ -46,6 +48,7 @@ public class NewHomeActivity extends NexusLauncherActivity {
     private static final String WALLPAPER_FILE_NAME = "wallpaper.png";
 
     private Handler mUiHandler;
+    private boolean mDirectlyBack = false;
 
     public static void goHome(Context context) {
         Intent intent = new Intent(context, NewHomeActivity.class);
@@ -56,11 +59,13 @@ public static void goHome(Context context) {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        SharedPreferences sharedPreferences = getSharedPreferences(LauncherFiles.SHARED_PREFERENCES_KEY, Context.MODE_PRIVATE);
         super.onCreate(savedInstanceState);
         showMenuKey();
         mUiHandler = new Handler(getMainLooper());
         alertForMeizu();
         alertForDoze();
+        mDirectlyBack = sharedPreferences.getBoolean(SettingsActivity.DIRECTLY_BACK_KEY, false);
     }
 
     @Override
@@ -132,6 +137,9 @@ public void startVirtualActivity(Intent intent, Bundle options, int usedId) {
             }
         }
         LoadingActivity.launch(this, packageName, usedId);
+        if (mDirectlyBack) {
+            finish();
+        }
     }
 
     private void alertForMeizu() {

VirtualApp/app/src/main/java/io/virtualapp/settings/SettingsActivity.java

@@ -34,6 +34,7 @@ public class SettingsActivity extends Activity {
     private static final String REBOOT_KEY = "settings_reboot";
     private static final String HIDE_SETTINGS_KEY = "advance_settings_hide_settings";
     private static final String DISABLE_INSTALLER_KEY = "advance_settings_disable_installer";
+    public static final String DIRECTLY_BACK_KEY = "advance_settings_directly_back";
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {

VirtualApp/app/src/main/res/values-zh-rCN/strings.xml

@@ -118,4 +118,6 @@
     <string name="advance_settings_disable_installer">禁用 VirtualXposed 的APK安装器</string>
     <string name="advance_settings_hide_settings_summary">如果你可以在主界面通过菜单键（长按多任务或者虚拟菜单键）进入设置，那么可以隐藏这个按钮；否则你将无法进入设置！！\n(强制停止VirtualXposed后生效）</string>
     <string name="advance_settings_disable_installer_summary">在系统中安装APK文件的时候，不显示VirtualXposed的安装器</string>
+    <string name="advance_settings_directly_back">直接返回</string>
+    <string name="advance_settings_directly_back_summary">内部APP退出时，直接返回到系统桌面而不是VirtualXposed的虚拟桌面(强制停止VirtualXposed后生效）</string>
 </resources>

VirtualApp/app/src/main/res/values/strings.xml

@@ -120,6 +120,8 @@
     <string name="settings_advance">Advance Settings</string>
     <string name="advance_settings_hide_settings">Hide settings button on desktop</string>
     <string name="advance_settings_disable_installer">Disable apk installer for system</string>
-    <string name="advance_settings_hide_settings_summary">If you can enter settings by menu key on main activity, you can hide this, otherwise you may not be able to enter settings!! \n(Force stop VirtualXposed to take effect.)</string>
+    <string name="advance_settings_hide_settings_summary">If you can enter settings by menu key on main activity, you can hide this, otherwise you may not be able to enter settings!! \n(Restart VirtualXposed to take effect.)</string>
     <string name="advance_settings_disable_installer_summary">Do not show VirtualXposed\'s installer when you choose apk file in system</string>
+    <string name="advance_settings_directly_back">Directly back</string>
+    <string name="advance_settings_directly_back_summary">Back to system launcher instead of the virtual launcher when in virtual app.\n(Restart VirtualXposed to take effect.)</string>
 </resources>

VirtualApp/app/src/main/res/xml/settings_preferences.xml

@@ -34,6 +34,12 @@
             android:summary="@string/advance_settings_disable_installer_summary"
             android:title="@string/advance_settings_disable_installer" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="advance_settings_directly_back"
+            android:persistent="true"
+            android:summary="@string/advance_settings_directly_back_summary"
+            android:title="@string/advance_settings_directly_back" />
     </PreferenceScreen>
 
     <Preference