From ae2ff1ef9a88994bad290ac0823846e62e087d2e Mon Sep 17 00:00:00 2001
From: Braden Farmer <farmerbb@gmail.com>
Date: Sat, 21 Mar 2020 14:06:44 -0600
Subject: [PATCH] Improvements for setting default home app

---
 .../java/com/farmerbb/taskbar/activity/HSLActivity.java     | 13 +++++++++++++
 .../com/farmerbb/taskbar/fragment/DesktopModeFragment.java  |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/HSLActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/HSLActivity.java
index cf45dd9b..2dd77ea7 100644
--- a/app/src/main/java/com/farmerbb/taskbar/activity/HSLActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/HSLActivity.java
@@ -24,9 +24,11 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
 import android.os.Handler;
+import android.provider.Settings;
 import android.widget.Toast;
 
 import com.farmerbb.taskbar.R;
+import com.farmerbb.taskbar.fragment.DesktopModeFragment;
 import com.farmerbb.taskbar.util.U;
 
 import java.util.List;
@@ -37,6 +39,17 @@ public class HSLActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        if(DesktopModeFragment.isConfiguringHomeApp) {
+            int enter = getResources().getIdentifier("activity_close_enter", "anim", "android");
+            int exit = getResources().getIdentifier("activity_close_exit", "anim", "android");
+
+            startActivity(new Intent(this, MainActivity.class));
+            overridePendingTransition(enter, exit);
+
+            finish();
+            return;
+        }
+
         SharedPreferences pref = U.getSharedPreferences(this);
         String activityToLaunch = pref.getString("hsl_id", "null");
 
diff --git a/app/src/main/java/com/farmerbb/taskbar/fragment/DesktopModeFragment.java b/app/src/main/java/com/farmerbb/taskbar/fragment/DesktopModeFragment.java
index 969e51f4..c1fe4701 100644
--- a/app/src/main/java/com/farmerbb/taskbar/fragment/DesktopModeFragment.java
+++ b/app/src/main/java/com/farmerbb/taskbar/fragment/DesktopModeFragment.java
@@ -37,6 +37,8 @@ import com.farmerbb.taskbar.util.U;
 
 public class DesktopModeFragment extends SettingsFragment {
 
+    public static boolean isConfiguringHomeApp;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         finishedLoadingPrefs = false;
@@ -80,6 +82,7 @@ public class DesktopModeFragment extends SettingsFragment {
     @Override
     public void onResume() {
         super.onResume();
+        isConfiguringHomeApp = false;
 
         Preference primaryLauncherPref = findPreference("primary_launcher");
         if(primaryLauncherPref != null) {
@@ -124,6 +127,7 @@ public class DesktopModeFragment extends SettingsFragment {
             case "set_launcher_default":
                 try {
                     startActivity(new Intent(Settings.ACTION_HOME_SETTINGS));
+                    isConfiguringHomeApp = true;
                 } catch (ActivityNotFoundException e) {
                     U.showToastLong(getActivity(), R.string.tb_unable_to_set_default_home);
                 }
-- 
2.11.0