From f6fdd70995ee517c2376bd87ca710203d389f7a2 Mon Sep 17 00:00:00 2001 From: Finn M Glas Date: Tue, 16 Jun 2020 09:47:36 +0200 Subject: [PATCH] Bugfixes + Show only apps and no other intents in the list choosable as an action ('view' rather than 'pick') + Change text for 'other' intents (+="Launcher ") --- .../finnmglas/launcher/choose/other/OtherRecyclerAdapter.kt | 4 ++-- .../main/java/com/finnmglas/launcher/extern/Functions.kt | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/finnmglas/launcher/choose/other/OtherRecyclerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/choose/other/OtherRecyclerAdapter.kt index bfec1ab..6e95ba2 100644 --- a/app/src/main/java/com/finnmglas/launcher/choose/other/OtherRecyclerAdapter.kt +++ b/app/src/main/java/com/finnmglas/launcher/choose/other/OtherRecyclerAdapter.kt @@ -50,8 +50,8 @@ class OtherRecyclerAdapter(val activity: Activity): init { othersList = ArrayList() - othersList.add(OtherInfo("Settings", "launcher:settings")) - othersList.add(OtherInfo("AppsList", "launcher:choose")) + othersList.add(OtherInfo("Launcher Settings", "launcher:settings")) + othersList.add(OtherInfo("Launcher AppsList", "launcher:choose")) } /* */ diff --git a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt index d3a90d8..eb8656c 100644 --- a/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt +++ b/app/src/main/java/com/finnmglas/launcher/extern/Functions.kt @@ -21,6 +21,7 @@ import androidx.core.content.ContextCompat.startActivity import com.finnmglas.launcher.ChooseActivity import com.finnmglas.launcher.R import com.finnmglas.launcher.SettingsActivity +import com.finnmglas.launcher.intendedSettingsPause import kotlin.math.roundToInt @@ -222,7 +223,10 @@ fun openSettings(activity: Activity){ } fun openAppsList(activity: Activity){ - activity.startActivity(Intent(activity, ChooseActivity::class.java)) + val intent = Intent(activity, ChooseActivity::class.java) + intent.putExtra("action", "view") + intendedSettingsPause = true + activity.startActivity(intent) activity.overridePendingTransition(R.anim.bottom_up, android.R.anim.fade_out) }