This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git commit 0e31766c6d119eb5b153e18231a7b8bc109e9498 Merge: be3d3ea 52863d2 Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 13:19:49 2014 +0100 Merge branch 'feature/notification' into develop Conflicts: AndroidManifest.xml res/values-fr/strings.xml res/values/preference_keys.xml res/values/strings.xml src/org/chorem/android/saymytexts/SayMyTextService.java src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java res/values/preference_keys.xml | 4 ++++ res/values/strings.xml | 4 ++++ res/xml/preferences.xml | 6 ++++++ .../broadcastreceiver/BootCompletedBroadcastReceiver.java | 3 +++ .../broadcastreceiver/DeviceConnectionBroadcastReceiver.java | 3 ++- .../saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java | 3 +++ .../saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java | 6 ++++++ .../broadcastreceiver/SayNextActionBroadcastReceiver.java | 3 +++ 8 files changed, 31 insertions(+), 1 deletion(-) diff --cc res/values/preference_keys.xml index 2699a03,8d1d145..f4da704 --- a/res/values/preference_keys.xml +++ b/res/values/preference_keys.xml @@@ -4,6 -4,7 +4,10 @@@ <string name="preference_enable_interaction_key">enable_interaction</string> <string name="preference_enable_heisendroid_mode_key">enable_heisendroid_mode</string> <string name="preference_voice_recognizer_max_attempt_number_key">preference_voice_recognizer_max_attempt_number</string> ++<<<<<<< HEAD ++======= + <string name="preference_block_equals_sms_key">preference_block_equals_sms_key</string> ++>>>>>>> feature/notification <string name="preference_notifications_key">preference_notifications_key</string> <string name="preference_test_sms_key">test_sms</string> <string name="preference_version_key">version</string> diff --cc res/values/strings.xml index 7418b21,ee60071..a572357 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@@ -14,6 -14,7 +14,10 @@@ <string name="preference_enable_interaction_sublabel">call or answer</string> <string name="preference_voice_recognizer_max_attempt_number_label">Maximum attempt number</string> <string name="preference_enable_heisendroid_mode_label">Heisendroid mode</string> ++<<<<<<< HEAD ++======= + <string name="preference_block_equals_sms_label">Block the \"=\" SMS</string> ++>>>>>>> feature/notification <string name="preference_notifications_label">Notifications</string> <string name="preference_test_sms_label">Test by sending an SMS to myself</string> <string name="test_sms_content">Heisendroïd</string> diff --cc res/xml/preferences.xml index b4077e3,2b6b03e..18f2bf8 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@@ -24,10 -24,14 +24,16 @@@ android:title="@string/preference_enable_heisendroid_mode_label" android:defaultValue="false"/> - <SwitchPreference android:key="@string/preference_block_equals_sms_key" - android:title="@string/preference_block_equals_sms_label" - android:defaultValue="false"/> + <ListPreference android:key="@string/preference_notifications_key" + android:title="@string/preference_notifications_label" + android:entries="@array/preferences_notifications_entries" + android:entryValues="@array/preferences_notifications_values" ++ android:defaultValue="cancelable"/> + + <ListPreference android:key="@string/preference_notifications_key" + android:title="@string/preference_notifications_label" + android:entries="@array/preferences_notifications_entries" + android:entryValues="@array/preferences_notifications_values" android:defaultValue="cancelable"/> <Preference android:key="@string/preference_test_sms_key" diff --cc src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java index 554c636,3c227e0..fc58548 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java @@@ -1,29 -1,5 +1,32 @@@ package org.chorem.android.saymytexts.broadcastreceiver; ++<<<<<<< HEAD +/* + * #%L + * Say My Texts + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + ++======= ++>>>>>>> feature/notification import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; diff --cc src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java index ec459b3,4a1810e..65996eb --- a/src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java @@@ -1,37 -1,12 +1,38 @@@ package org.chorem.android.saymytexts.broadcastreceiver; ++import android.content.Intent; ++ +/* + * #%L + * Say My Texts + * $Id:$ + * $HeadURL:$ + * %% + * Copyright (C) 2014 Code Lutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + import android.bluetooth.BluetoothClass; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.Context; --import android.content.Intent; import android.util.Log; import org.chorem.android.saymytexts.SayMyTextService; +import org.chorem.android.saymytexts.SayMyTextsApplication; /** * @author Kevin Morin (Code Lutin) diff --cc src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java index cc1ea31,0916722..2e160a9 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java @@@ -36,7 -36,6 +36,10 @@@ import android.speech.SpeechRecognizer import android.util.Log; import org.chorem.android.saymytexts.SMS; import org.chorem.android.saymytexts.SayMyTextService; ++<<<<<<< HEAD:src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java +import org.chorem.android.saymytexts.SayMyTextsApplication; ++======= ++>>>>>>> feature/notification:src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java import java.util.List; diff --cc src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java index 51ab4c8,f4f3867..54b4426 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java @@@ -35,9 -37,9 +35,15 @@@ import android.provider.BaseColumns import android.provider.ContactsContract; import android.telephony.SmsMessage; import android.util.Log; ++<<<<<<< HEAD:src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java +import org.chorem.android.saymytexts.SMS; +import org.chorem.android.saymytexts.SayMyTextService; +import org.chorem.android.saymytexts.SayMyTextsApplication; ++======= + import org.chorem.android.saymytexts.R; + import org.chorem.android.saymytexts.SMS; + import org.chorem.android.saymytexts.SayMyTextService; ++>>>>>>> feature/notification:src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java /** * Receives the SMSs and if the headset is plugged, start the service to say it out loud. diff --cc src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java index 3e146fc,c2d2970..c6e7ac6 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java @@@ -40,7 -40,6 +40,10 @@@ import android.util.Log import org.chorem.android.saymytexts.R; import org.chorem.android.saymytexts.SMS; import org.chorem.android.saymytexts.SayMyTextService; ++<<<<<<< HEAD:src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java +import org.chorem.android.saymytexts.SayMyTextsApplication; ++======= ++>>>>>>> feature/notification:src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java import java.util.List; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.