From 3fd3dc49d9a9a28a4eff5597d027b323fb3a11f6 Mon Sep 17 00:00:00 2001 From: HeCodes2Much Date: Thu, 25 Jul 2024 19:23:27 +0100 Subject: [PATCH] Fix: Android 15: Fixed the set default launcher. Signed-off-by: HeCodes2Much --- app/build.gradle.kts | 13 ++++--- app/src/main/AndroidManifest.xml | 14 -------- .../common/ContextExtensions.kt | 35 ------------------- .../ui/activities/FakeHomeActivity.kt | 12 ------- .../main/res/layout/activity_fake_home.xml | 7 ---- 5 files changed, 8 insertions(+), 73 deletions(-) delete mode 100644 app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/FakeHomeActivity.kt delete mode 100644 app/src/main/res/layout/activity_fake_home.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index f841648..87098e6 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -13,19 +13,20 @@ plugins { android { namespace = "com.github.droidworksstudio.launcher" - compileSdk = 34 + compileSdk = 35 defaultConfig { applicationId = "app.easy.launcher" minSdk = 24 - targetSdk = 34 + targetSdk = 35 versionCode = 21 versionName = "0.2.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" manifestPlaceholders["internetPermission"] = "android.permission.INTERNET" manifestPlaceholders["fineLocationPermission"] = "android.permission.ACCESS_FINE_LOCATION" - manifestPlaceholders["coarseLocationPermission"] = "android.permission.ACCESS_COARSE_LOCATION" + manifestPlaceholders["coarseLocationPermission"] = + "android.permission.ACCESS_COARSE_LOCATION" } buildTypes { @@ -73,8 +74,10 @@ android { create("withInternet") { dimension = "internet" manifestPlaceholders["internetPermission"] = "android.permission.INTERNET" - manifestPlaceholders["fineLocationPermission"] = "android.permission.ACCESS_FINE_LOCATION" - manifestPlaceholders["coarseLocationPermission"] = "android.permission.ACCESS_COARSE_LOCATION" + manifestPlaceholders["fineLocationPermission"] = + "android.permission.ACCESS_FINE_LOCATION" + manifestPlaceholders["coarseLocationPermission"] = + "android.permission.ACCESS_COARSE_LOCATION" val weatherFile = project.rootProject.file("weather.properties") val properties = Properties() properties.load(weatherFile.inputStream()) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2d5982b..92f7d70 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -69,20 +69,6 @@ - - - - - - - - - runningStockAndroid() - else -> notRunningStockAndroid() - } -} - -fun Context.runningStockAndroid() { - try { - val packageManager = this.packageManager - val componentName = ComponentName(this, FakeHomeActivity::class.java) - - packageManager.setComponentEnabledSetting( - componentName, - PackageManager.COMPONENT_ENABLED_STATE_ENABLED, - PackageManager.DONT_KILL_APP - ) - - val selector = Intent(Intent.ACTION_MAIN) - selector.addCategory(Intent.CATEGORY_HOME) - this.startActivity(selector) - - packageManager.setComponentEnabledSetting( - componentName, - PackageManager.COMPONENT_ENABLED_STATE_DISABLED, - PackageManager.DONT_KILL_APP - ) - } catch (e: Exception) { - e.printStackTrace() - } -} - -fun Context.notRunningStockAndroid() { try { val intent = Intent("android.settings.HOME_SETTINGS") this.startActivity(intent) diff --git a/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/FakeHomeActivity.kt b/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/FakeHomeActivity.kt deleted file mode 100644 index e4c3d6f..0000000 --- a/app/src/main/java/com/github/droidworksstudio/launcher/ui/activities/FakeHomeActivity.kt +++ /dev/null @@ -1,12 +0,0 @@ -package com.github.droidworksstudio.launcher.ui.activities - -import android.os.Bundle -import androidx.appcompat.app.AppCompatActivity -import com.github.droidworksstudio.launcher.R - -class FakeHomeActivity : AppCompatActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_fake_home) - } -} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_fake_home.xml b/app/src/main/res/layout/activity_fake_home.xml deleted file mode 100644 index 2ed8447..0000000 --- a/app/src/main/res/layout/activity_fake_home.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - \ No newline at end of file