diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt index 58bdaa7e..d82090c3 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt @@ -342,7 +342,7 @@ class CallActivity : SimpleActivity() { } private fun initProximitySensor() { - if (proximityWakeLock == null || proximityWakeLock?.isHeld == false) { + if (!config.disableProximitySensor && (proximityWakeLock == null || proximityWakeLock?.isHeld == false)) { val powerManager = getSystemService(Context.POWER_SERVICE) as PowerManager proximityWakeLock = powerManager.newWakeLock(PowerManager.PROXIMITY_SCREEN_OFF_WAKE_LOCK, "com.simplemobiletools.dialer.pro:wake_lock") proximityWakeLock!!.acquire(10 * MINUTE_SECONDS * 1000L) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt index ef36f2f5..12ff15f0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt @@ -37,6 +37,7 @@ class SettingsActivity : SimpleActivity() { setupGroupSubsequentCalls() setupStartNameWithSurname() setupShowCallConfirmation() + setupDisableProximitySensor() updateTextColors(settings_holder) invalidateOptionsMenu() } @@ -169,4 +170,12 @@ class SettingsActivity : SimpleActivity() { config.showCallConfirmation = settings_show_call_confirmation.isChecked } } + + private fun setupDisableProximitySensor() { + settings_disable_proximity_sensor.isChecked = config.disableProximitySensor + settings_disable_proximity_sensor_holder.setOnClickListener { + settings_disable_proximity_sensor.toggle() + config.disableProximitySensor = settings_disable_proximity_sensor.isChecked + } + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt index e6960463..a57542fd 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt @@ -47,4 +47,8 @@ class Config(context: Context) : BaseConfig(context) { var openDialPadAtLaunch: Boolean get() = prefs.getBoolean(OPEN_DIAL_PAD_AT_LAUNCH, false) set(openDialPad) = prefs.edit().putBoolean(OPEN_DIAL_PAD_AT_LAUNCH, openDialPad).apply() + + var disableProximitySensor: Boolean + get() = prefs.getBoolean(DISABLE_PROXIMITY_SENSOR, false) + set(disableProximitySensor) = prefs.edit().putBoolean(DISABLE_PROXIMITY_SENSOR, disableProximitySensor).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt index d2550922..e95c34b6 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt @@ -5,6 +5,7 @@ const val SPEED_DIAL = "speed_dial" const val REMEMBER_SIM_PREFIX = "remember_sim_" const val GROUP_SUBSEQUENT_CALLS = "group_subsequent_calls" const val OPEN_DIAL_PAD_AT_LAUNCH = "open_dial_pad_at_launch" +const val DISABLE_PROXIMITY_SENSOR = "disable_proximity_sensor" const val CONTACTS_TAB_MASK = 1 const val FAVORITES_TAB_MASK = 2 diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index d168de50..171b6563 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -294,5 +294,28 @@ app:switchPadding="@dimen/medium_margin" /> + + + + + + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 1487dbe2..9ab7577d 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -41,6 +41,7 @@ Seskupte další hovory se stejným číslem v protokolu hovorů Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 23e326c4..83d87e3e 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -41,6 +41,7 @@ In der Anrufliste aufeinanderfolgende Anrufe mit derselben Nummer gruppieren Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 0ae902eb..adbebb22 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -41,6 +41,7 @@ Ομαδοποίηση των επόμενων κλήσεων του ίδιου αριθμού στο αρχείο καταγραφής κλήσεων Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 86dc051b..5eec114a 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -41,6 +41,7 @@ Agrupar llamadas subsecuentes con el mísmo número en el registro de llamadas Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 9784604d..87ebb776 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -41,6 +41,7 @@ Ryhmitä saman numeron peräkkäiset puhelut puheluhistoriassa Avaa numeronäppäimistö, kun sovellus avataan + Disable proximity sensor during calls diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 72d9fa08..931c6f8b 100755 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -41,6 +41,7 @@ Regrouper les appels suivants avec le même numéro dans le journal des appels Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 7233bb0d..e932caa7 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -41,6 +41,7 @@ Agrupar, no rexisto, as chamadas para o mesmo contacto Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index d073e6dd..cd294733 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -41,6 +41,7 @@ Kelompokkan panggilan berikutnya dengan nomor yang sama di log panggilan Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index f95c32dd..4eb48ca1 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -41,6 +41,7 @@ Raggruppa chiamate successive con lo stesso numero nel registro delle chiamate Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index 110afd14..3220b040 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -41,6 +41,7 @@ 後続の通話をコールログの同じ番号でグループ化する Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index d14521c7..c2a49859 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -41,6 +41,7 @@ കോൾ ലോഗിൽ അതേ നമ്പറുള്ള കോളുകൾ ഗ്രൂപ്പുചെയ്യുക Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 09d5bb10..fb2c3042 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -41,6 +41,7 @@ Oproepgeschiedenis: opeenvolgende items van hetzelfde nummer groeperen Standaard het toetsenblok openen bij starten + Disable proximity sensor during callsv diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 2a41b349..7d666b2d 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -41,6 +41,7 @@ Grupuj kolejne połączenia z tym samym numerem w rejestrze połączeń Otwieraj domyślnie panel wybierania przy uruchomieniu aplikacji + Disable proximity sensor during calls diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index c6bbda37..b5e53e52 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -41,6 +41,7 @@ Agrupar, no registo, as chamadas para o mesmo contacto Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 69e8f93f..3346770b 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -41,6 +41,7 @@ Группировать последующие вызовы с тем же номером в журнале вызовов По умолчанию открывать номеронабиратель при запуске приложения + Disable proximity sensor during calls diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index eb21df24..ba7f1a45 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -41,6 +41,7 @@ Zoskupiť susedné volania s rovnakým číslom v histórií volaní Otvoriť číselník po spustení apky + Vypnúť počas hovorov senzor priblíženia diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index b81fb23e..f678cff3 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -41,6 +41,7 @@ Gruppera samtal till och från samma nummer i samtalshistoriken Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f0cdf946..7c07c763 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -41,6 +41,7 @@ Arama kaydında aynı numaraya sahip sonraki aramaları gruplandır Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index d901aff2..842e549b 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -41,6 +41,7 @@ Group subsequent calls with the same number at the call log Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 85db86eb..14a7e374 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -41,6 +41,7 @@ 在通话记录中将同一号码的后续呼叫合并为一组 Open the dialpad by default when the app opens + Disable proximity sensor during calls diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1881fc1a..fcd79ba1 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,6 +41,7 @@ Group subsequent calls with the same number at the call log Open the dialpad by default when the app opens + Disable proximity sensor during calls