summaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/app/olauncher/MainActivity.kt7
-rw-r--r--app/src/main/java/app/olauncher/MainViewModel.kt3
-rw-r--r--app/src/main/java/app/olauncher/data/Prefs.kt10
-rw-r--r--app/src/main/java/app/olauncher/helper/MyAccessibilityService.kt7
-rw-r--r--app/src/main/java/app/olauncher/ui/HomeFragment.kt13
-rw-r--r--app/src/main/java/app/olauncher/ui/SettingsFragment.kt40
-rw-r--r--app/src/main/res/layout-land/fragment_home.xml5
-rw-r--r--app/src/main/res/layout-land/fragment_settings.xml2
-rw-r--r--app/src/main/res/layout/fragment_home.xml5
-rw-r--r--app/src/main/res/layout/fragment_settings.xml2
-rw-r--r--app/src/main/res/values/strings.xml6
11 files changed, 60 insertions, 40 deletions
diff --git a/app/src/main/java/app/olauncher/MainActivity.kt b/app/src/main/java/app/olauncher/MainActivity.kt
index 9fd4790..27a66b9 100644
--- a/app/src/main/java/app/olauncher/MainActivity.kt
+++ b/app/src/main/java/app/olauncher/MainActivity.kt
@@ -147,10 +147,11 @@ class MainActivity : AppCompatActivity() {
}
override fun onNewIntent(intent: Intent?) {
- val alreadyHome = navController.currentDestination?.id == R.id.mainFragment
+ // Home button for recents feature disabled
+ // val alreadyHome = navController.currentDestination?.id == R.id.mainFragment
backToHomeScreen()
- if (alreadyHome && isResumed && prefs.homeButtonShowRecents)
- viewModel.showRecentApps.call()
+ // if (alreadyHome && isResumed && prefs.homeButtonShowRecents)
+ // viewModel.showRecentApps.call()
super.onNewIntent(intent)
}
diff --git a/app/src/main/java/app/olauncher/MainViewModel.kt b/app/src/main/java/app/olauncher/MainViewModel.kt
index 7196a7e..13f706b 100644
--- a/app/src/main/java/app/olauncher/MainViewModel.kt
+++ b/app/src/main/java/app/olauncher/MainViewModel.kt
@@ -62,7 +62,8 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
val showDialog = SingleLiveEvent<String>()
val checkForMessages = SingleLiveEvent<Unit?>()
val resetLauncherLiveData = SingleLiveEvent<Unit?>()
- val showRecentApps = SingleLiveEvent<Unit?>()
+ // Home button for recents feature disabled
+ // val showRecentApps = SingleLiveEvent<Unit?>()
fun selectedApp(appModel: AppModel, flag: Int) {
if (appModel is AppModel.PrivateSpaceHeader) return
diff --git a/app/src/main/java/app/olauncher/data/Prefs.kt b/app/src/main/java/app/olauncher/data/Prefs.kt
index 23a839e..efe93bb 100644
--- a/app/src/main/java/app/olauncher/data/Prefs.kt
+++ b/app/src/main/java/app/olauncher/data/Prefs.kt
@@ -42,7 +42,8 @@ class Prefs(context: Context) {
private val SCREEN_TIME_LAST_UPDATED = "SCREEN_TIME_LAST_UPDATED"
private val LAUNCHER_RESTART_TIMESTAMP = "LAUNCHER_RECREATE_TIMESTAMP"
private val SHOWN_ON_DAY_OF_YEAR = "SHOWN_ON_DAY_OF_YEAR"
- private val HOME_BUTTON_SHOW_RECENTS = "HOME_BUTTON_SHOW_RECENTS"
+ // Home button for recents feature disabled
+ // private val HOME_BUTTON_SHOW_RECENTS = "HOME_BUTTON_SHOW_RECENTS"
private val APP_NAME_1 = "APP_NAME_1"
private val APP_NAME_2 = "APP_NAME_2"
@@ -219,9 +220,10 @@ class Prefs(context: Context) {
get() = prefs.getInt(SHOWN_ON_DAY_OF_YEAR, 0)
set(value) = prefs.edit { putInt(SHOWN_ON_DAY_OF_YEAR, value).apply() }
- var homeButtonShowRecents: Boolean
- get() = prefs.getBoolean(HOME_BUTTON_SHOW_RECENTS, false)
- set(value) = prefs.edit { putBoolean(HOME_BUTTON_SHOW_RECENTS, value).apply() }
+ // Home button for recents feature disabled
+ // var homeButtonShowRecents: Boolean
+ // get() = prefs.getBoolean(HOME_BUTTON_SHOW_RECENTS, false)
+ // set(value) = prefs.edit { putBoolean(HOME_BUTTON_SHOW_RECENTS, value).apply() }
var hiddenApps: MutableSet<String>
get() = prefs.getStringSet(HIDDEN_APPS, mutableSetOf()) as MutableSet<String>
diff --git a/app/src/main/java/app/olauncher/helper/MyAccessibilityService.kt b/app/src/main/java/app/olauncher/helper/MyAccessibilityService.kt
index bdcc8c0..92e522f 100644
--- a/app/src/main/java/app/olauncher/helper/MyAccessibilityService.kt
+++ b/app/src/main/java/app/olauncher/helper/MyAccessibilityService.kt
@@ -29,9 +29,10 @@ class MyAccessibilityService : AccessibilityService() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P)
performGlobalAction(GLOBAL_ACTION_LOCK_SCREEN)
}
- getString(R.string.recents_layout_description) -> {
- performGlobalAction(GLOBAL_ACTION_RECENTS)
- }
+ // Home button for recents feature disabled
+ // getString(R.string.recents_layout_description) -> {
+ // performGlobalAction(GLOBAL_ACTION_RECENTS)
+ // }
}
} catch (e: Exception) {
return
diff --git a/app/src/main/java/app/olauncher/ui/HomeFragment.kt b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
index ef7620b..80061c3 100644
--- a/app/src/main/java/app/olauncher/ui/HomeFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/HomeFragment.kt
@@ -90,7 +90,8 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
override fun onClick(view: View) {
when (view.id) {
R.id.lock -> {}
- R.id.recents -> {}
+ // Home button for recents feature disabled
+ // R.id.recents -> {}
R.id.clock -> openClockApp()
R.id.date -> openCalendarApp()
R.id.setDefaultLauncher -> viewModel.resetLauncherLiveData.call()
@@ -204,9 +205,10 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
viewModel.screenTimeValue.observe(viewLifecycleOwner) {
it?.let { binding.tvScreenTime.text = it }
}
- viewModel.showRecentApps.observe(viewLifecycleOwner) {
- binding.recents.performClick()
- }
+ // Home button for recents feature disabled
+ // viewModel.showRecentApps.observe(viewLifecycleOwner) {
+ // binding.recents.performClick()
+ // }
}
private fun initSwipeTouchListener() {
@@ -224,7 +226,8 @@ class HomeFragment : Fragment(), View.OnClickListener, View.OnLongClickListener
private fun initClickListeners() {
binding.lock.setOnClickListener(this)
- binding.recents.setOnClickListener(this)
+ // Home button for recents feature disabled
+ // binding.recents.setOnClickListener(this)
binding.clock.setOnClickListener(this)
binding.date.setOnClickListener(this)
binding.clock.setOnLongClickListener(this)
diff --git a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
index 94ea7e4..a9c70e2 100644
--- a/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
+++ b/app/src/main/java/app/olauncher/ui/SettingsFragment.kt
@@ -77,7 +77,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
populateKeyboardText()
populateScreenTimeOnOff()
populateLockSettings()
- populateHomeButtonRecents()
+ // Home button for recents feature disabled
+ // populateHomeButtonRecents()
populateWallpaperText()
populateAppThemeText()
populateTextSize()
@@ -117,7 +118,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
R.id.appInfo -> openAppInfo(requireContext(), Process.myUserHandle(), BuildConfig.APPLICATION_ID)
R.id.setLauncher -> viewModel.resetLauncherLiveData.call()
R.id.toggleLock -> toggleLockMode()
- R.id.homeButtonRecents -> toggleHomeButtonRecents()
+ // Home button for recents feature disabled
+ // R.id.homeButtonRecents -> toggleHomeButtonRecents()
R.id.autoShowKeyboard -> toggleKeyboardText()
R.id.homeAppsNum -> binding.appsNumSelectLayout.visibility = View.VISIBLE
R.id.dailyWallpaperUrl -> requireContext().openUrl(prefs.dailyWallpaperUrl)
@@ -216,7 +218,8 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
binding.moreFeatures.setOnClickListener(this)
binding.autoShowKeyboard.setOnClickListener(this)
binding.toggleLock.setOnClickListener(this)
- binding.homeButtonRecents.setOnClickListener(this)
+ // Home button for recents feature disabled
+ // binding.homeButtonRecents.setOnClickListener(this)
binding.homeAppsNum.setOnClickListener(this)
binding.screenTimeOnOff.setOnClickListener(this)
binding.dailyWallpaperUrl.setOnClickListener(this)
@@ -590,21 +593,22 @@ class SettingsFragment : Fragment(), View.OnClickListener, View.OnLongClickListe
else getString(R.string.bottom_off)
}
- private fun toggleHomeButtonRecents() {
- if (!prefs.homeButtonShowRecents && !isAccessServiceEnabled(requireContext())) {
- toggleAccessibilityVisibility(true)
- return
- }
- prefs.homeButtonShowRecents = !prefs.homeButtonShowRecents
- populateHomeButtonRecents()
- }
-
- private fun populateHomeButtonRecents() {
- binding.homeButtonRecents.text = getString(
- if (prefs.homeButtonShowRecents && isAccessServiceEnabled(requireContext())) R.string.on
- else R.string.off
- )
- }
+ // Home button for recents feature disabled
+ // private fun toggleHomeButtonRecents() {
+ // if (!prefs.homeButtonShowRecents && !isAccessServiceEnabled(requireContext())) {
+ // toggleAccessibilityVisibility(true)
+ // return
+ // }
+ // prefs.homeButtonShowRecents = !prefs.homeButtonShowRecents
+ // populateHomeButtonRecents()
+ // }
+
+ // private fun populateHomeButtonRecents() {
+ // binding.homeButtonRecents.text = getString(
+ // if (prefs.homeButtonShowRecents && isAccessServiceEnabled(requireContext())) R.string.on
+ // else R.string.off
+ // )
+ // }
private fun populateLockSettings() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml
index ad48c44..5c08cc9 100644
--- a/app/src/main/res/layout-land/fragment_home.xml
+++ b/app/src/main/res/layout-land/fragment_home.xml
@@ -15,12 +15,13 @@
android:layout_height="1dp"
android:contentDescription="@string/lock_layout_description" />
- <!-- Placeholder layout for showing recent apps-->
+ <!-- Home button for recents feature disabled -->
+ <!-- Placeholder layout for showing recent apps
<FrameLayout
android:id="@+id/recents"
android:layout_width="match_parent"
android:layout_height="1dp"
- android:contentDescription="@string/recents_layout_description" />
+ android:contentDescription="@string/recents_layout_description" /> -->
<!-- Clock and calendar-->
<LinearLayout
diff --git a/app/src/main/res/layout-land/fragment_settings.xml b/app/src/main/res/layout-land/fragment_settings.xml
index 895993f..80c0e2e 100644
--- a/app/src/main/res/layout-land/fragment_settings.xml
+++ b/app/src/main/res/layout-land/fragment_settings.xml
@@ -888,6 +888,7 @@
android:text="@string/off" />
</FrameLayout>
+ <!-- Home button for recents feature disabled
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -912,6 +913,7 @@
android:padding="10dp"
android:text="@string/off" />
</FrameLayout>
+ -->
</LinearLayout>
<LinearLayout
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index c1dd3de..385532e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -15,12 +15,13 @@
android:layout_height="1dp"
android:contentDescription="@string/lock_layout_description" />
- <!-- Placeholder layout for showing recent apps-->
+ <!-- Home button for recents feature disabled -->
+ <!-- Placeholder layout for showing recent apps
<FrameLayout
android:id="@+id/recents"
android:layout_width="match_parent"
android:layout_height="1dp"
- android:contentDescription="@string/recents_layout_description" />
+ android:contentDescription="@string/recents_layout_description" /> -->
<!-- Clock and calendar-->
<LinearLayout
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index f73549f..017a38f 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -915,6 +915,7 @@
android:text="@string/off" />
</FrameLayout>
+ <!-- Home button for recents feature disabled
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -940,6 +941,7 @@
android:padding="10dp"
android:text="@string/off" />
</FrameLayout>
+ -->
</LinearLayout>
<LinearLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8378c24..a05099d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -2,7 +2,8 @@
<string name="app_name" translatable="false">Olauncher</string>
<string name="github" translatable="false">Github</string>
<string name="lock_layout_description" translatable="false">lock layout description to be used a unique id to lock screen</string>
- <string name="recents_layout_description" translatable="false">recents layout description to be used a unique id to show recent apps</string>
+ <!-- Home button for recents feature disabled -->
+ <!-- <string name="recents_layout_description" translatable="false">recents layout description to be used a unique id to show recent apps</string> -->
<string name="olauncher_pro" translatable="false">Olauncher Pro</string>
<string name="digital_minimalism" translatable="false"><u>Digital Minimalism</u></string>
<string name="new_app_note_safe" translatable="false"><u>Note to Self</u>\n<sub><small>(Ad-Free)</small></sub></string>
@@ -29,7 +30,8 @@
<string name="set_as_default_launcher_first">Set Olauncher default first</string>
<string name="app_text_color">Text color</string>
<string name="double_tap_to_lock_screen">Double tap to lock</string>
- <string name="home_button_show_recents">Home button for recents</string>
+ <!-- Home button for recents feature disabled -->
+ <!-- <string name="home_button_show_recents">Home button for recents</string> -->
<string name="admin_permission_message">Olauncher promises to use the accessibility permission responsibly. Olauncher does not collect or share any data.</string>
<string name="about">About</string>
<string name="off">Off</string>
generated by cgit v1.2.1 (git 2.18.0) at 2026-08-29 21:24:39 +0000