diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt index 5063b4f..eca175f 100644 --- a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt @@ -1,7 +1,10 @@ package com.finnmglas.launcher -import android.content.* +import android.content.Context +import android.content.Intent +import android.content.SharedPreferences import android.os.Bundle +import android.provider.Settings import android.view.View import android.view.WindowManager import androidx.appcompat.app.AppCompatActivity @@ -41,9 +44,10 @@ class SettingsActivity : AppCompatActivity() { // As older APIs somehow do not recognize the xml defined onClick activity_settings_close.setOnClickListener() { finish() } + // open device settings (see https://stackoverflow.com/a/62092663/12787264) activity_settings_device_settings.setOnClickListener { intendedSettingsPause = true - startActivityForResult(Intent(android.provider.Settings.ACTION_SETTINGS), 0) + startActivity(Intent(Settings.ACTION_SETTINGS)) } } diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt index 2a02527..b49249f 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/actions/ActionsRecyclerAdapter.kt @@ -87,14 +87,14 @@ class ActionsRecyclerAdapter(val activity: Activity): init { actionsList = ArrayList() - actionsList.add(ActionInfo("Swipe Up","upApp", upApp)) - actionsList.add(ActionInfo("Swipe Down","downApp", downApp)) - actionsList.add(ActionInfo("Swipe Left", "leftApp", leftApp)) - actionsList.add(ActionInfo("Swipe Right", "rightApp", rightApp)) - actionsList.add(ActionInfo("Volume Up", "volumeUpApp", volumeUpApp)) - actionsList.add(ActionInfo("Volume Down", "volumeDownApp", volumeDownApp)) - actionsList.add(ActionInfo("Double Click", "doubleClickApp", doubleClickApp)) - actionsList.add(ActionInfo("Long Click", "longClickApp", longClickApp)) + actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_up),"upApp", upApp)) + actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_down),"downApp", downApp)) + actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_left), "leftApp", leftApp)) + actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_right), "rightApp", rightApp)) + actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_vol_up), "volumeUpApp", volumeUpApp)) + actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_vol_down), "volumeDownApp", volumeDownApp)) + actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_double_click), "doubleClickApp", doubleClickApp)) + actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_long_click), "longClickApp", longClickApp)) } /* */