diff --git a/app/src/main/java/com/jens/automation2/ActivityManageRule.java b/app/src/main/java/com/jens/automation2/ActivityManageRule.java index aa4cd1ae..be07bf27 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageRule.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageRule.java @@ -731,13 +731,15 @@ public class ActivityManageRule extends Activity } else if(triggerType == Trigger_Enum.bluetoothConnection) { - if(!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) - Miscellaneous.messageBox("Bluetooth", getResources().getString(R.string.deviceDoesNotHaveBluetooth), ActivityManageRule.this).show();; +// if(!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) +// //Miscellaneous.messageBox("Bluetooth", getResources().getString(R.string.deviceDoesNotHaveBluetooth), ActivityManageRule.this).show(); +// Toast.makeText(ActivityManageRule.this, getResources().getString(R.string.deviceDoesNotHaveBluetooth), Toast.LENGTH_LONG).show(); newTrigger.setTriggerType(Trigger_Enum.bluetoothConnection); ActivityManageTriggerBluetooth.editedBluetoothTrigger = newTrigger; Intent bluetoothEditor = new Intent(myContext, ActivityManageTriggerBluetooth.class); startActivityForResult(bluetoothEditor, requestCodeTriggerBluetoothAdd); + return; } else if(triggerType == Trigger_Enum.screenState) diff --git a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java index dba114e7..20db4704 100644 --- a/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java +++ b/app/src/main/java/com/jens/automation2/ActivityManageTriggerBluetooth.java @@ -2,6 +2,7 @@ package com.jens.automation2; import android.app.Activity; import android.bluetooth.BluetoothDevice; +import android.content.pm.PackageManager; import android.os.Bundle; import android.util.Log; import android.view.View; @@ -12,6 +13,7 @@ import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.RadioButton; import android.widget.Spinner; +import android.widget.TextView; import android.widget.Toast; import com.jens.automation2.receivers.BluetoothReceiver; @@ -22,6 +24,7 @@ public class ActivityManageTriggerBluetooth extends Activity RadioButton radioAnyBluetoothDevice, radioNoDevice, radioDeviceFromList, radioBluetoothConnected, radioBluetoothDisconnected, radioBluetoothInRange, radioBluetoothOutRange; Button bSaveBluetoothTrigger; Spinner spinnerBluetoothDevices; + TextView tvBluetoothNotPresentNotice; ArrayAdapter bluetoothDevicesSpinnerAdapter; @@ -40,9 +43,15 @@ public class ActivityManageTriggerBluetooth extends Activity radioBluetoothOutRange = (RadioButton)findViewById(R.id.radioBluetoothOutRange); bSaveBluetoothTrigger = (Button)findViewById(R.id.bSaveBluetoothTrigger); spinnerBluetoothDevices = (Spinner)findViewById(R.id.spinnerBluetoothDevices); + tvBluetoothNotPresentNotice = (TextView)findViewById(R.id.tvBluetoothNotPresentNotice); bluetoothDevicesSpinnerAdapter = new ArrayAdapter(this, R.layout.text_view_for_poi_listview_mediumtextsize, BluetoothReceiver.getAllPairedBluetoothDevicesStrings()); - + + if(!getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)) + tvBluetoothNotPresentNotice.setVisibility(View.VISIBLE); + else + tvBluetoothNotPresentNotice.setVisibility(View.GONE); + radioDeviceFromList.setOnCheckedChangeListener(new OnCheckedChangeListener() { @Override diff --git a/app/src/main/res/layout/activity_manage_trigger_bluetooth.xml b/app/src/main/res/layout/activity_manage_trigger_bluetooth.xml index 11792c58..63519752 100644 --- a/app/src/main/res/layout/activity_manage_trigger_bluetooth.xml +++ b/app/src/main/res/layout/activity_manage_trigger_bluetooth.xml @@ -29,6 +29,14 @@ android:layout_height="match_parent" android:orientation="vertical" android:layout_margin="10dp" > + + Benachrichtigung(en) schließen Groß-/Kleinschreibung ist egal. Wenn Sie keine Kriterien angeben, werden ALLE Benachrichtigungen geschlossen. Es wird also empfohlen, zumindest eine Anwendung zu spezifizieren und/oder Titel oder Text anzugeben. - Die Einstellungen, die Sie hier vornehmen, können dazu führen, dass Sie bestimmte Dinge auf Ihrem Telefon nicht mehr mitbekommen. Sie können sogar Ihren Wecker zum Schweigen bringen. Was auch immer Sie hier einstellen - es wird empfohlen, es zu testen. + Die Einstellungen, die Sie hier vornehmen, können dazu führen, dass Sie bestimmte Dinge auf Ihrem Telefon nicht mehr mitbekommen. Sie können sogar Ihren Wecker zum Schweigen bringen. Was auch immer Sie hier einstellen - es wird empfohlen, daß Sie es testen - auch nach Android Updates. falls Bitte wählen Sie eine Aktion! Medien steuern diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 5f4decbd..f1fdbb4b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -666,7 +666,7 @@ Si no especifica ningún criterio, esta acción cerrará TODAS las notificaciones. Por lo tanto, se recomienda al menos especificar criterios para al menos 1 de la aplicación, título o texto. Cerrar notificación(es) Las comparaciones se realizan sin distinción de mayúsculas y minúsculas - La configuración que realice aquí puede hacer que ya no note ciertas cosas de su teléfono. Incluso puede silenciar su alarma de despertar. Así que hagas lo que hagas, se recomienda que lo pruebes. + La configuración que realice aquí puede hacer que ya no note ciertas cosas de su teléfono. Incluso puede silenciar su alarma de despertar. Así que hagas lo que hagas, se recomienda que lo pruebe - tambien despues upgrades de Android. si encendido apagado diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8c0d1dab..a4a87958 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -667,7 +667,7 @@ I confronti non distinguono fra maiuscole e minuscole Chiudi notifica(e) Se non specifichi alcun criterio, questa azione chiuderà TUTTE le notifiche. Quindi si consiglia di specificare almeno i criteri per almeno una applicazione, titolo o testo. - Le impostazioni che modifichi in questa sezione possono far sì che tu non possa più notare certe cose dal tuo telefono. Possono perfino silenziare la sveglia. Quindi, qualunque cosa tu faccia, ti consigliamo di provarlo. + Le impostazioni che modifichi in questa sezione possono far sì che tu non possa più notare certe cose dal tuo telefono. Possono perfino silenziare la sveglia. Quindi, qualunque cosa tu faccia, ti consigliamo di provarlo - anche dopo gli aggiornamenti di Android. se Tieni presente che questa azione potrebbe non funzionare con TUTTI i lettori là fuori. E anche se lo facesse, non tutti i pulsanti funzionerebbero necessariamente. Si prega di selezionare un\'azione! diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 18e85b76..2100fe57 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -665,7 +665,7 @@ Als u geen criteria opgeeft, worden met deze actie ALLE meldingen gesloten. Het is dus aan te raden om in ieder geval criteria te specificeren voor minimaal 1 van de toepassing, titel of tekst. Melding(en) sluiten Vergelijkingen worden gedaan case-INsensitief - De instellingen die je hier maakt kunnen ervoor zorgen dat je bepaalde dingen niet meer van je telefoon merkt. Ze kunnen zelfs je wekker dempen. Dus wat je ook doet - het wordt aanbevolen om het te testen. + De instellingen die je hier maakt kunnen ervoor zorgen dat je bepaalde dingen niet meer van je telefoon merkt. Ze kunnen zelfs je wekker dempen. Dus wat je ook doet - het wordt aanbevolen om het te testen - ook na Android upgrades. als E-mail is mijn favoriete contactmethode om bugs te melden, vragen te stellen of voorstellen te doen. Ga naar het controlecentrum voor meer informatie. Controlecentrum diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f3de4649..c94df43d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -764,7 +764,7 @@ If you don\'t specify any criteria this action will close ALL notifications. So it\'s advised to at least specify criteria for at least 1 of application, title or text. Close notification(s) Comparisons are done case-INsensitive - The settings you can adjust here, can cause that you don\'t notice certain things from your phone anymore. They may even silence your wakeup alarm. So whatever you do - it is recommended you test it. + The settings you can adjust here, can cause that you don\'t notice certain things from your phone anymore. They may even silence your wakeup alarm. So whatever you do - it is highly recommended that you test it - also after Android updates. if Email is my preferred method of contact to report bugs, ask questions or make proposals. Go to control center to learn more. Control center