diff --git a/app/src/main/java/de/jrpie/android/launcher/Functions.kt b/app/src/main/java/de/jrpie/android/launcher/Functions.kt
index afc2c31..7bbbdb5 100644
--- a/app/src/main/java/de/jrpie/android/launcher/Functions.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/Functions.kt
@@ -38,8 +38,6 @@ import androidx.core.net.toUri
const val LOG_TAG = "Launcher"
-const val REQUEST_SET_DEFAULT_HOME = 42
-
fun isDefaultHomeScreen(context: Context): Boolean {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
val roleManager = context.getSystemService(RoleManager::class.java)
@@ -61,12 +59,11 @@ fun setDefaultHomeScreen(context: Context, checkDefault: Boolean = false) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q
&& context is Activity
- && checkDefault // using role manager only works when µLauncher is not already the default.
+ && !isDefault // using role manager only works when µLauncher is not already the default.
) {
val roleManager = context.getSystemService(RoleManager::class.java)
- context.startActivityForResult(
- roleManager.createRequestRoleIntent(RoleManager.ROLE_HOME),
- REQUEST_SET_DEFAULT_HOME
+ context.startActivity(
+ roleManager.createRequestRoleIntent(RoleManager.ROLE_HOME)
)
return
}
diff --git a/app/src/main/java/de/jrpie/android/launcher/actions/LauncherAction.kt b/app/src/main/java/de/jrpie/android/launcher/actions/LauncherAction.kt
index 6ba467e..ee9502c 100644
--- a/app/src/main/java/de/jrpie/android/launcher/actions/LauncherAction.kt
+++ b/app/src/main/java/de/jrpie/android/launcher/actions/LauncherAction.kt
@@ -154,12 +154,6 @@ enum class LauncherAction(
R.drawable.baseline_flashlight_on_24,
::toggleTorch,
),
- LAUNCH_OTHER_LAUNCHER(
- "launcher_other_launcher",
- R.string.list_other_launch_other_launcher,
- R.drawable.baseline_home_24,
- ::launchOtherLauncher
- ),
NOP("nop", R.string.list_other_nop, R.drawable.baseline_not_interested_24, {});
override fun invoke(context: Context, rect: Rect?): Boolean {
@@ -264,15 +258,6 @@ private fun expandSettingsPanel(context: Context) {
}
}
-private fun launchOtherLauncher(context: Context) {
- context.startActivity(
- Intent.createChooser(
- Intent(Intent.ACTION_MAIN).also { it.addCategory(Intent.CATEGORY_HOME) },
- context.getString(R.string.list_other_launch_other_launcher)
- )
- )
-}
-
private fun openSettings(context: Context) {
context.startActivity(Intent(context, SettingsActivity::class.java))
}
diff --git a/app/src/main/res/drawable/baseline_home_24.xml b/app/src/main/res/drawable/baseline_home_24.xml
deleted file mode 100644
index 935d1b6..0000000
--- a/app/src/main/res/drawable/baseline_home_24.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8bc9b3..83b963b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -256,7 +256,6 @@
Do nothing
Lock Screen
Toggle Torch
- Launch other Home Screen
Add Shortcut