branch develop updated (d8e912b -> 8c00081)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository say-my-texts. See http://git.chorem.org/say-my-texts.git from d8e912b refs #1103 Change the style of the app new 8350d8c typo new 255339e typo + drawables new 78a007c add languages new 6f7a5fb upgrade android build version + plugin new 32b1f14 move folders new be3d3ea configure plugin new ba1a24f refs #1055 Add a notification when SayMyTexts is active new 52863d2 refs #1055 Add a notification when SayMyTexts is active new 0e31766 Merge branch 'feature/notification' into develop new 8c00081 merge The 10 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 8c00081cb2f66bcb668494b6b0a86df07a949d35 Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 13:20:54 2014 +0100 merge 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 commit be3d3ea376f0265304ba01d9fcb4e8d1c1c28111 Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 13:04:59 2014 +0100 configure plugin commit 32b1f143193abb9a4c8da0e60fd7d4a66ff7ba6a Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 12:51:31 2014 +0100 move folders commit 6f7a5fb6aa6f451e976c22d6a3aaaabc13f3c831 Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 12:35:11 2014 +0100 upgrade android build version + plugin commit 78a007cfb2cfd4db16adc0c0010b332bbd0d0372 Author: Kevin Morin <morin@codelutin.com> Date: Sat Dec 20 22:31:21 2014 +0100 add languages commit 255339e7a354c71e02d43f6e31d6d33d925fb3d0 Author: Kevin Morin <morin@codelutin.com> Date: Sat Dec 20 22:12:45 2014 +0100 typo + drawables commit 8350d8c97598670a212c5702806b59605a214358 Author: Kevin Morin <morin@codelutin.com> Date: Sat Dec 20 22:11:55 2014 +0100 typo commit 52863d224abdc97a355650cf1a63e8c58d8b7345 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 27 23:38:18 2014 +0200 refs #1055 Add a notification when SayMyTexts is active commit ba1a24f45ae48ce244b0f4692dfabf2739f4b2e6 Author: Kevin Morin <morin@codelutin.com> Date: Thu Aug 21 23:56:47 2014 +0200 refs #1055 Add a notification when SayMyTexts is active Summary of changes: .gitignore | 13 +++++ pom.xml | 53 ++++++++------------- res/drawable-hdpi/ic_stat_heisendroid.png | Bin 0 -> 1099 bytes .../ic_stat_heisendroid.png | Bin res/drawable-xhdpi/ic_stat_heisendroid.png | Bin 0 -> 1481 bytes res/drawable-xxhdpi/ic_stat_heisendroid.png | Bin 0 -> 2323 bytes res/values-de/arrays.xml | 15 ++++++ res/values-de/strings.xml | 47 ++++++++++++++++++ res/values-hu/arrays.xml | 15 ++++++ res/values-hu/strings.xml | 49 +++++++++++++++++++ res/values-it/arrays.xml | 15 ++++++ res/values-it/strings.xml | 45 +++++++++++++++++ res/values-pl/arrays.xml | 15 ++++++ res/values-pl/strings.xml | 45 +++++++++++++++++ res/values-pt-rBR/arrays.xml | 15 ++++++ res/values-pt-rBR/strings.xml | 49 +++++++++++++++++++ res/values-pt-rPT/arrays.xml | 15 ++++++ res/values-pt-rPT/strings.xml | 49 +++++++++++++++++++ res/values/preference_keys.xml | 4 ++ res/values/strings.xml | 8 +++- res/xml/preferences.xml | 6 +++ .../DeviceConnectionBroadcastReceiver.java | 3 +- 22 files changed, 425 insertions(+), 36 deletions(-) create mode 100644 .gitignore create mode 100644 res/drawable-hdpi/ic_stat_heisendroid.png copy res/{drawable => drawable-mdpi}/ic_stat_heisendroid.png (100%) create mode 100644 res/drawable-xhdpi/ic_stat_heisendroid.png create mode 100644 res/drawable-xxhdpi/ic_stat_heisendroid.png create mode 100644 res/values-de/arrays.xml create mode 100644 res/values-de/strings.xml create mode 100644 res/values-hu/arrays.xml create mode 100644 res/values-hu/strings.xml create mode 100644 res/values-it/arrays.xml create mode 100644 res/values-it/strings.xml create mode 100644 res/values-pl/arrays.xml create mode 100644 res/values-pl/strings.xml create mode 100644 res/values-pt-rBR/arrays.xml create mode 100644 res/values-pt-rBR/strings.xml create mode 100644 res/values-pt-rPT/arrays.xml create mode 100644 res/values-pt-rPT/strings.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 ba1a24f45ae48ce244b0f4692dfabf2739f4b2e6 Author: Kevin Morin <morin@codelutin.com> Date: Thu Aug 21 23:56:47 2014 +0200 refs #1055 Add a notification when SayMyTexts is active --- AndroidManifest.xml | 21 +- res/values-fr/strings.xml | 7 + res/values/strings.xml | 7 + .../android/saymytexts/SayMyTextService.java | 272 +++++++++++++-------- .../android/saymytexts/SettingsActivity.java | 6 +- .../BootCompletedBroadcastReceiver.java | 24 ++ .../DeviceConnectionBroadcastReceiver.java | 56 +++++ .../DictateSmsBroadcastReceiver.java | 4 +- .../NewTextBroadcastReceiver.java | 31 +-- .../SayNextActionBroadcastReceiver.java | 5 +- 10 files changed, 295 insertions(+), 138 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3708ea7..79dc306 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.chorem.android.saymytexts" - android:versionCode="6" - android:versionName="2.1" + android:versionCode="8" + android:versionName="2.2" android:description="@string/app_description" android:installLocation="auto"> - <uses-sdk android:minSdkVersion="15" + <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="17"/> <uses-permission android:name="android.permission.RECEIVE_SMS" /> @@ -17,6 +17,7 @@ <uses-permission android:name="android.permission.BLUETOOTH" /> <uses-permission android:name="android.permission.RECORD_AUDIO" /> <uses-permission android:name="android.permission.CALL_PHONE" /> + <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/> <uses-feature android:name="android.hardware.telephony" android:required="true"/> @@ -39,13 +40,17 @@ <service android:name=".SayMyTextService"/> - <receiver android:name=".NewTextBroadcastReceiver" + <receiver android:name=".broadcastreceiver.NewTextBroadcastReceiver" android:enabled="true"> <intent-filter android:priority="42"> <action android:name="android.provider.Telephony.SMS_RECEIVED" /> - <action android:name="android.bluetooth.device.action.ACL_CONNECTED" /> - <action android:name="android.bluetooth.device.action.ACL_DISCONNECT_REQUESTED" /> - <action android:name="android.bluetooth.device.action.ACL_DISCONNECTED" /> + </intent-filter> + </receiver> + + <receiver android:name=".broadcastreceiver.BootCompletedBroadcastReceiver" + android:enabled="true"> + <intent-filter> + <action android:name="android.intent.action.BOOT_COMPLETED" /> </intent-filter> </receiver> @@ -58,4 +63,4 @@ android:configChanges="orientation|screenSize|keyboardHidden"/> </application> -</manifest> +</manifest> \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index ed45a9d..91a87a9 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -57,4 +57,11 @@ <string name="voice_not_recognized">Je n\'ai pas compris.</string> + <string name="notification_reading_active_title">Lecture des SMS active</string> + <string name="notification_reading_active_headset_connected">Un casque est branché.</string> + <string name="notification_reading_active_bt_device_connected">Un appareil bluetooth est connecté.</string> + <string name="notification_reading_unactive_title">Lecture des SMS inactive</string> + <string name="notification_reading_unactive_no_headset_connected">Pas de casque branché.</string> + <string name="notification_reading_unactive_no_headset_nor_bt_device_connected">Pas de casque branché ni d\'appareil bluetooth est connecté.</string> + </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 35898d2..0866b66 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -57,4 +57,11 @@ <string name="cancel_action">cancel</string> <string name="voice_not_recognized">I did not understand.</string> + <string name="notification_reading_active_title">SMS reading active</string> + <string name="notification_reading_active_headset_connected">A headset is plugged.</string> + <string name="notification_reading_active_bt_device_connected">A bluetooth device is connected.</string> + <string name="notification_reading_unactive_title">SMS reading unactive</string> + <string name="notification_reading_unactive_no_headset_connected">No headset plugged.</string> + <string name="notification_reading_unactive_no_headset_nor_bt_device_connected">No headset plugged nor bluetooth device connected.</string> + </resources> diff --git a/src/org/chorem/android/saymytexts/SayMyTextService.java b/src/org/chorem/android/saymytexts/SayMyTextService.java index 3f1ed86..661a9f9 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextService.java +++ b/src/org/chorem/android/saymytexts/SayMyTextService.java @@ -24,6 +24,9 @@ package org.chorem.android.saymytexts; * #L% */ +import android.app.Notification; +import android.app.NotificationManager; +import android.app.PendingIntent; import android.app.Service; import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; @@ -31,6 +34,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; +import android.graphics.drawable.BitmapDrawable; import android.media.AudioManager; import android.net.Uri; import android.os.IBinder; @@ -41,7 +45,11 @@ import android.telephony.PhoneStateListener; import android.telephony.TelephonyManager; import android.util.Log; import android.widget.Toast; +import org.chorem.android.saymytexts.broadcastreceiver.DeviceConnectionBroadcastReceiver; +import org.chorem.android.saymytexts.broadcastreceiver.DictateSmsBroadcastReceiver; +import org.chorem.android.saymytexts.broadcastreceiver.SayNextActionBroadcastReceiver; +import java.awt.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -64,6 +72,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList public static final String ACTION_REASK_ACTION = "org.chorem.android.saymytexts.REASK_ACTION"; public static final String ACTION_DICTATE_SMS = "org.chorem.android.saymytexts.DICTATE_SMS"; public static final String ACTION_CONFIRM_SMS_SENDING = "org.chorem.android.saymytexts.CONFIRM_SMS_SENDING"; + public static final String ACTION_HEADSET_PLUGGED = "org.chorem.android.saymytexts.HEADSET_PLUGGED"; /** SMS to read */ public static final String INTENT_EXTRA_SMS = "sms"; @@ -75,21 +84,34 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList public static final String INTENT_EXTRA_DICTATED_MESSAGE = "dictatedMessage"; /** Attempt number: if set, it means that the user said something not understandable, so ask again */ public static final String INTENT_EXTRA_ATTEMPT_NUMBER = "attemptNumber"; + /** If true, a headset is plugged, false otherwise */ + public static final String INTENT_EXTRA_HEADSET_PLUGGED = "headsetPlugged"; /** utterance id when the bluetooth device is connected */ -// protected static final String BT_UTTERANCE_ID = "btUtteranceId"; protected static final String BT_ASK_NEXT_ACTION_UTTERANCE_ID = "btAskNextActionUtteranceId"; protected static final String ASK_NEXT_ACTION_UTTERANCE_ID = "askNextActionUtteranceId"; protected static final String OTHER_UTTERANCE_ID = "oherUtteranceId"; + protected static final int NOTIFICATION_ID = 42; + protected int maxAttemptNumber; + /** is reading enabled according to the settings */ + protected boolean readingActive = false; + + /** is the reading profile "always read" */ + protected boolean alwaysRead = false; + protected String readingProfile; protected boolean heisendroidModeEnabled; protected boolean interactionEnabled; + protected boolean notificationsEnabled = true; + + protected boolean notificationCancelable; + protected AudioManager audioManager; /** null if the texttospeech is not initialized */ @@ -109,6 +131,10 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList /** bluetooth devices which are currently connected */ protected Map<BluetoothDevice, Integer> bluetoothDevices = new HashMap<>(); + protected boolean headsetPlugged = false; + + protected BroadcastReceiver deviceConnectionBroadcastReceiver; + /** * Listener to call state change */ @@ -122,8 +148,6 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList } }; -// BluetoothHeadset mBluetoothHeadset; - @Override public void onCreate() { super.onCreate(); @@ -153,6 +177,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList String[] readingProfileValues = getResources().getStringArray(R.array.preferences_reading_profile_values); String readingProfileKey = getString(R.string.preference_reading_profile_key); readingProfile = sharedPref.getString(readingProfileKey, readingProfileValues[0]); + updateReadingEnabled(); String heisendroidModeEnabledKey = getString(R.string.preference_enable_heisendroid_mode_key); heisendroidModeEnabled = sharedPref.getBoolean(heisendroidModeEnabledKey, true); @@ -162,33 +187,10 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList sharedPref.registerOnSharedPreferenceChangeListener(this); -//// Get the default adapter -// final BluetoothAdapter mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); -// -//// Define Service Listener of BluetoothProfile -// BluetoothProfile.ServiceListener mProfileListener = new BluetoothProfile.ServiceListener() { -// public void onServiceConnected(int profile, BluetoothProfile proxy) { -// if (profile == BluetoothProfile.HEADSET) { -// mBluetoothHeadset = (BluetoothHeadset) proxy; -// List<BluetoothDevice> devices = mBluetoothHeadset.getConnectedDevices(); -// for ( final BluetoothDevice dev : devices ) { -// if (mBluetoothHeadset.isAudioConnected(dev)) { -// bluetoothDevices.put(dev, dev.getBluetoothClass().getDeviceClass()); -// } -// } -// mBluetoothAdapter.closeProfileProxy(BluetoothProfile.HEADSET, mBluetoothHeadset); -// } -// } -// public void onServiceDisconnected(int profile) { -// if (profile == BluetoothProfile.HEADSET) { -// mBluetoothHeadset = null; -// } -// } -// }; -// -//// Establish connection to the proxy. -// mBluetoothAdapter.getProfileProxy(this, mProfileListener, BluetoothProfile.HEADSET); - + deviceConnectionBroadcastReceiver = new DeviceConnectionBroadcastReceiver(); + IntentFilter filter = new IntentFilter(); + filter.addAction(Intent.ACTION_HEADSET_PLUG); + registerReceiver(deviceConnectionBroadcastReceiver, filter); } @Override @@ -200,6 +202,8 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this); sharedPref.unregisterOnSharedPreferenceChangeListener(this); + + unregisterReceiver(deviceConnectionBroadcastReceiver); } @Override @@ -220,81 +224,74 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList String action = intent.getAction(); Log.d(TAG, "action " + action); - final SMS sms = (SMS) intent.getSerializableExtra(INTENT_EXTRA_SMS); - int attemptNumber = intent.getIntExtra(INTENT_EXTRA_ATTEMPT_NUMBER, 0); - - switch (action) { - case ACTION_MANAGE_BT_DEVICE: - BluetoothDevice device = intent.getParcelableExtra(INTENT_EXTRA_BT_DEVICE); - // if a device is passed to the service - // add or remove the device from the connected devices - if (device != null) { - boolean addBtDevice = intent.getBooleanExtra(INTENT_EXTRA_ADD_BT_DEVICE, false); - if (addBtDevice) { - bluetoothDevices.put(device, device.getBluetoothClass().getDeviceClass()); - } else { - bluetoothDevices.remove(device); - } - } - break; - - case ACTION_REASK_ACTION: - askForActionAfterReading(sms, !bluetoothDevices.isEmpty(), ++attemptNumber); - break; - - case ACTION_DICTATE_SMS: - dictateSMS(sms, attemptNumber + 1); - break; - - case ACTION_CONFIRM_SMS_SENDING: - // if a message has just been dictated - final String dictatedMessage = intent.getStringExtra(INTENT_EXTRA_DICTATED_MESSAGE); - askSendingConfirmation(dictatedMessage, sms, ++attemptNumber); - break; - - case ACTION_READ_NEXT_SMS: - setCanSpeak(true); - break; - - default: - boolean readingEnabled; - String[] readingProfileValues = getResources().getStringArray(R.array.preferences_reading_profile_values); - if (readingProfileValues[0].equals(readingProfile)) { - readingEnabled = true; - - } else if (readingProfileValues[1].equals(readingProfile)) { - readingEnabled = audioManager.isWiredHeadsetOn() || !bluetoothDevices.isEmpty(); - - } else if (readingProfileValues[2].equals(readingProfile)) { - readingEnabled = audioManager.isWiredHeadsetOn(); - - } else { - readingEnabled = false; - } - - if (readingEnabled) { - if (!Boolean.FALSE.equals(canSpeak)) { - musicWasActive = audioManager.isMusicActive(); - speakerWasOn = audioManager.isSpeakerphoneOn(); - - if (musicWasActive) { - audioManager.setStreamMute(AudioManager.STREAM_MUSIC, musicWasActive); - } - - if (readingProfileValues[0].equals(readingProfile) - && !audioManager.isWiredHeadsetOn() && bluetoothDevices.isEmpty()) { - audioManager.setMode(AudioManager.MODE_IN_CALL); - audioManager.setSpeakerphoneOn(true); + if (action != null) { + final SMS sms = (SMS) intent.getSerializableExtra(INTENT_EXTRA_SMS); + int attemptNumber = intent.getIntExtra(INTENT_EXTRA_ATTEMPT_NUMBER, 0); + + switch (action) { + case ACTION_MANAGE_BT_DEVICE: + BluetoothDevice device = intent.getParcelableExtra(INTENT_EXTRA_BT_DEVICE); + // if a device is passed to the service + // add or remove the device from the connected devices + if (device != null) { + boolean addBtDevice = intent.getBooleanExtra(INTENT_EXTRA_ADD_BT_DEVICE, false); + if (addBtDevice) { + bluetoothDevices.put(device, device.getBluetoothClass().getDeviceClass()); + } else { + bluetoothDevices.remove(device); } + updateReadingEnabled(); } + break; + + case ACTION_HEADSET_PLUGGED: + headsetPlugged = intent.getBooleanExtra(INTENT_EXTRA_HEADSET_PLUGGED, false); + updateReadingEnabled(); + break; + + case ACTION_REASK_ACTION: + askForActionAfterReading(sms, !bluetoothDevices.isEmpty(), ++attemptNumber); + break; + + case ACTION_DICTATE_SMS: + dictateSMS(sms, attemptNumber + 1); + break; + + case ACTION_CONFIRM_SMS_SENDING: + // if a message has just been dictated + final String dictatedMessage = intent.getStringExtra(INTENT_EXTRA_DICTATED_MESSAGE); + askSendingConfirmation(dictatedMessage, sms, ++attemptNumber); + break; + + case ACTION_READ_NEXT_SMS: + setCanSpeak(true); + break; + + default: + if (readingActive) { + if (!Boolean.FALSE.equals(canSpeak)) { + musicWasActive = audioManager.isMusicActive(); + speakerWasOn = audioManager.isSpeakerphoneOn(); + + if (musicWasActive) { + audioManager.setStreamMute(AudioManager.STREAM_MUSIC, musicWasActive); + } + + // if read but no external device is connected, play through the speaker + if (alwaysRead && !headsetPlugged && bluetoothDevices.isEmpty()) { + audioManager.setMode(AudioManager.MODE_IN_CALL); + audioManager.setSpeakerphoneOn(true); + } + } - if (Boolean.TRUE.equals(canSpeak)) { - requestReading(sms); + if (Boolean.TRUE.equals(canSpeak)) { + requestReading(sms); - } else { - awaitingTexts.add(sms); + } else { + awaitingTexts.add(sms); + } } - } + } } result = START_STICKY; @@ -599,6 +596,7 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList String[] readingProfileValues = getResources().getStringArray(R.array.preferences_reading_profile_values); readingProfile = sharedPreferences.getString(key, readingProfileValues[0]); + updateReadingEnabled(); } else if (key.equals(getString(R.string.preference_enable_heisendroid_mode_key))) { heisendroidModeEnabled = sharedPreferences.getBoolean(key, true); @@ -608,6 +606,80 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList } } + protected void updateReadingEnabled() { + String[] readingProfileValues = getResources().getStringArray(R.array.preferences_reading_profile_values); + String[] readingProfileEntries = getResources().getStringArray(R.array.preferences_reading_profile_entries); + String desc; + + // always read + alwaysRead = readingProfileValues[0].equals(readingProfile); + if (alwaysRead) { + readingActive = true; + desc = readingProfileEntries[0]; + } + // if a bt device or a headset is connected + else if (readingProfileValues[1].equals(readingProfile)) { + readingActive = headsetPlugged || !bluetoothDevices.isEmpty(); + + if (!bluetoothDevices.isEmpty()) { + desc = getString(R.string.notification_reading_active_bt_device_connected); + + } else if (headsetPlugged) { + desc = getString(R.string.notification_reading_active_headset_connected); + + } else { + desc = getString(R.string.notification_reading_unactive_no_headset_nor_bt_device_connected); + } + } + // if a headset is connected + else if (readingProfileValues[2].equals(readingProfile)) { + readingActive = headsetPlugged; + desc = headsetPlugged ? + getString(R.string.notification_reading_active_headset_connected) : + getString(R.string.notification_reading_unactive_no_headset_connected); + } + // never read + else { + readingActive = false; + desc = readingProfileEntries[3]; + } + + updateNotification(desc); + } + + protected void updateNotification(String content) { + //TODO kmorin 20140821 add a setting to show notifsor not, cancelable or not + NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); + + if (notificationsEnabled) { + BitmapDrawable logo = (BitmapDrawable) getResources().getDrawable(R.drawable.logo_small); + Notification.Builder builder = new Notification.Builder(this) + .setLargeIcon(logo.getBitmap()) + .setContentText(content); + + //TODO kmorin 20140821 find other small icons + if (readingActive) { + builder.setSmallIcon(android.R.drawable.presence_audio_online) + .setContentTitle(getString(R.string.notification_reading_active_title)); + + } else { + builder.setSmallIcon(android.R.drawable.presence_audio_busy) + .setContentTitle(getString(R.string.notification_reading_unactive_title)); + } + + Intent settingsIntent = new Intent(this, SettingsActivity.class); + PendingIntent resultPendingIntent = PendingIntent.getActivity(this, 0, settingsIntent, PendingIntent.FLAG_UPDATE_CURRENT); + builder.setContentIntent(resultPendingIntent); + + Notification notification = builder.build(); + notification.flags = Notification.FLAG_NO_CLEAR; + notificationManager.notify(NOTIFICATION_ID, notification); + + } else { + notificationManager.cancel(NOTIFICATION_ID); + } + } + public interface Function { void apply(); } diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java index 6e6232b..8b4fc8c 100644 --- a/src/org/chorem/android/saymytexts/SettingsActivity.java +++ b/src/org/chorem/android/saymytexts/SettingsActivity.java @@ -26,6 +26,7 @@ package org.chorem.android.saymytexts; import android.app.Activity; import android.app.AlertDialog; +import android.app.Application; import android.app.PendingIntent; import android.content.ActivityNotFoundException; import android.content.Context; @@ -88,6 +89,9 @@ public class SettingsActivity extends Activity { Intent installIntent = new Intent(TextToSpeech.Engine.ACTION_INSTALL_TTS_DATA); startActivity(installIntent); } + Intent serviceIntent = new Intent(this, SayMyTextService.class); + this.startService(serviceIntent); + } catch(ActivityNotFoundException eee) { Log.e(TAG, "No activity found fo texttospeech", eee); Toast.makeText(this, R.string.texttospeech_not_installed, Toast.LENGTH_LONG).show(); @@ -99,7 +103,7 @@ public class SettingsActivity extends Activity { } public static class SettingsFragment extends PreferenceFragment - implements SharedPreferences.OnSharedPreferenceChangeListener { + implements SharedPreferences.OnSharedPreferenceChangeListener { @Override public void onCreate(Bundle savedInstanceState) { diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java new file mode 100644 index 0000000..3c227e0 --- /dev/null +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java @@ -0,0 +1,24 @@ +package org.chorem.android.saymytexts.broadcastreceiver; + +import android.content.BroadcastReceiver; +import android.content.Context; +import android.content.Intent; +import org.chorem.android.saymytexts.SayMyTextService; + +/** + * @author Kevin Morin (Code Lutin) + * @since 2.2 + */ +public class BootCompletedBroadcastReceiver extends BroadcastReceiver { + + @Override + public void onReceive(Context context, Intent intent) { + //we double check here for only boot complete event + if(intent.getAction().equalsIgnoreCase(Intent.ACTION_BOOT_COMPLETED)) { + //here we start the service + Intent serviceIntent = new Intent(context, SayMyTextService.class); + context.startService(serviceIntent); + } + } + +} diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java new file mode 100644 index 0000000..4a1810e --- /dev/null +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java @@ -0,0 +1,56 @@ +package org.chorem.android.saymytexts.broadcastreceiver; + +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; + +/** + * @author Kevin Morin (Code Lutin) + * @since 2.2 + */ +public class DeviceConnectionBroadcastReceiver extends BroadcastReceiver { + + private static final String TAG = "DeviceConnectionBroadcastReceiver"; + + @Override + public void onReceive(Context context, Intent intent) { + Intent serviceIntent = new Intent(context, SayMyTextService.class); + String action = intent.getAction(); + + Log.d(TAG, "onReceive " + action); + if (Intent.ACTION_HEADSET_PLUG.equals(action)) { + int headSetState = intent.getIntExtra("state", 0); + serviceIntent.setAction(SayMyTextService.ACTION_HEADSET_PLUGGED); + serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_HEADSET_PLUGGED, headSetState > 0); + context.startService(serviceIntent); + + } else { + BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); + serviceIntent.setAction(SayMyTextService.ACTION_MANAGE_BT_DEVICE); + + if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) { + BluetoothClass bluetoothClass = device.getBluetoothClass(); + if (bluetoothClass != null) { + int majorDeviceClass = bluetoothClass.getMajorDeviceClass(); + if (majorDeviceClass == BluetoothClass.Device.Major.AUDIO_VIDEO) { + serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_BT_DEVICE, device); + serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_ADD_BT_DEVICE, true); + context.startService(serviceIntent); + } + + } else { + //error recognizing the bt class + } + + } else { + serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_BT_DEVICE, device); + serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_ADD_BT_DEVICE, false); + context.startService(serviceIntent); + } + } + } +} diff --git a/src/org/chorem/android/saymytexts/DictateSmsBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java similarity index 96% rename from src/org/chorem/android/saymytexts/DictateSmsBroadcastReceiver.java rename to src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java index ad7e220..0916722 100644 --- a/src/org/chorem/android/saymytexts/DictateSmsBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java @@ -1,4 +1,4 @@ -package org.chorem.android.saymytexts; +package org.chorem.android.saymytexts.broadcastreceiver; /* * #%L @@ -34,6 +34,8 @@ import android.speech.RecognitionListener; import android.speech.RecognizerIntent; import android.speech.SpeechRecognizer; import android.util.Log; +import org.chorem.android.saymytexts.SMS; +import org.chorem.android.saymytexts.SayMyTextService; import java.util.List; diff --git a/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java similarity index 78% rename from src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java rename to src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java index 5dd1eb6..f4f3867 100644 --- a/src/org/chorem/android/saymytexts/NewTextBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java @@ -1,4 +1,4 @@ -package org.chorem.android.saymytexts; +package org.chorem.android.saymytexts.broadcastreceiver; /* * #%L @@ -24,8 +24,6 @@ package org.chorem.android.saymytexts; * #L% */ -import android.bluetooth.BluetoothClass; -import android.bluetooth.BluetoothDevice; import android.content.BroadcastReceiver; import android.content.ContentResolver; import android.content.Context; @@ -39,6 +37,9 @@ import android.provider.BaseColumns; import android.provider.ContactsContract; import android.telephony.SmsMessage; import android.util.Log; +import org.chorem.android.saymytexts.R; +import org.chorem.android.saymytexts.SMS; +import org.chorem.android.saymytexts.SayMyTextService; /** * Receives the SMSs and if the headset is plugged, start the service to say it out loud. @@ -93,30 +94,6 @@ public class NewTextBroadcastReceiver extends BroadcastReceiver { serviceIntent.setAction(SayMyTextService.ACTION_READ_SMS); context.startService(serviceIntent); } - - } else { - BluetoothDevice device = intent.getParcelableExtra(BluetoothDevice.EXTRA_DEVICE); - serviceIntent.setAction(SayMyTextService.ACTION_MANAGE_BT_DEVICE); - - if (BluetoothDevice.ACTION_ACL_CONNECTED.equals(action)) { - BluetoothClass bluetoothClass = device.getBluetoothClass(); - if (bluetoothClass != null) { - int majorDeviceClass = bluetoothClass.getMajorDeviceClass(); - if (majorDeviceClass == BluetoothClass.Device.Major.AUDIO_VIDEO) { - serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_BT_DEVICE, device); - serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_ADD_BT_DEVICE, true); - context.startService(serviceIntent); - } - - } else { - //error recognizing the bt class - } - - } else { - serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_BT_DEVICE, device); - serviceIntent.putExtra(SayMyTextService.INTENT_EXTRA_ADD_BT_DEVICE, false); - context.startService(serviceIntent); - } } } diff --git a/src/org/chorem/android/saymytexts/SayNextActionBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java similarity index 97% rename from src/org/chorem/android/saymytexts/SayNextActionBroadcastReceiver.java rename to src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java index 46cc22f..c2d2970 100644 --- a/src/org/chorem/android/saymytexts/SayNextActionBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java @@ -1,4 +1,4 @@ -package org.chorem.android.saymytexts; +package org.chorem.android.saymytexts.broadcastreceiver; /* * #%L @@ -37,6 +37,9 @@ import android.speech.RecognizerIntent; import android.speech.SpeechRecognizer; import android.telephony.SmsManager; import android.util.Log; +import org.chorem.android.saymytexts.R; +import org.chorem.android.saymytexts.SMS; +import org.chorem.android.saymytexts.SayMyTextService; import java.util.List; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 52863d224abdc97a355650cf1a63e8c58d8b7345 Author: Kevin Morin <morin@codelutin.com> Date: Wed Aug 27 23:38:18 2014 +0200 refs #1055 Add a notification when SayMyTexts is active --- res/drawable-hdpi/ic_stat_heisendroid.png | Bin 0 -> 1099 bytes res/drawable-mdpi/ic_stat_heisendroid.png | Bin 0 -> 702 bytes res/drawable-xhdpi/ic_stat_heisendroid.png | Bin 0 -> 1481 bytes res/drawable-xxhdpi/ic_stat_heisendroid.png | Bin 0 -> 2323 bytes res/drawable/ic_stat_heisendroid.png | Bin 0 -> 702 bytes res/values-fr/arrays.xml | 6 +++ res/values-fr/strings.xml | 1 + res/values/arrays.xml | 12 ++++++ res/values/preference_keys.xml | 1 + res/values/strings.xml | 1 + res/xml/preferences.xml | 6 +++ .../android/saymytexts/SayMyTextService.java | 42 ++++++++++++--------- .../android/saymytexts/SettingsActivity.java | 10 +++++ 13 files changed, 62 insertions(+), 17 deletions(-) diff --git a/res/drawable-hdpi/ic_stat_heisendroid.png b/res/drawable-hdpi/ic_stat_heisendroid.png new file mode 100644 index 0000000..ccd5b64 Binary files /dev/null and b/res/drawable-hdpi/ic_stat_heisendroid.png differ diff --git a/res/drawable-mdpi/ic_stat_heisendroid.png b/res/drawable-mdpi/ic_stat_heisendroid.png new file mode 100644 index 0000000..980972b Binary files /dev/null and b/res/drawable-mdpi/ic_stat_heisendroid.png differ diff --git a/res/drawable-xhdpi/ic_stat_heisendroid.png b/res/drawable-xhdpi/ic_stat_heisendroid.png new file mode 100644 index 0000000..b373743 Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_heisendroid.png differ diff --git a/res/drawable-xxhdpi/ic_stat_heisendroid.png b/res/drawable-xxhdpi/ic_stat_heisendroid.png new file mode 100644 index 0000000..2739dda Binary files /dev/null and b/res/drawable-xxhdpi/ic_stat_heisendroid.png differ diff --git a/res/drawable/ic_stat_heisendroid.png b/res/drawable/ic_stat_heisendroid.png new file mode 100644 index 0000000..980972b Binary files /dev/null and b/res/drawable/ic_stat_heisendroid.png differ diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml index da4a5db..53c1f2f 100644 --- a/res/values-fr/arrays.xml +++ b/res/values-fr/arrays.xml @@ -8,4 +8,10 @@ <item>Jamais</item> </string-array> + <string-array name="preferences_notifications_entries"> + <item>Désactivées</item> + <item>Annulables</item> + <item>Non annulables</item> + </string-array> + </resources> \ No newline at end of file diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml index 91a87a9..f0062ce 100644 --- a/res/values-fr/strings.xml +++ b/res/values-fr/strings.xml @@ -15,6 +15,7 @@ <string name="preference_voice_recognizer_max_attempt_number_label">Nombre maximum d\'essais</string> <string name="preference_enable_heisendroid_mode_label">Mode Heisendroid</string> <string name="preference_block_equals_sms_label">Bloque les SMS \"=\"</string> + <string name="preference_notifications_label">Notifications</string> <string name="preference_test_sms_label">Tester en m\'envoyant un SMS</string> <string name="test_sms_content">Heisendroïd</string> diff --git a/res/values/arrays.xml b/res/values/arrays.xml index d851bcc..9685a26 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -15,4 +15,16 @@ <item>Never</item> </string-array> + <string-array name="preferences_notifications_values"> + <item>disabled</item> + <item>cancelable</item> + <item>not_cancelable</item> + </string-array> + + <string-array name="preferences_notifications_entries"> + <item>Disabled</item> + <item>Cancelable</item> + <item>Not cancelable</item> + </string-array> + </resources> \ No newline at end of file diff --git a/res/values/preference_keys.xml b/res/values/preference_keys.xml index 93f7ac6..8d1d145 100644 --- a/res/values/preference_keys.xml +++ b/res/values/preference_keys.xml @@ -5,6 +5,7 @@ <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> <string name="preference_block_equals_sms_key">preference_block_equals_sms_key</string> + <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> <string name="preference_documentation_key">documentation</string> diff --git a/res/values/strings.xml b/res/values/strings.xml index 0866b66..ee60071 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -15,6 +15,7 @@ <string name="preference_voice_recognizer_max_attempt_number_label">Maximum attempt number</string> <string name="preference_enable_heisendroid_mode_label">Heisendroid mode</string> <string name="preference_block_equals_sms_label">Block the \"=\" SMS</string> + <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 --git a/res/xml/preferences.xml b/res/xml/preferences.xml index 79c24cb..2b6b03e 100644 --- a/res/xml/preferences.xml +++ b/res/xml/preferences.xml @@ -28,6 +28,12 @@ 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"/> + <Preference android:key="@string/preference_test_sms_key" android:title="@string/preference_test_sms_label" android:persistent="false"/> diff --git a/src/org/chorem/android/saymytexts/SayMyTextService.java b/src/org/chorem/android/saymytexts/SayMyTextService.java index 661a9f9..b460171 100644 --- a/src/org/chorem/android/saymytexts/SayMyTextService.java +++ b/src/org/chorem/android/saymytexts/SayMyTextService.java @@ -49,7 +49,6 @@ import org.chorem.android.saymytexts.broadcastreceiver.DeviceConnectionBroadcast import org.chorem.android.saymytexts.broadcastreceiver.DictateSmsBroadcastReceiver; import org.chorem.android.saymytexts.broadcastreceiver.SayNextActionBroadcastReceiver; -import java.awt.*; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -108,9 +107,9 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList protected boolean interactionEnabled; - protected boolean notificationsEnabled = true; + protected boolean notificationsEnabled; - protected boolean notificationCancelable; + protected boolean notificationsCancelable; protected AudioManager audioManager; @@ -177,7 +176,6 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList String[] readingProfileValues = getResources().getStringArray(R.array.preferences_reading_profile_values); String readingProfileKey = getString(R.string.preference_reading_profile_key); readingProfile = sharedPref.getString(readingProfileKey, readingProfileValues[0]); - updateReadingEnabled(); String heisendroidModeEnabledKey = getString(R.string.preference_enable_heisendroid_mode_key); heisendroidModeEnabled = sharedPref.getBoolean(heisendroidModeEnabledKey, true); @@ -185,6 +183,14 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList String interactionPrefKey = getString(R.string.preference_enable_interaction_key); interactionEnabled = sharedPref.getBoolean(interactionPrefKey, true); + String[] notificationsValues = + getResources().getStringArray(R.array.preferences_notifications_values); + String notificationMode = sharedPref.getString(key, notificationsValues[1]); + notificationsEnabled = !notificationMode.equals(notificationsValues[0]); + notificationsCancelable = !notificationMode.equals(notificationsValues[2]); + + updateReadingEnabled(); + sharedPref.registerOnSharedPreferenceChangeListener(this); deviceConnectionBroadcastReceiver = new DeviceConnectionBroadcastReceiver(); @@ -603,6 +609,14 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList } else if (key.equals(getString(R.string.preference_enable_interaction_key))) { interactionEnabled = sharedPreferences.getBoolean(key, true); + + } else if (key.equals(getString(R.string.preference_notifications_key))) { + String[] notificationsValues = + getResources().getStringArray(R.array.preferences_notifications_values); + String notificationMode = sharedPreferences.getString(key, notificationsValues[1]); + notificationsEnabled = !notificationMode.equals(notificationsValues[0]); + notificationsCancelable = !notificationMode.equals(notificationsValues[2]); + updateReadingEnabled(); } } @@ -648,31 +662,25 @@ public class SayMyTextService extends Service implements TextToSpeech.OnInitList } protected void updateNotification(String content) { - //TODO kmorin 20140821 add a setting to show notifsor not, cancelable or not NotificationManager notificationManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE); - if (notificationsEnabled) { + if (notificationsEnabled && readingActive) { BitmapDrawable logo = (BitmapDrawable) getResources().getDrawable(R.drawable.logo_small); Notification.Builder builder = new Notification.Builder(this) .setLargeIcon(logo.getBitmap()) .setContentText(content); - - //TODO kmorin 20140821 find other small icons - if (readingActive) { - builder.setSmallIcon(android.R.drawable.presence_audio_online) - .setContentTitle(getString(R.string.notification_reading_active_title)); - - } else { - builder.setSmallIcon(android.R.drawable.presence_audio_busy) - .setContentTitle(getString(R.string.notification_reading_unactive_title)); - } + builder.setSmallIcon(R.drawable.ic_stat_heisendroid) + .setContentTitle(getString(R.string.notification_reading_active_title)); Intent settingsIntent = new Intent(this, SettingsActivity.class); PendingIntent resultPendingIntent = PendingIntent.getActivity(this, 0, settingsIntent, PendingIntent.FLAG_UPDATE_CURRENT); builder.setContentIntent(resultPendingIntent); Notification notification = builder.build(); - notification.flags = Notification.FLAG_NO_CLEAR; + if (!notificationsCancelable) { + notification.flags = Notification.FLAG_NO_CLEAR; + } + notificationManager.notify(NOTIFICATION_ID, notification); } else { diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java index 8b4fc8c..57684a8 100644 --- a/src/org/chorem/android/saymytexts/SettingsActivity.java +++ b/src/org/chorem/android/saymytexts/SettingsActivity.java @@ -170,6 +170,11 @@ public class SettingsActivity extends Activity { enabled = sharedPref.getBoolean(key, switchPreference.isChecked()); switchPreference.setChecked(enabled); + key = getString(R.string.preference_notifications_key); + listPreference = (ListPreference) findPreference(key); + summary = listPreference.getEntry(); + listPreference.setSummary(summary); + sharedPref.registerOnSharedPreferenceChangeListener(this); } @@ -208,6 +213,11 @@ public class SettingsActivity extends Activity { SwitchPreference switchPreference = (SwitchPreference) findPreference(key); boolean enabled = sharedPreferences.getBoolean(key, switchPreference.isChecked()); switchPreference.setChecked(enabled); + + } else if (getString(R.string.preference_notifications_key).equals(key)) { + ListPreference preference = (ListPreference) findPreference(key); + CharSequence summary = preference.getEntry(); + preference.setSummary(summary); } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 8350d8c97598670a212c5702806b59605a214358 Author: Kevin Morin <morin@codelutin.com> Date: Sat Dec 20 22:11:55 2014 +0100 typo --- .gitignore | 13 +++++++++++++ pom.xml | 2 +- res/values/strings.xml | 4 ++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d2a9c44 --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +/atlassian-ide-plugin.xml +/.idea +/*/.idea +/target +/*/target/ +/*.iml +/*/*.iml +/*.ipr +/*/*.ipr +/*.iws +/*/*.iws +/*~ +/*/*~ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 3cd90ec..76d159c 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>chorempom</artifactId> - <version>1.3-SNAPSHOT</version> + <version>1.3</version> </parent> <groupId>org.chorem.android</groupId> diff --git a/res/values/strings.xml b/res/values/strings.xml index 6229f51..7418b21 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -36,7 +36,7 @@ <!--ACRA--> <string name="crash_toast_text">Ooooops ! the application crashed, but a report has been sent to my developer to help fix the issue !</string> - <string name="crash_dialog_title">say My Texts has crashed</string> + <string name="crash_dialog_title">Say My Texts has crashed</string> <string name="crash_dialog_text">An unexpected error occurred forcing the application to stop. Please help us fix this by sending us error data, all you have to do is click OK.</string> @@ -46,7 +46,7 @@ <!-- actions --> <string name="ask_next_action">What would you like to do? Call, answer or nothing?</string> <string name="dictate_sms">Dictate your answer</string> - <string name="send_sms_confirmation">You dictated: %s. Would you like to confirm, modify ou cancel?</string> + <string name="send_sms_confirmation">You dictated: %s. Would you like to confirm, modify or cancel?</string> <string name="call_action">call</string> <string name="answer_action">reply</string> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 255339e7a354c71e02d43f6e31d6d33d925fb3d0 Author: Kevin Morin <morin@codelutin.com> Date: Sat Dec 20 22:12:45 2014 +0100 typo + drawables --- res/drawable-hdpi/ic_stat_heisendroid.png | Bin 0 -> 1099 bytes res/drawable-mdpi/ic_stat_heisendroid.png | Bin 0 -> 702 bytes res/drawable-xhdpi/ic_stat_heisendroid.png | Bin 0 -> 1481 bytes res/drawable-xxhdpi/ic_stat_heisendroid.png | Bin 0 -> 2323 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/res/drawable-hdpi/ic_stat_heisendroid.png b/res/drawable-hdpi/ic_stat_heisendroid.png new file mode 100644 index 0000000..ccd5b64 Binary files /dev/null and b/res/drawable-hdpi/ic_stat_heisendroid.png differ diff --git a/res/drawable-mdpi/ic_stat_heisendroid.png b/res/drawable-mdpi/ic_stat_heisendroid.png new file mode 100644 index 0000000..980972b Binary files /dev/null and b/res/drawable-mdpi/ic_stat_heisendroid.png differ diff --git a/res/drawable-xhdpi/ic_stat_heisendroid.png b/res/drawable-xhdpi/ic_stat_heisendroid.png new file mode 100644 index 0000000..b373743 Binary files /dev/null and b/res/drawable-xhdpi/ic_stat_heisendroid.png differ diff --git a/res/drawable-xxhdpi/ic_stat_heisendroid.png b/res/drawable-xxhdpi/ic_stat_heisendroid.png new file mode 100644 index 0000000..2739dda Binary files /dev/null and b/res/drawable-xxhdpi/ic_stat_heisendroid.png differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 78a007cfb2cfd4db16adc0c0010b332bbd0d0372 Author: Kevin Morin <morin@codelutin.com> Date: Sat Dec 20 22:31:21 2014 +0100 add languages --- res/values-de/arrays.xml | 15 ++++++++++++++ res/values-de/strings.xml | 47 ++++++++++++++++++++++++++++++++++++++++++ res/values-hu/arrays.xml | 15 ++++++++++++++ res/values-hu/strings.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++ res/values-it/arrays.xml | 15 ++++++++++++++ res/values-it/strings.xml | 45 ++++++++++++++++++++++++++++++++++++++++ res/values-pl/arrays.xml | 15 ++++++++++++++ res/values-pl/strings.xml | 45 ++++++++++++++++++++++++++++++++++++++++ res/values-pt-BR/arrays.xml | 15 ++++++++++++++ res/values-pt-BR/strings.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++ res/values-pt-PT/arrays.xml | 15 ++++++++++++++ res/values-pt-PT/strings.xml | 49 ++++++++++++++++++++++++++++++++++++++++++++ 12 files changed, 374 insertions(+) diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml new file mode 100644 index 0000000..2c8aa3f --- /dev/null +++ b/res/values-de/arrays.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string-array name="preferences_reading_profile_entries"> + <item>Immer</item> + <item>Wenn ein Headset, Kopfhörer oder Bluetooth-Gerät verbunden ist</item> + <item>Wenn ein Headset oder Kopfhörer verbunden ist.</item> + <item>Nie</item> + </string-array> + <string-array name="preferences_notifications_entries"> + <item>Deaktiviert</item> + <item>Abbrechbar</item> + <item>Nicht abgebbrechbar</item> + </string-array> +</resources> diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml new file mode 100644 index 0000000..e548f31 --- /dev/null +++ b/res/values-de/strings.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string name="app_name">Say My Texts</string> + <string name="app_description">Say My Texts ist eine Android-App welche die SMS die Sie empfangen laut vorliest. +Dies ist besonders nützlich, wenn Sie reiten, laufen oder fahren. +Sie können auch Antworten, indem Sie ihn aufrufen oder Sie diktieren die Antwort.</string> + <string name="sms_received">Neue Nachricht von %1$s: %2$s.</string> + <string name="preferences_settings_label">Einstellungen</string> + <string name="preference_reading_profile_label">SMS lesen</string> + <string name="preference_enable_interaction_label">Interaktion</string> + <string name="preference_enable_interaction_sublabel">Anrufen oder Abnehmen</string> + <string name="preference_voice_recognizer_max_attempt_number_label">Maximale Wiederholungsanzahl</string> + <string name="preference_enable_heisendroid_mode_label">Heisendroid Modus</string> + <string name="preference_notifications_label">Benachrichtigungen</string> + <string name="preference_test_sms_label">Testen durch Senden einer SMS an mich selbst</string> + <string name="test_sms_content">Heisendroïd</string> + <string name="preferences_about_label">Über</string> + <string name="preference_version_label">Version</string> + <string name="preference_documentation_label">Dokumentation</string> + <string name="preference_issue_tracker_label">Bug-report</string> + <string name="preference_ask_phone_number_title">Ihre Telefonnummer</string> + <string name="preference_ask_phone_number_message">Geben Sie Ihre Telefonnummer ein, um den Text senden</string> + <string name="texttospeech_init_error">Fehler beim initialisieren der Text-zu-Sprache.</string> + <string name="texttospeech_not_installed">Die Anwendung benötigt eine Text-To-Speech-Engine zu arbeiten. Bitte installieren Sie eine.</string> + <string name="crash_toast_text">Ooooops! die Anwendung abgestürzt, aber ein Bericht wurde an meine Entwickler übermittelt, um das Problem zu beheben!</string> + <string name="crash_dialog_title">Say My Texts ist abgestürzt</string> + <string name="crash_dialog_text">Ein unerwarteter Fehler aufgetreten ist, und zwingt die Anwendung zu beenden. Bitte helfen Sie uns dieses Problem beheben, indem Sie uns Fehlerdaten senden, alles, was Sie tun müssen ist, auf OK klicken.</string> + <string name="crash_dialog_comment_prompt">Sie können Ihre Kommentare über das Problem unten hinzufügen:</string> + <string name="crash_dialog_ok_toast">Vielen Dank!</string> + <string name="ask_next_action">Was möchten Sie tun? Aufrufen, Antworten oder nichts?</string> + <string name="dictate_sms">Diktieren Sie Ihre Antwort</string> + <string name="send_sms_confirmation">Sie diktierten: %s. würden Sie gerne bestätigen, ändern, oder abbrechen?</string> + <string name="call_action">Anrufen</string> + <string name="answer_action">Antworten</string> + <string name="quit_action">Nichts</string> + <string name="confirm_action">Bestätigen</string> + <string name="modifiy_action">Bearbeiten</string> + <string name="cancel_action">Abbrechen</string> + <string name="voice_not_recognized">Ich habe Sie nicht verstanden.</string> + <string name="notification_reading_active_title">SMS lesen aktiv</string> + <string name="notification_reading_active_headset_connected">Ein Headset ist angeschlossen.</string> + <string name="notification_reading_active_bt_device_connected">Ein Bluetooth-Gerät ist angeschlossen.</string> + <string name="notification_reading_unactive_title">SMS lesen deaktiv</string> + <string name="notification_reading_unactive_no_headset_connected">Kein Headset angeschlossen.</string> + <string name="notification_reading_unactive_no_headset_nor_bt_device_connected">Kein Headset, oder Bluetooth-Gerät angeschlossen.</string> +</resources> diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml new file mode 100644 index 0000000..ea2d3d5 --- /dev/null +++ b/res/values-hu/arrays.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string-array name="preferences_reading_profile_entries"> + <item>Mindig</item> + <item>Mikor füllhallgató, fejhallgató vagy bluetooth eszköz csatlakoztatva van</item> + <item>Mikor fülhallgató, fejhallgató van csatlakoztatva</item> + <item>Soha</item> + </string-array> + <string-array name="preferences_notifications_entries"> + <item>Tiltva</item> + <item>Befejezhető</item> + <item>Befejezhetetlen</item> + </string-array> +</resources> diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml new file mode 100644 index 0000000..6503177 --- /dev/null +++ b/res/values-hu/strings.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string name="app_name">Say My Texts</string> + <string name="app_description">A Say My Texts egy Android alkalmazás, amely felolvassa a beérkezett SMS-eid. + Nagyon hasznos, amikor lovagolsz, futsz vagy vezetsz. + Küldhetsz választ a feladónak, ha hívod őt vagy lediktálod a választ.</string> + <string name="sms_received">Új üzenet tőle: %1$s: %2$s.</string> + <string name="preferences_settings_label">Beállítások</string> + <string name="preference_reading_profile_label">SMS olvasás</string> + <string name="preference_enable_interaction_label">Interakció</string> + <string name="preference_enable_interaction_sublabel">hívás vagy válasz</string> + <string name="preference_voice_recognizer_max_attempt_number_label">Próbálkozások maximális száma</string> + <string name="preference_enable_heisendroid_mode_label">Heisendroid mód</string> + <string name="preference_notifications_label">Értesítések</string> + <string name="preference_test_sms_label">Teszt elküldve SMS-ben magamnak</string> + <string name="test_sms_content">Heisendroid</string> + <string name="preferences_about_label">Rólunk</string> + <string name="preference_version_label">Verzió</string> + <string name="preference_documentation_label">Dokumentáció</string> + <string name="preference_issue_tracker_label">Hibajelentés</string> + <string name="preference_ask_phone_number_title">Telefonszámod</string> + <string name="preference_ask_phone_number_message">Add meg a telefonszámod, hogy elküldhető legyen</string> + <string name="texttospeech_init_error">Hiba a szövegről beszéddé alakítás közben.</string> + <string name="texttospeech_not_installed">Az alkalmazásnak szüksége van szövegről beszéddé alakító motorra a működéshez. Kérjük, telepíts egyet.</string> + <string name="crash_toast_text">Hoppá! Az alkalmazás leállít, de egy hibajelentés el lett küldve a fejlesztőnek, hogy javítsák a hibát!</string> + <string name="crash_dialog_title">a say My Text leállt</string> + <string name="crash_dialog_text">Váratlan hiba történt + az alkalmazás leállt. Kérjük segíts a hiba javításában a hibaadatok elküldésével, + mindössze annyit kell tenni, hogy kattintson az OK gombra.</string> + <string name="crash_dialog_comment_prompt">Itt hozzáadhatod a megjegyzéseid a problémáról:</string> + <string name="crash_dialog_ok_toast">Köszönjük!</string> + <string name="ask_next_action">Mit szeretnél csinálni? Hívni, válaszolni vagy semmit?</string> + <string name="dictate_sms">Diktáld a válaszod</string> + <string name="send_sms_confirmation">Lediktáltad ezt: %s. Szeretnéd megerősíteni, módosítani vagy mégsem?</string> + <string name="call_action">hívás</string> + <string name="answer_action">válasz</string> + <string name="quit_action">semmi</string> + <string name="confirm_action">megerősítés</string> + <string name="modifiy_action">módosítás</string> + <string name="cancel_action">mégsem</string> + <string name="voice_not_recognized">Nem értem.</string> + <string name="notification_reading_active_title">SMS olvasó aktív</string> + <string name="notification_reading_active_headset_connected">Fülhallgató csatlakoztatva</string> + <string name="notification_reading_active_bt_device_connected">Bluetooth eszköz csatlakoztatva.</string> + <string name="notification_reading_unactive_title">SMS olvasó inaktív</string> + <string name="notification_reading_unactive_no_headset_connected">Nincs fülhallgató csatlakoztatva.</string> + <string name="notification_reading_unactive_no_headset_nor_bt_device_connected">Sem fejhallgató, sem bluetooth eszköz nincs csatlakoztatva.</string> +</resources> diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml new file mode 100644 index 0000000..9232acb --- /dev/null +++ b/res/values-it/arrays.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string-array name="preferences_reading_profile_entries"> + <item>Sempre</item> + <item>Quando una cuffia, un auricolare o un dispositivo bluetooth è collegato</item> + <item>Quando un auricolare, una cuffia è collegato</item> + <item>Mai</item> + </string-array> + <string-array name="preferences_notifications_entries"> + <item>Disattivato</item> + <item>Annullabile</item> + <item>Non annullabile</item> + </string-array> +</resources> diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml new file mode 100644 index 0000000..02fd088 --- /dev/null +++ b/res/values-it/strings.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string name="app_name">Say My Texts</string> + <string name="app_description">Say My Texts è un\' applicazione Android che legge ad alta voce gli SMS che ricevi. Questa app è molto utile se stai pedalando, correndo o guidando. Inoltre puoi rispondere al mittente chiamandolo o dettando la risposta.</string> + <string name="sms_received">Nuovo messaggio da %1$s: %2$s.</string> + <string name="preferences_settings_label">Impostazioni</string> + <string name="preference_reading_profile_label">Lettura SMS</string> + <string name="preference_enable_interaction_label">Interazione</string> + <string name="preference_enable_interaction_sublabel">chiama o rispondi</string> + <string name="preference_voice_recognizer_max_attempt_number_label">Numero massimo di tentativi</string> + <string name="preference_enable_heisendroid_mode_label">Modalità Heisendroid</string> + <string name="preference_notifications_label">Notifiche</string> + <string name="preference_test_sms_label">Testa inviando un SMS a me stesso</string> + <string name="test_sms_content">Heisendroïd</string> + <string name="preferences_about_label">About</string> + <string name="preference_version_label">Versione</string> + <string name="preference_documentation_label">Documentazione</string> + <string name="preference_issue_tracker_label">Segnalazione bug</string> + <string name="preference_ask_phone_number_title">Il tuo numero di telefono</string> + <string name="preference_ask_phone_number_message">Inserisci il tuo numero di telefono per inviare il messaggio</string> + <string name="texttospeech_init_error">Errore durante l\'inizializzazione del servizio text to speech.</string> + <string name="texttospeech_not_installed">L\' applicazione necessita di un motore di sintesi vocale per funzionare. Per favore installane uno.</string> + <string name="crash_toast_text">Ooooops ! l\'applicazione si è arrestata in modo anomalo, ma un report è stato inviato allo sviluppatore per aiutarlo a risolvere il problema !</string> + <string name="crash_dialog_title">Say My Texts è andata in crash</string> + <string name="crash_dialog_text">Si è verificato un errore che ha forzato la chiusura dell\'applicazione. Per favore aiutaci a risolvere il problema inviandoci l\'errore riscontrato, basta premere il pulsante Ok.</string> + <string name="crash_dialog_comment_prompt">Puoi aggiungere i tuoi commenti riguardo al problema qui sotto:</string> + <string name="crash_dialog_ok_toast">Grazie !</string> + <string name="ask_next_action">Cosa vorresti fare? Chiamare, rispondere o nulla?</string> + <string name="dictate_sms">Detta la tua risposta</string> + <string name="send_sms_confirmation">Hai dettato: %s. Vuoi confermare, modificare o annullare?</string> + <string name="call_action">Chiama</string> + <string name="answer_action">rispondi</string> + <string name="quit_action">niente</string> + <string name="confirm_action">conferma</string> + <string name="modifiy_action">modifica</string> + <string name="cancel_action">annulla</string> + <string name="voice_not_recognized">Non ho capito.</string> + <string name="notification_reading_active_title">Lettura SMS attiva</string> + <string name="notification_reading_active_headset_connected">Un auricolare è connesso.</string> + <string name="notification_reading_active_bt_device_connected">Un dispositivo bluetooth è connesso.</string> + <string name="notification_reading_unactive_title">Lettura SMS non attiva</string> + <string name="notification_reading_unactive_no_headset_connected">Nessun auricolare collegato.</string> + <string name="notification_reading_unactive_no_headset_nor_bt_device_connected">Nessun auricolare né un dispositivo bluetooth sono connessi.</string> +</resources> diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml new file mode 100644 index 0000000..58b67e2 --- /dev/null +++ b/res/values-pl/arrays.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string-array name="preferences_reading_profile_entries"> + <item>Zawsze</item> + <item>Gdy podłączony jest zestaw słuchawkowy, słuchawki lub urządzenie bluetooth</item> + <item>Gdy podłączony jest zestaw słuchawkowy lub słuchawki</item> + <item>Nigdy</item> + </string-array> + <string-array name="preferences_notifications_entries"> + <item>Wyłączony</item> + <item>Można usunąć</item> + <item>Nie można usunąć</item> + </string-array> +</resources> diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml new file mode 100644 index 0000000..ea49564 --- /dev/null +++ b/res/values-pl/strings.xml @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string name="app_name">Say My Texts</string> + <string name="app_description">Say My Texts to aplikacja na Androida, która czyta na głos przychodzące SMSy. Jest to szczególnie użyteczne kiedy jedziesz na rowerze, biegasz lub prowadzisz samochód. Możesz również odpowiedzieć nadawcy dzwoniąc do niego lub dyktując odpowiedź.</string> + <string name="sms_received">Nowa wiadomość od %1$s:%2$s.</string> + <string name="preferences_settings_label">Ustawienia</string> + <string name="preference_reading_profile_label">Czytanie SMS</string> + <string name="preference_enable_interaction_label">Interakcja</string> + <string name="preference_enable_interaction_sublabel">Zadzwoń lub odpowiedz</string> + <string name="preference_voice_recognizer_max_attempt_number_label">Maksymalna liczba prób</string> + <string name="preference_enable_heisendroid_mode_label">Tryb Heisendroid</string> + <string name="preference_notifications_label">Powiadomienia</string> + <string name="preference_test_sms_label">Przetestuj, wysyłając SMS do siebie</string> + <string name="test_sms_content">Heisendroïd</string> + <string name="preferences_about_label">Informacje</string> + <string name="preference_version_label">Wersja</string> + <string name="preference_documentation_label">Dokumentacja</string> + <string name="preference_issue_tracker_label">Raport błędów</string> + <string name="preference_ask_phone_number_title">Twój numer telefonu</string> + <string name="preference_ask_phone_number_message">Podaj swój numer telefonu, aby wysłać tekst</string> + <string name="texttospeech_init_error">Błąd przy przetwarzaniu tekstu na mowę.</string> + <string name="texttospeech_not_installed">Aplikacja potrzebuje syntezatora mowy, aby działać poprawnie. Zainstaluj go.</string> + <string name="crash_toast_text">Ups! Aplikacja się zawiesiła, ale wysłaliśmy już raport do autora żeby naprawić problem.</string> + <string name="crash_dialog_title">Aplikacja Say My Texts zawiesiła się</string> + <string name="crash_dialog_text">Wystąpił nieoczekiwany błąd i aplikacja musi zostać zamknięta. Pomóż nam to naprawić, przesyłając dane dotyczące błędu. Jedyne co musisz zrobić, to wciśnięcie przycisku \"OK\".</string> + <string name="crash_dialog_comment_prompt">Możesz także dodać swój komentarz dotyczący problemu poniżej:</string> + <string name="crash_dialog_ok_toast">Dziękujemy!</string> + <string name="ask_next_action">Co chciałbyś zrobić? Zadzwonić, odpowiedzieć czy nie odpowiadać?</string> + <string name="dictate_sms">Podyktuj twoją odpowiedź</string> + <string name="send_sms_confirmation">Podyktowałeś: %s. Chcesz potwierdzić, zmienić czy usunąć?</string> + <string name="call_action">Zadzwoń</string> + <string name="answer_action">Odpowiedz</string> + <string name="quit_action">nic</string> + <string name="confirm_action">potwierdź</string> + <string name="modifiy_action">zmień</string> + <string name="cancel_action">Anuluj</string> + <string name="voice_not_recognized">Nie zrozumiałem.</string> + <string name="notification_reading_active_title">Czytanie SMS aktywne</string> + <string name="notification_reading_active_headset_connected">Podłączony jest zestaw słuchawkowy.</string> + <string name="notification_reading_active_bt_device_connected">Urządzenie bluetooth jest podłączone.</string> + <string name="notification_reading_unactive_title">Czytanie SMS nieaktywne</string> + <string name="notification_reading_unactive_no_headset_connected">Niepodłączony zestaw słuchawkowy.</string> + <string name="notification_reading_unactive_no_headset_nor_bt_device_connected">Niepodłączony zestaw słuchawkowy ani urządzenie bluetooth.</string> +</resources> diff --git a/res/values-pt-BR/arrays.xml b/res/values-pt-BR/arrays.xml new file mode 100644 index 0000000..d75ae63 --- /dev/null +++ b/res/values-pt-BR/arrays.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string-array name="preferences_reading_profile_entries"> + <item>Sempre</item> + <item>Quando um alto-falante, fone de ouvido ou dispositivo bluetooth está conectado</item> + <item>Quando um alto-falante, fone de ouvido está conectado</item> + <item>Nunca</item> + </string-array> + <string-array name="preferences_notifications_entries"> + <item>Desabilitado</item> + <item>Cancelável</item> + <item>Não cancelável</item> + </string-array> +</resources> diff --git a/res/values-pt-BR/strings.xml b/res/values-pt-BR/strings.xml new file mode 100644 index 0000000..f607dda --- /dev/null +++ b/res/values-pt-BR/strings.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string name="app_name">Say My Texts</string> + <string name="app_description">Say My Texts é um aplicativo que lê em voz alta mensagens de texto que você receber. +É útil quando você está pedalando, correndo ou dirigindo. +Você também pode responder o destinatário ligando para ele ou ditando a mensagem de texto.</string> + <string name="sms_received">Nova mensagem de %1$s: %2$s.</string> + <string name="preferences_settings_label">Configurações</string> + <string name="preference_reading_profile_label">Leitura de SMS</string> + <string name="preference_enable_interaction_label">Interação</string> + <string name="preference_enable_interaction_sublabel">Ligar ou responder</string> + <string name="preference_voice_recognizer_max_attempt_number_label">Número máximo de tentativa</string> + <string name="preference_enable_heisendroid_mode_label">Modo Heisendroid</string> + <string name="preference_notifications_label">Notificações</string> + <string name="preference_test_sms_label">Testar enviando um SMS para mim</string> + <string name="test_sms_content">Heisendroïd</string> + <string name="preferences_about_label">Sobre</string> + <string name="preference_version_label">Versão</string> + <string name="preference_documentation_label">Documentação</string> + <string name="preference_issue_tracker_label">Reportar Bug</string> + <string name="preference_ask_phone_number_title">Seu número de telefone</string> + <string name="preference_ask_phone_number_message">Digite o seu número de telefone para enviar o SMS</string> + <string name="texttospeech_init_error">Erro durante a inicialização da leitura.</string> + <string name="texttospeech_not_installed">O aplicativo precisa de um motor de texto de fala para funcionar. Por favor, instale um.</string> + <string name="crash_toast_text">Ooooops! O aplicativo travou, mas um relatório foi enviado ao colaborador para ajudar a corrigir o problema!</string> + <string name="crash_dialog_title">Say My Texts parou de funcionar</string> + <string name="crash_dialog_text">Ocorreu um erro inesperado, forçando o aplicativo parar. +Por favor nos ajude a consertar isso enviando-nos os dados do erro, +tudo que você precisa fazer é clicar em OK.</string> + <string name="crash_dialog_comment_prompt">Você pode adicionar seus comentários sobre o problema abaixo:</string> + <string name="crash_dialog_ok_toast">Obrigado!</string> + <string name="ask_next_action">O que você gostaria de fazer? Ligar, responder ou não fazer nada?</string> + <string name="dictate_sms">Dite sua resposta</string> + <string name="send_sms_confirmation">Você ditou: %s. Quer confirmar, modificar ou cancelar?</string> + <string name="call_action">Ligar</string> + <string name="answer_action">Responder</string> + <string name="quit_action">Nada</string> + <string name="confirm_action">Confirmar</string> + <string name="modifiy_action">Modificar</string> + <string name="cancel_action">Cancelar</string> + <string name="voice_not_recognized">Eu não entendi.</string> + <string name="notification_reading_active_title">Leitura ativa de SMS</string> + <string name="notification_reading_active_headset_connected">Um fone de ouvido está conectado.</string> + <string name="notification_reading_active_bt_device_connected">Um dispositivo bluetooth está conectado.</string> + <string name="notification_reading_unactive_title">Leitura de SMS desativada</string> + <string name="notification_reading_unactive_no_headset_connected">Nenhum fone de ouvido conectado.</string> + <string name="notification_reading_unactive_no_headset_nor_bt_device_connected">Nenhum fone de ouvido ou dispositivo bluetooth está conectado.</string> +</resources> diff --git a/res/values-pt-PT/arrays.xml b/res/values-pt-PT/arrays.xml new file mode 100644 index 0000000..d75ae63 --- /dev/null +++ b/res/values-pt-PT/arrays.xml @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string-array name="preferences_reading_profile_entries"> + <item>Sempre</item> + <item>Quando um alto-falante, fone de ouvido ou dispositivo bluetooth está conectado</item> + <item>Quando um alto-falante, fone de ouvido está conectado</item> + <item>Nunca</item> + </string-array> + <string-array name="preferences_notifications_entries"> + <item>Desabilitado</item> + <item>Cancelável</item> + <item>Não cancelável</item> + </string-array> +</resources> diff --git a/res/values-pt-PT/strings.xml b/res/values-pt-PT/strings.xml new file mode 100644 index 0000000..573e9bb --- /dev/null +++ b/res/values-pt-PT/strings.xml @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<!--Generated by crowdin.com--> +<resources> + <string name="app_name">Say My Texts</string> + <string name="app_description">Say My Texts é um aplicativo que lê em voz alta mensagens de texto que você receber. +É útil quando você está pedalando, correndo ou dirigindo. +Você também pode responder o destinatário ligando para ele ou ditando a mensagem de texto.</string> + <string name="sms_received">Nova mensagem de %1$s: %2$s.</string> + <string name="preferences_settings_label">Configurações</string> + <string name="preference_reading_profile_label">Leitura de SMS</string> + <string name="preference_enable_interaction_label">Interação</string> + <string name="preference_enable_interaction_sublabel">Ligar ou responder</string> + <string name="preference_voice_recognizer_max_attempt_number_label">Número máximo de tentativa</string> + <string name="preference_enable_heisendroid_mode_label">Modo Heisendroid</string> + <string name="preference_notifications_label">Notificações</string> + <string name="preference_test_sms_label">Testar enviando um SMS para mim</string> + <string name="test_sms_content">Heisendroïd</string> + <string name="preferences_about_label">Sobre</string> + <string name="preference_version_label">Versão</string> + <string name="preference_documentation_label">Documentação</string> + <string name="preference_issue_tracker_label">Reportar Bug</string> + <string name="preference_ask_phone_number_title">Seu número de telefone</string> + <string name="preference_ask_phone_number_message">Digite o seu número de telefone para enviar o SMS</string> + <string name="texttospeech_init_error">Erro durante a inicialização da leitura.</string> + <string name="texttospeech_not_installed">O aplicativo precisa de um motor de fala para funcionar. Por favor, instale um.</string> + <string name="crash_toast_text">Ooooops! O aplicativo travou, mas um relatório foi enviado ao colaborador para ajudar a corrigir o problema!</string> + <string name="crash_dialog_title">Say My Texts parou de funcionar</string> + <string name="crash_dialog_text">Ocorreu um erro inesperado, forçando o aplicativo parar. +Por favor nos ajude a consertar isso enviando-nos os dados do erro, +tudo que você precisa fazer é clicar em OK.</string> + <string name="crash_dialog_comment_prompt">Você pode adicionar seus comentários sobre o problema abaixo:</string> + <string name="crash_dialog_ok_toast">Obrigado!</string> + <string name="ask_next_action">O que você gostaria de fazer? Ligar, responder ou não fazer nada?</string> + <string name="dictate_sms">Dite sua resposta</string> + <string name="send_sms_confirmation">Você ditou: %s. Quer confirmar, modificar ou cancelar?</string> + <string name="call_action">Ligar</string> + <string name="answer_action">Responder</string> + <string name="quit_action">Nada</string> + <string name="confirm_action">Confirmar</string> + <string name="modifiy_action">Modificar</string> + <string name="cancel_action">Cancelar</string> + <string name="voice_not_recognized">Eu não entendi.</string> + <string name="notification_reading_active_title">Leitura ativa de SMS</string> + <string name="notification_reading_active_headset_connected">Um fone de ouvido está conectado.</string> + <string name="notification_reading_active_bt_device_connected">Um dispositivo bluetooth está conectado.</string> + <string name="notification_reading_unactive_title">Leitura de SMS desativada</string> + <string name="notification_reading_unactive_no_headset_connected">Nenhum fone de ouvido conectado.</string> + <string name="notification_reading_unactive_no_headset_nor_bt_device_connected">Nenhum fone de ouvido ou dispositivo bluetooth está conectado.</string> +</resources> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 6f7a5fb6aa6f451e976c22d6a3aaaabc13f3c831 Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 12:35:11 2014 +0100 upgrade android build version + plugin --- pom.xml | 49 +++++++-------------- .../main/AndroidManifest.xml | 0 .../java}/org/chorem/android/saymytexts/SMS.java | 0 .../android/saymytexts/SayMyTextService.java | 0 .../android/saymytexts/SayMyTextsApplication.java | 0 .../chorem/android/saymytexts/SayMyTextsUtils.java | 0 .../android/saymytexts/SettingsActivity.java | 0 .../BootCompletedBroadcastReceiver.java | 0 .../DeviceConnectionBroadcastReceiver.java | 0 .../DictateSmsBroadcastReceiver.java | 0 .../NewTextBroadcastReceiver.java | 0 .../SayNextActionBroadcastReceiver.java | 0 .../ab_bottom_solid_heisendroid.9.png | Bin .../res}/drawable-hdpi/ab_solid_heisendroid.9.png | Bin .../ab_stacked_solid_heisendroid.9.png | Bin .../drawable-hdpi/ab_texture_tile_heisendroid.png | Bin .../drawable-hdpi/ab_transparent_heisendroid.9.png | Bin .../btn_cab_done_default_heisendroid.9.png | Bin .../btn_cab_done_focused_heisendroid.9.png | Bin .../btn_cab_done_pressed_heisendroid.9.png | Bin .../cab_background_bottom_heisendroid.9.png | Bin .../cab_background_top_heisendroid.9.png | Bin .../res}/drawable-hdpi/ic_launcher_heisendroid.png | Bin .../main/res}/drawable-hdpi/ic_menu_logo.png | Bin .../res}/drawable-hdpi/ic_stat_heisendroid.png | Bin .../drawable-hdpi/list_focused_heisendroid.9.png | Bin .../drawable-hdpi/list_pressed_heisendroid.9.png | Bin .../menu_dropdown_panel_heisendroid.9.png | Bin .../drawable-hdpi/progress_bg_heisendroid.9.png | Bin .../progress_primary_heisendroid.9.png | Bin .../progress_secondary_heisendroid.9.png | Bin .../spinner_ab_default_heisendroid.9.png | Bin .../spinner_ab_disabled_heisendroid.9.png | Bin .../spinner_ab_focused_heisendroid.9.png | Bin .../spinner_ab_pressed_heisendroid.9.png | Bin .../tab_selected_focused_heisendroid.9.png | Bin .../drawable-hdpi/tab_selected_heisendroid.9.png | Bin .../tab_selected_pressed_heisendroid.9.png | Bin .../tab_unselected_focused_heisendroid.9.png | Bin .../drawable-hdpi/tab_unselected_heisendroid.9.png | Bin .../tab_unselected_pressed_heisendroid.9.png | Bin .../ab_bottom_solid_heisendroid.9.png | Bin .../res}/drawable-mdpi/ab_solid_heisendroid.9.png | Bin .../ab_stacked_solid_heisendroid.9.png | Bin .../drawable-mdpi/ab_texture_tile_heisendroid.png | Bin .../drawable-mdpi/ab_transparent_heisendroid.9.png | Bin .../btn_cab_done_default_heisendroid.9.png | Bin .../btn_cab_done_focused_heisendroid.9.png | Bin .../btn_cab_done_pressed_heisendroid.9.png | Bin .../cab_background_bottom_heisendroid.9.png | Bin .../cab_background_top_heisendroid.9.png | Bin .../res}/drawable-mdpi/ic_launcher_heisendroid.png | Bin .../main/res}/drawable-mdpi/ic_menu_logo.png | Bin .../res}/drawable-mdpi/ic_stat_heisendroid.png | Bin .../drawable-mdpi/list_focused_heisendroid.9.png | Bin .../drawable-mdpi/list_pressed_heisendroid.9.png | Bin .../menu_dropdown_panel_heisendroid.9.png | Bin .../drawable-mdpi/progress_bg_heisendroid.9.png | Bin .../progress_primary_heisendroid.9.png | Bin .../progress_secondary_heisendroid.9.png | Bin .../spinner_ab_default_heisendroid.9.png | Bin .../spinner_ab_disabled_heisendroid.9.png | Bin .../spinner_ab_focused_heisendroid.9.png | Bin .../spinner_ab_pressed_heisendroid.9.png | Bin .../tab_selected_focused_heisendroid.9.png | Bin .../drawable-mdpi/tab_selected_heisendroid.9.png | Bin .../tab_selected_pressed_heisendroid.9.png | Bin .../tab_unselected_focused_heisendroid.9.png | Bin .../drawable-mdpi/tab_unselected_heisendroid.9.png | Bin .../tab_unselected_pressed_heisendroid.9.png | Bin .../ab_bottom_solid_heisendroid.9.png | Bin .../res}/drawable-xhdpi/ab_solid_heisendroid.9.png | Bin .../ab_stacked_solid_heisendroid.9.png | Bin .../drawable-xhdpi/ab_texture_tile_heisendroid.png | Bin .../ab_transparent_heisendroid.9.png | Bin .../btn_cab_done_default_heisendroid.9.png | Bin .../btn_cab_done_focused_heisendroid.9.png | Bin .../btn_cab_done_pressed_heisendroid.9.png | Bin .../cab_background_bottom_heisendroid.9.png | Bin .../cab_background_top_heisendroid.9.png | Bin .../drawable-xhdpi/ic_launcher_heisendroid.png | Bin .../main/res}/drawable-xhdpi/ic_menu_logo.png | Bin .../res}/drawable-xhdpi/ic_stat_heisendroid.png | Bin .../drawable-xhdpi/list_focused_heisendroid.9.png | Bin .../drawable-xhdpi/list_pressed_heisendroid.9.png | Bin .../menu_dropdown_panel_heisendroid.9.png | Bin .../drawable-xhdpi/progress_bg_heisendroid.9.png | Bin .../progress_primary_heisendroid.9.png | Bin .../progress_secondary_heisendroid.9.png | Bin .../spinner_ab_default_heisendroid.9.png | Bin .../spinner_ab_disabled_heisendroid.9.png | Bin .../spinner_ab_focused_heisendroid.9.png | Bin .../spinner_ab_pressed_heisendroid.9.png | Bin .../tab_selected_focused_heisendroid.9.png | Bin .../drawable-xhdpi/tab_selected_heisendroid.9.png | Bin .../tab_selected_pressed_heisendroid.9.png | Bin .../tab_unselected_focused_heisendroid.9.png | Bin .../tab_unselected_heisendroid.9.png | Bin .../tab_unselected_pressed_heisendroid.9.png | Bin .../ab_bottom_solid_heisendroid.9.png | Bin .../drawable-xxhdpi/ab_solid_heisendroid.9.png | Bin .../ab_stacked_solid_heisendroid.9.png | Bin .../ab_texture_tile_heisendroid.png | Bin .../ab_transparent_heisendroid.9.png | Bin .../btn_cab_done_default_heisendroid.9.png | Bin .../btn_cab_done_focused_heisendroid.9.png | Bin .../btn_cab_done_pressed_heisendroid.9.png | Bin .../cab_background_bottom_heisendroid.9.png | Bin .../cab_background_top_heisendroid.9.png | Bin .../drawable-xxhdpi/ic_launcher_heisendroid.png | Bin .../main/res}/drawable-xxhdpi/ic_menu_logo.png | Bin .../res}/drawable-xxhdpi/ic_stat_heisendroid.png | Bin .../drawable-xxhdpi/list_focused_heisendroid.9.png | Bin .../drawable-xxhdpi/list_pressed_heisendroid.9.png | Bin .../menu_dropdown_panel_heisendroid.9.png | Bin .../drawable-xxhdpi/progress_bg_heisendroid.9.png | Bin .../progress_primary_heisendroid.9.png | Bin .../progress_secondary_heisendroid.9.png | Bin .../spinner_ab_default_heisendroid.9.png | Bin .../spinner_ab_disabled_heisendroid.9.png | Bin .../spinner_ab_focused_heisendroid.9.png | Bin .../spinner_ab_pressed_heisendroid.9.png | Bin .../tab_selected_focused_heisendroid.9.png | Bin .../drawable-xxhdpi/tab_selected_heisendroid.9.png | Bin .../tab_selected_pressed_heisendroid.9.png | Bin .../tab_unselected_focused_heisendroid.9.png | Bin .../tab_unselected_heisendroid.9.png | Bin .../tab_unselected_pressed_heisendroid.9.png | Bin .../ab_background_textured_heisendroid.xml | 0 .../res}/drawable/btn_cab_done_heisendroid.xml | 0 .../main/res}/drawable/ic_launcher_heisendroid.png | Bin .../main/res}/drawable/ic_menu_heisendroid.png | Bin {res => src/main/res}/drawable/ic_menu_logo.png | Bin .../main/res}/drawable/ic_stat_heisendroid.png | Bin {res => src/main/res}/drawable/logo.png | Bin {res => src/main/res}/drawable/logo_small.png | Bin .../drawable/progress_horizontal_heisendroid.xml | 0 .../drawable/selectable_background_heisendroid.xml | 0 .../drawable/spinner_background_ab_heisendroid.xml | 0 .../res}/drawable/tab_indicator_ab_heisendroid.xml | 0 {res => src/main/res}/values-de/arrays.xml | 0 {res => src/main/res}/values-de/strings.xml | 0 {res => src/main/res}/values-fr/arrays.xml | 0 {res => src/main/res}/values-fr/strings.xml | 0 {res => src/main/res}/values-hu/arrays.xml | 0 {res => src/main/res}/values-hu/strings.xml | 0 {res => src/main/res}/values-it/arrays.xml | 0 {res => src/main/res}/values-it/strings.xml | 0 {res => src/main/res}/values-pl/arrays.xml | 0 {res => src/main/res}/values-pl/strings.xml | 0 .../main/res/values-pt-rBR}/arrays.xml | 0 .../main/res/values-pt-rBR}/strings.xml | 0 .../main/res/values-pt-rPT}/arrays.xml | 0 .../main/res/values-pt-rPT}/strings.xml | 0 {res => src/main/res}/values/arrays.xml | 0 {res => src/main/res}/values/preference_keys.xml | 0 {res => src/main/res}/values/strings.xml | 0 .../main/res}/values/styles_heisendroid.xml | 0 {res => src/main/res}/xml/preferences.xml | 0 159 files changed, 17 insertions(+), 32 deletions(-) diff --git a/pom.xml b/pom.xml index 76d159c..040f192 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,9 @@ #L% --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> @@ -104,39 +106,16 @@ <!-- Post Release configuration --> <skipPostRelease>false</skipPostRelease> - <sdkVersion>19.0.1</sdkVersion> + <sdkVersion>21.1.2</sdkVersion> </properties> - <!--<repositories>--> - <!--<repository>--> - <!--<id>saymytexts-public-group</id>--> - <!--<url>https://nexus.nuiton.org/nexus/content/groups/say-my-texts-group/</url>--> - <!--<snapshots>--> - <!--<enabled>true</enabled>--> - <!--<checksumPolicy>fail</checksumPolicy>--> - <!--</snapshots>--> - <!--<releases>--> - <!--<enabled>true</enabled>--> - <!--<checksumPolicy>fail</checksumPolicy>--> - <!--</releases>--> - <!--</repository>--> - <!--</repositories>--> - - <!--<pluginRepositories>--> - <!--<pluginRepository>--> - <!--<id>saymytexts-public-group</id>--> - <!--<url>https://nexus.nuiton.org/nexus/content/groups/say-my-texts-group/</url>--> - <!--<snapshots>--> - <!--<enabled>true</enabled>--> - <!--<checksumPolicy>fail</checksumPolicy>--> - <!--</snapshots>--> - <!--<releases>--> - <!--<enabled>true</enabled>--> - <!--<checksumPolicy>fail</checksumPolicy>--> - <!--</releases>--> - <!--</pluginRepository>--> - <!--</pluginRepositories>--> + <repositories> + <repository> + <id>android-support</id> + <url>file://${env.ANDROID_HOME}/extras/android/m2repository</url> + </repository> + </repositories> <dependencies> @@ -154,6 +133,12 @@ <scope>test</scope> </dependency> + <!--<dependency>--> + <!--<groupId>com.android.support</groupId>--> + <!--<artifactId>support-v4</artifactId>--> + <!--<version>19.0.1</version>--> + <!--</dependency>--> + <dependency> <groupId>ch.acra</groupId> <artifactId>acra</artifactId> @@ -175,7 +160,7 @@ <plugin> <groupId>com.jayway.maven.plugins.android.generation2</groupId> <artifactId>android-maven-plugin</artifactId> - <version>3.8.2</version> + <version>4.0.0-rc.2</version> <executions> <execution> <id>alignApk</id> diff --git a/AndroidManifest.xml b/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to src/main/AndroidManifest.xml diff --git a/src/org/chorem/android/saymytexts/SMS.java b/src/main/java/org/chorem/android/saymytexts/SMS.java similarity index 100% rename from src/org/chorem/android/saymytexts/SMS.java rename to src/main/java/org/chorem/android/saymytexts/SMS.java diff --git a/src/org/chorem/android/saymytexts/SayMyTextService.java b/src/main/java/org/chorem/android/saymytexts/SayMyTextService.java similarity index 100% rename from src/org/chorem/android/saymytexts/SayMyTextService.java rename to src/main/java/org/chorem/android/saymytexts/SayMyTextService.java diff --git a/src/org/chorem/android/saymytexts/SayMyTextsApplication.java b/src/main/java/org/chorem/android/saymytexts/SayMyTextsApplication.java similarity index 100% rename from src/org/chorem/android/saymytexts/SayMyTextsApplication.java rename to src/main/java/org/chorem/android/saymytexts/SayMyTextsApplication.java diff --git a/src/org/chorem/android/saymytexts/SayMyTextsUtils.java b/src/main/java/org/chorem/android/saymytexts/SayMyTextsUtils.java similarity index 100% rename from src/org/chorem/android/saymytexts/SayMyTextsUtils.java rename to src/main/java/org/chorem/android/saymytexts/SayMyTextsUtils.java diff --git a/src/org/chorem/android/saymytexts/SettingsActivity.java b/src/main/java/org/chorem/android/saymytexts/SettingsActivity.java similarity index 100% rename from src/org/chorem/android/saymytexts/SettingsActivity.java rename to src/main/java/org/chorem/android/saymytexts/SettingsActivity.java diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java b/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java similarity index 100% rename from src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java rename to src/main/java/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java b/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java similarity index 100% rename from src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java rename to src/main/java/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java b/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java similarity index 100% rename from src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java rename to src/main/java/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java b/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java similarity index 100% rename from src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java rename to src/main/java/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java b/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java similarity index 100% rename from src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java rename to src/main/java/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java diff --git a/res/drawable-hdpi/ab_bottom_solid_heisendroid.9.png b/src/main/res/drawable-hdpi/ab_bottom_solid_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/ab_bottom_solid_heisendroid.9.png rename to src/main/res/drawable-hdpi/ab_bottom_solid_heisendroid.9.png diff --git a/res/drawable-hdpi/ab_solid_heisendroid.9.png b/src/main/res/drawable-hdpi/ab_solid_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/ab_solid_heisendroid.9.png rename to src/main/res/drawable-hdpi/ab_solid_heisendroid.9.png diff --git a/res/drawable-hdpi/ab_stacked_solid_heisendroid.9.png b/src/main/res/drawable-hdpi/ab_stacked_solid_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/ab_stacked_solid_heisendroid.9.png rename to src/main/res/drawable-hdpi/ab_stacked_solid_heisendroid.9.png diff --git a/res/drawable-hdpi/ab_texture_tile_heisendroid.png b/src/main/res/drawable-hdpi/ab_texture_tile_heisendroid.png similarity index 100% rename from res/drawable-hdpi/ab_texture_tile_heisendroid.png rename to src/main/res/drawable-hdpi/ab_texture_tile_heisendroid.png diff --git a/res/drawable-hdpi/ab_transparent_heisendroid.9.png b/src/main/res/drawable-hdpi/ab_transparent_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/ab_transparent_heisendroid.9.png rename to src/main/res/drawable-hdpi/ab_transparent_heisendroid.9.png diff --git a/res/drawable-hdpi/btn_cab_done_default_heisendroid.9.png b/src/main/res/drawable-hdpi/btn_cab_done_default_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/btn_cab_done_default_heisendroid.9.png rename to src/main/res/drawable-hdpi/btn_cab_done_default_heisendroid.9.png diff --git a/res/drawable-hdpi/btn_cab_done_focused_heisendroid.9.png b/src/main/res/drawable-hdpi/btn_cab_done_focused_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/btn_cab_done_focused_heisendroid.9.png rename to src/main/res/drawable-hdpi/btn_cab_done_focused_heisendroid.9.png diff --git a/res/drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png b/src/main/res/drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png rename to src/main/res/drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png diff --git a/res/drawable-hdpi/cab_background_bottom_heisendroid.9.png b/src/main/res/drawable-hdpi/cab_background_bottom_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/cab_background_bottom_heisendroid.9.png rename to src/main/res/drawable-hdpi/cab_background_bottom_heisendroid.9.png diff --git a/res/drawable-hdpi/cab_background_top_heisendroid.9.png b/src/main/res/drawable-hdpi/cab_background_top_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/cab_background_top_heisendroid.9.png rename to src/main/res/drawable-hdpi/cab_background_top_heisendroid.9.png diff --git a/res/drawable-hdpi/ic_launcher_heisendroid.png b/src/main/res/drawable-hdpi/ic_launcher_heisendroid.png similarity index 100% rename from res/drawable-hdpi/ic_launcher_heisendroid.png rename to src/main/res/drawable-hdpi/ic_launcher_heisendroid.png diff --git a/res/drawable-hdpi/ic_menu_logo.png b/src/main/res/drawable-hdpi/ic_menu_logo.png similarity index 100% rename from res/drawable-hdpi/ic_menu_logo.png rename to src/main/res/drawable-hdpi/ic_menu_logo.png diff --git a/res/drawable-hdpi/ic_stat_heisendroid.png b/src/main/res/drawable-hdpi/ic_stat_heisendroid.png similarity index 100% rename from res/drawable-hdpi/ic_stat_heisendroid.png rename to src/main/res/drawable-hdpi/ic_stat_heisendroid.png diff --git a/res/drawable-hdpi/list_focused_heisendroid.9.png b/src/main/res/drawable-hdpi/list_focused_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/list_focused_heisendroid.9.png rename to src/main/res/drawable-hdpi/list_focused_heisendroid.9.png diff --git a/res/drawable-hdpi/list_pressed_heisendroid.9.png b/src/main/res/drawable-hdpi/list_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/list_pressed_heisendroid.9.png rename to src/main/res/drawable-hdpi/list_pressed_heisendroid.9.png diff --git a/res/drawable-hdpi/menu_dropdown_panel_heisendroid.9.png b/src/main/res/drawable-hdpi/menu_dropdown_panel_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/menu_dropdown_panel_heisendroid.9.png rename to src/main/res/drawable-hdpi/menu_dropdown_panel_heisendroid.9.png diff --git a/res/drawable-hdpi/progress_bg_heisendroid.9.png b/src/main/res/drawable-hdpi/progress_bg_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/progress_bg_heisendroid.9.png rename to src/main/res/drawable-hdpi/progress_bg_heisendroid.9.png diff --git a/res/drawable-hdpi/progress_primary_heisendroid.9.png b/src/main/res/drawable-hdpi/progress_primary_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/progress_primary_heisendroid.9.png rename to src/main/res/drawable-hdpi/progress_primary_heisendroid.9.png diff --git a/res/drawable-hdpi/progress_secondary_heisendroid.9.png b/src/main/res/drawable-hdpi/progress_secondary_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/progress_secondary_heisendroid.9.png rename to src/main/res/drawable-hdpi/progress_secondary_heisendroid.9.png diff --git a/res/drawable-hdpi/spinner_ab_default_heisendroid.9.png b/src/main/res/drawable-hdpi/spinner_ab_default_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/spinner_ab_default_heisendroid.9.png rename to src/main/res/drawable-hdpi/spinner_ab_default_heisendroid.9.png diff --git a/res/drawable-hdpi/spinner_ab_disabled_heisendroid.9.png b/src/main/res/drawable-hdpi/spinner_ab_disabled_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/spinner_ab_disabled_heisendroid.9.png rename to src/main/res/drawable-hdpi/spinner_ab_disabled_heisendroid.9.png diff --git a/res/drawable-hdpi/spinner_ab_focused_heisendroid.9.png b/src/main/res/drawable-hdpi/spinner_ab_focused_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/spinner_ab_focused_heisendroid.9.png rename to src/main/res/drawable-hdpi/spinner_ab_focused_heisendroid.9.png diff --git a/res/drawable-hdpi/spinner_ab_pressed_heisendroid.9.png b/src/main/res/drawable-hdpi/spinner_ab_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/spinner_ab_pressed_heisendroid.9.png rename to src/main/res/drawable-hdpi/spinner_ab_pressed_heisendroid.9.png diff --git a/res/drawable-hdpi/tab_selected_focused_heisendroid.9.png b/src/main/res/drawable-hdpi/tab_selected_focused_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/tab_selected_focused_heisendroid.9.png rename to src/main/res/drawable-hdpi/tab_selected_focused_heisendroid.9.png diff --git a/res/drawable-hdpi/tab_selected_heisendroid.9.png b/src/main/res/drawable-hdpi/tab_selected_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/tab_selected_heisendroid.9.png rename to src/main/res/drawable-hdpi/tab_selected_heisendroid.9.png diff --git a/res/drawable-hdpi/tab_selected_pressed_heisendroid.9.png b/src/main/res/drawable-hdpi/tab_selected_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/tab_selected_pressed_heisendroid.9.png rename to src/main/res/drawable-hdpi/tab_selected_pressed_heisendroid.9.png diff --git a/res/drawable-hdpi/tab_unselected_focused_heisendroid.9.png b/src/main/res/drawable-hdpi/tab_unselected_focused_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/tab_unselected_focused_heisendroid.9.png rename to src/main/res/drawable-hdpi/tab_unselected_focused_heisendroid.9.png diff --git a/res/drawable-hdpi/tab_unselected_heisendroid.9.png b/src/main/res/drawable-hdpi/tab_unselected_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/tab_unselected_heisendroid.9.png rename to src/main/res/drawable-hdpi/tab_unselected_heisendroid.9.png diff --git a/res/drawable-hdpi/tab_unselected_pressed_heisendroid.9.png b/src/main/res/drawable-hdpi/tab_unselected_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-hdpi/tab_unselected_pressed_heisendroid.9.png rename to src/main/res/drawable-hdpi/tab_unselected_pressed_heisendroid.9.png diff --git a/res/drawable-mdpi/ab_bottom_solid_heisendroid.9.png b/src/main/res/drawable-mdpi/ab_bottom_solid_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/ab_bottom_solid_heisendroid.9.png rename to src/main/res/drawable-mdpi/ab_bottom_solid_heisendroid.9.png diff --git a/res/drawable-mdpi/ab_solid_heisendroid.9.png b/src/main/res/drawable-mdpi/ab_solid_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/ab_solid_heisendroid.9.png rename to src/main/res/drawable-mdpi/ab_solid_heisendroid.9.png diff --git a/res/drawable-mdpi/ab_stacked_solid_heisendroid.9.png b/src/main/res/drawable-mdpi/ab_stacked_solid_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/ab_stacked_solid_heisendroid.9.png rename to src/main/res/drawable-mdpi/ab_stacked_solid_heisendroid.9.png diff --git a/res/drawable-mdpi/ab_texture_tile_heisendroid.png b/src/main/res/drawable-mdpi/ab_texture_tile_heisendroid.png similarity index 100% rename from res/drawable-mdpi/ab_texture_tile_heisendroid.png rename to src/main/res/drawable-mdpi/ab_texture_tile_heisendroid.png diff --git a/res/drawable-mdpi/ab_transparent_heisendroid.9.png b/src/main/res/drawable-mdpi/ab_transparent_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/ab_transparent_heisendroid.9.png rename to src/main/res/drawable-mdpi/ab_transparent_heisendroid.9.png diff --git a/res/drawable-mdpi/btn_cab_done_default_heisendroid.9.png b/src/main/res/drawable-mdpi/btn_cab_done_default_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/btn_cab_done_default_heisendroid.9.png rename to src/main/res/drawable-mdpi/btn_cab_done_default_heisendroid.9.png diff --git a/res/drawable-mdpi/btn_cab_done_focused_heisendroid.9.png b/src/main/res/drawable-mdpi/btn_cab_done_focused_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/btn_cab_done_focused_heisendroid.9.png rename to src/main/res/drawable-mdpi/btn_cab_done_focused_heisendroid.9.png diff --git a/res/drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png b/src/main/res/drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png rename to src/main/res/drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png diff --git a/res/drawable-mdpi/cab_background_bottom_heisendroid.9.png b/src/main/res/drawable-mdpi/cab_background_bottom_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/cab_background_bottom_heisendroid.9.png rename to src/main/res/drawable-mdpi/cab_background_bottom_heisendroid.9.png diff --git a/res/drawable-mdpi/cab_background_top_heisendroid.9.png b/src/main/res/drawable-mdpi/cab_background_top_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/cab_background_top_heisendroid.9.png rename to src/main/res/drawable-mdpi/cab_background_top_heisendroid.9.png diff --git a/res/drawable-mdpi/ic_launcher_heisendroid.png b/src/main/res/drawable-mdpi/ic_launcher_heisendroid.png similarity index 100% rename from res/drawable-mdpi/ic_launcher_heisendroid.png rename to src/main/res/drawable-mdpi/ic_launcher_heisendroid.png diff --git a/res/drawable-mdpi/ic_menu_logo.png b/src/main/res/drawable-mdpi/ic_menu_logo.png similarity index 100% rename from res/drawable-mdpi/ic_menu_logo.png rename to src/main/res/drawable-mdpi/ic_menu_logo.png diff --git a/res/drawable-mdpi/ic_stat_heisendroid.png b/src/main/res/drawable-mdpi/ic_stat_heisendroid.png similarity index 100% rename from res/drawable-mdpi/ic_stat_heisendroid.png rename to src/main/res/drawable-mdpi/ic_stat_heisendroid.png diff --git a/res/drawable-mdpi/list_focused_heisendroid.9.png b/src/main/res/drawable-mdpi/list_focused_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/list_focused_heisendroid.9.png rename to src/main/res/drawable-mdpi/list_focused_heisendroid.9.png diff --git a/res/drawable-mdpi/list_pressed_heisendroid.9.png b/src/main/res/drawable-mdpi/list_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/list_pressed_heisendroid.9.png rename to src/main/res/drawable-mdpi/list_pressed_heisendroid.9.png diff --git a/res/drawable-mdpi/menu_dropdown_panel_heisendroid.9.png b/src/main/res/drawable-mdpi/menu_dropdown_panel_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/menu_dropdown_panel_heisendroid.9.png rename to src/main/res/drawable-mdpi/menu_dropdown_panel_heisendroid.9.png diff --git a/res/drawable-mdpi/progress_bg_heisendroid.9.png b/src/main/res/drawable-mdpi/progress_bg_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/progress_bg_heisendroid.9.png rename to src/main/res/drawable-mdpi/progress_bg_heisendroid.9.png diff --git a/res/drawable-mdpi/progress_primary_heisendroid.9.png b/src/main/res/drawable-mdpi/progress_primary_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/progress_primary_heisendroid.9.png rename to src/main/res/drawable-mdpi/progress_primary_heisendroid.9.png diff --git a/res/drawable-mdpi/progress_secondary_heisendroid.9.png b/src/main/res/drawable-mdpi/progress_secondary_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/progress_secondary_heisendroid.9.png rename to src/main/res/drawable-mdpi/progress_secondary_heisendroid.9.png diff --git a/res/drawable-mdpi/spinner_ab_default_heisendroid.9.png b/src/main/res/drawable-mdpi/spinner_ab_default_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/spinner_ab_default_heisendroid.9.png rename to src/main/res/drawable-mdpi/spinner_ab_default_heisendroid.9.png diff --git a/res/drawable-mdpi/spinner_ab_disabled_heisendroid.9.png b/src/main/res/drawable-mdpi/spinner_ab_disabled_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/spinner_ab_disabled_heisendroid.9.png rename to src/main/res/drawable-mdpi/spinner_ab_disabled_heisendroid.9.png diff --git a/res/drawable-mdpi/spinner_ab_focused_heisendroid.9.png b/src/main/res/drawable-mdpi/spinner_ab_focused_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/spinner_ab_focused_heisendroid.9.png rename to src/main/res/drawable-mdpi/spinner_ab_focused_heisendroid.9.png diff --git a/res/drawable-mdpi/spinner_ab_pressed_heisendroid.9.png b/src/main/res/drawable-mdpi/spinner_ab_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/spinner_ab_pressed_heisendroid.9.png rename to src/main/res/drawable-mdpi/spinner_ab_pressed_heisendroid.9.png diff --git a/res/drawable-mdpi/tab_selected_focused_heisendroid.9.png b/src/main/res/drawable-mdpi/tab_selected_focused_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/tab_selected_focused_heisendroid.9.png rename to src/main/res/drawable-mdpi/tab_selected_focused_heisendroid.9.png diff --git a/res/drawable-mdpi/tab_selected_heisendroid.9.png b/src/main/res/drawable-mdpi/tab_selected_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/tab_selected_heisendroid.9.png rename to src/main/res/drawable-mdpi/tab_selected_heisendroid.9.png diff --git a/res/drawable-mdpi/tab_selected_pressed_heisendroid.9.png b/src/main/res/drawable-mdpi/tab_selected_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/tab_selected_pressed_heisendroid.9.png rename to src/main/res/drawable-mdpi/tab_selected_pressed_heisendroid.9.png diff --git a/res/drawable-mdpi/tab_unselected_focused_heisendroid.9.png b/src/main/res/drawable-mdpi/tab_unselected_focused_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/tab_unselected_focused_heisendroid.9.png rename to src/main/res/drawable-mdpi/tab_unselected_focused_heisendroid.9.png diff --git a/res/drawable-mdpi/tab_unselected_heisendroid.9.png b/src/main/res/drawable-mdpi/tab_unselected_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/tab_unselected_heisendroid.9.png rename to src/main/res/drawable-mdpi/tab_unselected_heisendroid.9.png diff --git a/res/drawable-mdpi/tab_unselected_pressed_heisendroid.9.png b/src/main/res/drawable-mdpi/tab_unselected_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-mdpi/tab_unselected_pressed_heisendroid.9.png rename to src/main/res/drawable-mdpi/tab_unselected_pressed_heisendroid.9.png diff --git a/res/drawable-xhdpi/ab_bottom_solid_heisendroid.9.png b/src/main/res/drawable-xhdpi/ab_bottom_solid_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/ab_bottom_solid_heisendroid.9.png rename to src/main/res/drawable-xhdpi/ab_bottom_solid_heisendroid.9.png diff --git a/res/drawable-xhdpi/ab_solid_heisendroid.9.png b/src/main/res/drawable-xhdpi/ab_solid_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/ab_solid_heisendroid.9.png rename to src/main/res/drawable-xhdpi/ab_solid_heisendroid.9.png diff --git a/res/drawable-xhdpi/ab_stacked_solid_heisendroid.9.png b/src/main/res/drawable-xhdpi/ab_stacked_solid_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/ab_stacked_solid_heisendroid.9.png rename to src/main/res/drawable-xhdpi/ab_stacked_solid_heisendroid.9.png diff --git a/res/drawable-xhdpi/ab_texture_tile_heisendroid.png b/src/main/res/drawable-xhdpi/ab_texture_tile_heisendroid.png similarity index 100% rename from res/drawable-xhdpi/ab_texture_tile_heisendroid.png rename to src/main/res/drawable-xhdpi/ab_texture_tile_heisendroid.png diff --git a/res/drawable-xhdpi/ab_transparent_heisendroid.9.png b/src/main/res/drawable-xhdpi/ab_transparent_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/ab_transparent_heisendroid.9.png rename to src/main/res/drawable-xhdpi/ab_transparent_heisendroid.9.png diff --git a/res/drawable-xhdpi/btn_cab_done_default_heisendroid.9.png b/src/main/res/drawable-xhdpi/btn_cab_done_default_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/btn_cab_done_default_heisendroid.9.png rename to src/main/res/drawable-xhdpi/btn_cab_done_default_heisendroid.9.png diff --git a/res/drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png b/src/main/res/drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png rename to src/main/res/drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png diff --git a/res/drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png b/src/main/res/drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png rename to src/main/res/drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png diff --git a/res/drawable-xhdpi/cab_background_bottom_heisendroid.9.png b/src/main/res/drawable-xhdpi/cab_background_bottom_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/cab_background_bottom_heisendroid.9.png rename to src/main/res/drawable-xhdpi/cab_background_bottom_heisendroid.9.png diff --git a/res/drawable-xhdpi/cab_background_top_heisendroid.9.png b/src/main/res/drawable-xhdpi/cab_background_top_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/cab_background_top_heisendroid.9.png rename to src/main/res/drawable-xhdpi/cab_background_top_heisendroid.9.png diff --git a/res/drawable-xhdpi/ic_launcher_heisendroid.png b/src/main/res/drawable-xhdpi/ic_launcher_heisendroid.png similarity index 100% rename from res/drawable-xhdpi/ic_launcher_heisendroid.png rename to src/main/res/drawable-xhdpi/ic_launcher_heisendroid.png diff --git a/res/drawable-xhdpi/ic_menu_logo.png b/src/main/res/drawable-xhdpi/ic_menu_logo.png similarity index 100% rename from res/drawable-xhdpi/ic_menu_logo.png rename to src/main/res/drawable-xhdpi/ic_menu_logo.png diff --git a/res/drawable-xhdpi/ic_stat_heisendroid.png b/src/main/res/drawable-xhdpi/ic_stat_heisendroid.png similarity index 100% rename from res/drawable-xhdpi/ic_stat_heisendroid.png rename to src/main/res/drawable-xhdpi/ic_stat_heisendroid.png diff --git a/res/drawable-xhdpi/list_focused_heisendroid.9.png b/src/main/res/drawable-xhdpi/list_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/list_focused_heisendroid.9.png rename to src/main/res/drawable-xhdpi/list_focused_heisendroid.9.png diff --git a/res/drawable-xhdpi/list_pressed_heisendroid.9.png b/src/main/res/drawable-xhdpi/list_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/list_pressed_heisendroid.9.png rename to src/main/res/drawable-xhdpi/list_pressed_heisendroid.9.png diff --git a/res/drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png b/src/main/res/drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png rename to src/main/res/drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png diff --git a/res/drawable-xhdpi/progress_bg_heisendroid.9.png b/src/main/res/drawable-xhdpi/progress_bg_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/progress_bg_heisendroid.9.png rename to src/main/res/drawable-xhdpi/progress_bg_heisendroid.9.png diff --git a/res/drawable-xhdpi/progress_primary_heisendroid.9.png b/src/main/res/drawable-xhdpi/progress_primary_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/progress_primary_heisendroid.9.png rename to src/main/res/drawable-xhdpi/progress_primary_heisendroid.9.png diff --git a/res/drawable-xhdpi/progress_secondary_heisendroid.9.png b/src/main/res/drawable-xhdpi/progress_secondary_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/progress_secondary_heisendroid.9.png rename to src/main/res/drawable-xhdpi/progress_secondary_heisendroid.9.png diff --git a/res/drawable-xhdpi/spinner_ab_default_heisendroid.9.png b/src/main/res/drawable-xhdpi/spinner_ab_default_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/spinner_ab_default_heisendroid.9.png rename to src/main/res/drawable-xhdpi/spinner_ab_default_heisendroid.9.png diff --git a/res/drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png b/src/main/res/drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png rename to src/main/res/drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png diff --git a/res/drawable-xhdpi/spinner_ab_focused_heisendroid.9.png b/src/main/res/drawable-xhdpi/spinner_ab_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/spinner_ab_focused_heisendroid.9.png rename to src/main/res/drawable-xhdpi/spinner_ab_focused_heisendroid.9.png diff --git a/res/drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png b/src/main/res/drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png rename to src/main/res/drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png diff --git a/res/drawable-xhdpi/tab_selected_focused_heisendroid.9.png b/src/main/res/drawable-xhdpi/tab_selected_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/tab_selected_focused_heisendroid.9.png rename to src/main/res/drawable-xhdpi/tab_selected_focused_heisendroid.9.png diff --git a/res/drawable-xhdpi/tab_selected_heisendroid.9.png b/src/main/res/drawable-xhdpi/tab_selected_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/tab_selected_heisendroid.9.png rename to src/main/res/drawable-xhdpi/tab_selected_heisendroid.9.png diff --git a/res/drawable-xhdpi/tab_selected_pressed_heisendroid.9.png b/src/main/res/drawable-xhdpi/tab_selected_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/tab_selected_pressed_heisendroid.9.png rename to src/main/res/drawable-xhdpi/tab_selected_pressed_heisendroid.9.png diff --git a/res/drawable-xhdpi/tab_unselected_focused_heisendroid.9.png b/src/main/res/drawable-xhdpi/tab_unselected_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/tab_unselected_focused_heisendroid.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_focused_heisendroid.9.png diff --git a/res/drawable-xhdpi/tab_unselected_heisendroid.9.png b/src/main/res/drawable-xhdpi/tab_unselected_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/tab_unselected_heisendroid.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_heisendroid.9.png diff --git a/res/drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png b/src/main/res/drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png rename to src/main/res/drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png diff --git a/res/drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png b/src/main/res/drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png diff --git a/res/drawable-xxhdpi/ab_solid_heisendroid.9.png b/src/main/res/drawable-xxhdpi/ab_solid_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/ab_solid_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/ab_solid_heisendroid.9.png diff --git a/res/drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png b/src/main/res/drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png diff --git a/res/drawable-xxhdpi/ab_texture_tile_heisendroid.png b/src/main/res/drawable-xxhdpi/ab_texture_tile_heisendroid.png similarity index 100% rename from res/drawable-xxhdpi/ab_texture_tile_heisendroid.png rename to src/main/res/drawable-xxhdpi/ab_texture_tile_heisendroid.png diff --git a/res/drawable-xxhdpi/ab_transparent_heisendroid.9.png b/src/main/res/drawable-xxhdpi/ab_transparent_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/ab_transparent_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/ab_transparent_heisendroid.9.png diff --git a/res/drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png b/src/main/res/drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png diff --git a/res/drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png b/src/main/res/drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png diff --git a/res/drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png b/src/main/res/drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png diff --git a/res/drawable-xxhdpi/cab_background_bottom_heisendroid.9.png b/src/main/res/drawable-xxhdpi/cab_background_bottom_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/cab_background_bottom_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/cab_background_bottom_heisendroid.9.png diff --git a/res/drawable-xxhdpi/cab_background_top_heisendroid.9.png b/src/main/res/drawable-xxhdpi/cab_background_top_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/cab_background_top_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/cab_background_top_heisendroid.9.png diff --git a/res/drawable-xxhdpi/ic_launcher_heisendroid.png b/src/main/res/drawable-xxhdpi/ic_launcher_heisendroid.png similarity index 100% rename from res/drawable-xxhdpi/ic_launcher_heisendroid.png rename to src/main/res/drawable-xxhdpi/ic_launcher_heisendroid.png diff --git a/res/drawable-xxhdpi/ic_menu_logo.png b/src/main/res/drawable-xxhdpi/ic_menu_logo.png similarity index 100% rename from res/drawable-xxhdpi/ic_menu_logo.png rename to src/main/res/drawable-xxhdpi/ic_menu_logo.png diff --git a/res/drawable-xxhdpi/ic_stat_heisendroid.png b/src/main/res/drawable-xxhdpi/ic_stat_heisendroid.png similarity index 100% rename from res/drawable-xxhdpi/ic_stat_heisendroid.png rename to src/main/res/drawable-xxhdpi/ic_stat_heisendroid.png diff --git a/res/drawable-xxhdpi/list_focused_heisendroid.9.png b/src/main/res/drawable-xxhdpi/list_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/list_focused_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/list_focused_heisendroid.9.png diff --git a/res/drawable-xxhdpi/list_pressed_heisendroid.9.png b/src/main/res/drawable-xxhdpi/list_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/list_pressed_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/list_pressed_heisendroid.9.png diff --git a/res/drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png b/src/main/res/drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png diff --git a/res/drawable-xxhdpi/progress_bg_heisendroid.9.png b/src/main/res/drawable-xxhdpi/progress_bg_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/progress_bg_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/progress_bg_heisendroid.9.png diff --git a/res/drawable-xxhdpi/progress_primary_heisendroid.9.png b/src/main/res/drawable-xxhdpi/progress_primary_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/progress_primary_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/progress_primary_heisendroid.9.png diff --git a/res/drawable-xxhdpi/progress_secondary_heisendroid.9.png b/src/main/res/drawable-xxhdpi/progress_secondary_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/progress_secondary_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/progress_secondary_heisendroid.9.png diff --git a/res/drawable-xxhdpi/spinner_ab_default_heisendroid.9.png b/src/main/res/drawable-xxhdpi/spinner_ab_default_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/spinner_ab_default_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/spinner_ab_default_heisendroid.9.png diff --git a/res/drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png b/src/main/res/drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png diff --git a/res/drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png b/src/main/res/drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png diff --git a/res/drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png b/src/main/res/drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png diff --git a/res/drawable-xxhdpi/tab_selected_focused_heisendroid.9.png b/src/main/res/drawable-xxhdpi/tab_selected_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/tab_selected_focused_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/tab_selected_focused_heisendroid.9.png diff --git a/res/drawable-xxhdpi/tab_selected_heisendroid.9.png b/src/main/res/drawable-xxhdpi/tab_selected_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/tab_selected_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/tab_selected_heisendroid.9.png diff --git a/res/drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png b/src/main/res/drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png diff --git a/res/drawable-xxhdpi/tab_unselected_focused_heisendroid.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_focused_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/tab_unselected_focused_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/tab_unselected_focused_heisendroid.9.png diff --git a/res/drawable-xxhdpi/tab_unselected_heisendroid.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/tab_unselected_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/tab_unselected_heisendroid.9.png diff --git a/res/drawable-xxhdpi/tab_unselected_pressed_heisendroid.9.png b/src/main/res/drawable-xxhdpi/tab_unselected_pressed_heisendroid.9.png similarity index 100% rename from res/drawable-xxhdpi/tab_unselected_pressed_heisendroid.9.png rename to src/main/res/drawable-xxhdpi/tab_unselected_pressed_heisendroid.9.png diff --git a/res/drawable/ab_background_textured_heisendroid.xml b/src/main/res/drawable/ab_background_textured_heisendroid.xml similarity index 100% rename from res/drawable/ab_background_textured_heisendroid.xml rename to src/main/res/drawable/ab_background_textured_heisendroid.xml diff --git a/res/drawable/btn_cab_done_heisendroid.xml b/src/main/res/drawable/btn_cab_done_heisendroid.xml similarity index 100% rename from res/drawable/btn_cab_done_heisendroid.xml rename to src/main/res/drawable/btn_cab_done_heisendroid.xml diff --git a/res/drawable/ic_launcher_heisendroid.png b/src/main/res/drawable/ic_launcher_heisendroid.png similarity index 100% rename from res/drawable/ic_launcher_heisendroid.png rename to src/main/res/drawable/ic_launcher_heisendroid.png diff --git a/res/drawable/ic_menu_heisendroid.png b/src/main/res/drawable/ic_menu_heisendroid.png similarity index 100% rename from res/drawable/ic_menu_heisendroid.png rename to src/main/res/drawable/ic_menu_heisendroid.png diff --git a/res/drawable/ic_menu_logo.png b/src/main/res/drawable/ic_menu_logo.png similarity index 100% rename from res/drawable/ic_menu_logo.png rename to src/main/res/drawable/ic_menu_logo.png diff --git a/res/drawable/ic_stat_heisendroid.png b/src/main/res/drawable/ic_stat_heisendroid.png similarity index 100% rename from res/drawable/ic_stat_heisendroid.png rename to src/main/res/drawable/ic_stat_heisendroid.png diff --git a/res/drawable/logo.png b/src/main/res/drawable/logo.png similarity index 100% rename from res/drawable/logo.png rename to src/main/res/drawable/logo.png diff --git a/res/drawable/logo_small.png b/src/main/res/drawable/logo_small.png similarity index 100% rename from res/drawable/logo_small.png rename to src/main/res/drawable/logo_small.png diff --git a/res/drawable/progress_horizontal_heisendroid.xml b/src/main/res/drawable/progress_horizontal_heisendroid.xml similarity index 100% rename from res/drawable/progress_horizontal_heisendroid.xml rename to src/main/res/drawable/progress_horizontal_heisendroid.xml diff --git a/res/drawable/selectable_background_heisendroid.xml b/src/main/res/drawable/selectable_background_heisendroid.xml similarity index 100% rename from res/drawable/selectable_background_heisendroid.xml rename to src/main/res/drawable/selectable_background_heisendroid.xml diff --git a/res/drawable/spinner_background_ab_heisendroid.xml b/src/main/res/drawable/spinner_background_ab_heisendroid.xml similarity index 100% rename from res/drawable/spinner_background_ab_heisendroid.xml rename to src/main/res/drawable/spinner_background_ab_heisendroid.xml diff --git a/res/drawable/tab_indicator_ab_heisendroid.xml b/src/main/res/drawable/tab_indicator_ab_heisendroid.xml similarity index 100% rename from res/drawable/tab_indicator_ab_heisendroid.xml rename to src/main/res/drawable/tab_indicator_ab_heisendroid.xml diff --git a/res/values-de/arrays.xml b/src/main/res/values-de/arrays.xml similarity index 100% rename from res/values-de/arrays.xml rename to src/main/res/values-de/arrays.xml diff --git a/res/values-de/strings.xml b/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to src/main/res/values-de/strings.xml diff --git a/res/values-fr/arrays.xml b/src/main/res/values-fr/arrays.xml similarity index 100% rename from res/values-fr/arrays.xml rename to src/main/res/values-fr/arrays.xml diff --git a/res/values-fr/strings.xml b/src/main/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to src/main/res/values-fr/strings.xml diff --git a/res/values-hu/arrays.xml b/src/main/res/values-hu/arrays.xml similarity index 100% rename from res/values-hu/arrays.xml rename to src/main/res/values-hu/arrays.xml diff --git a/res/values-hu/strings.xml b/src/main/res/values-hu/strings.xml similarity index 100% rename from res/values-hu/strings.xml rename to src/main/res/values-hu/strings.xml diff --git a/res/values-it/arrays.xml b/src/main/res/values-it/arrays.xml similarity index 100% rename from res/values-it/arrays.xml rename to src/main/res/values-it/arrays.xml diff --git a/res/values-it/strings.xml b/src/main/res/values-it/strings.xml similarity index 100% rename from res/values-it/strings.xml rename to src/main/res/values-it/strings.xml diff --git a/res/values-pl/arrays.xml b/src/main/res/values-pl/arrays.xml similarity index 100% rename from res/values-pl/arrays.xml rename to src/main/res/values-pl/arrays.xml diff --git a/res/values-pl/strings.xml b/src/main/res/values-pl/strings.xml similarity index 100% rename from res/values-pl/strings.xml rename to src/main/res/values-pl/strings.xml diff --git a/res/values-pt-BR/arrays.xml b/src/main/res/values-pt-rBR/arrays.xml similarity index 100% rename from res/values-pt-BR/arrays.xml rename to src/main/res/values-pt-rBR/arrays.xml diff --git a/res/values-pt-BR/strings.xml b/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from res/values-pt-BR/strings.xml rename to src/main/res/values-pt-rBR/strings.xml diff --git a/res/values-pt-PT/arrays.xml b/src/main/res/values-pt-rPT/arrays.xml similarity index 100% rename from res/values-pt-PT/arrays.xml rename to src/main/res/values-pt-rPT/arrays.xml diff --git a/res/values-pt-PT/strings.xml b/src/main/res/values-pt-rPT/strings.xml similarity index 100% rename from res/values-pt-PT/strings.xml rename to src/main/res/values-pt-rPT/strings.xml diff --git a/res/values/arrays.xml b/src/main/res/values/arrays.xml similarity index 100% rename from res/values/arrays.xml rename to src/main/res/values/arrays.xml diff --git a/res/values/preference_keys.xml b/src/main/res/values/preference_keys.xml similarity index 100% rename from res/values/preference_keys.xml rename to src/main/res/values/preference_keys.xml diff --git a/res/values/strings.xml b/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to src/main/res/values/strings.xml diff --git a/res/values/styles_heisendroid.xml b/src/main/res/values/styles_heisendroid.xml similarity index 100% rename from res/values/styles_heisendroid.xml rename to src/main/res/values/styles_heisendroid.xml diff --git a/res/xml/preferences.xml b/src/main/res/xml/preferences.xml similarity index 100% rename from res/xml/preferences.xml rename to src/main/res/xml/preferences.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 32b1f143193abb9a4c8da0e60fd7d4a66ff7ba6a Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 12:51:31 2014 +0100 move folders --- src/{main/java => }/org/chorem/android/saymytexts/SMS.java | 0 src/{main/java => }/org/chorem/android/saymytexts/SayMyTextService.java | 0 .../java => }/org/chorem/android/saymytexts/SayMyTextsApplication.java | 0 src/{main/java => }/org/chorem/android/saymytexts/SayMyTextsUtils.java | 0 src/{main/java => }/org/chorem/android/saymytexts/SettingsActivity.java | 0 .../saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java | 0 .../saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java | 0 .../android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java | 0 .../android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java | 0 .../saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java | 0 10 files changed, 0 insertions(+), 0 deletions(-) diff --git a/src/main/java/org/chorem/android/saymytexts/SMS.java b/src/org/chorem/android/saymytexts/SMS.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/SMS.java rename to src/org/chorem/android/saymytexts/SMS.java diff --git a/src/main/java/org/chorem/android/saymytexts/SayMyTextService.java b/src/org/chorem/android/saymytexts/SayMyTextService.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/SayMyTextService.java rename to src/org/chorem/android/saymytexts/SayMyTextService.java diff --git a/src/main/java/org/chorem/android/saymytexts/SayMyTextsApplication.java b/src/org/chorem/android/saymytexts/SayMyTextsApplication.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/SayMyTextsApplication.java rename to src/org/chorem/android/saymytexts/SayMyTextsApplication.java diff --git a/src/main/java/org/chorem/android/saymytexts/SayMyTextsUtils.java b/src/org/chorem/android/saymytexts/SayMyTextsUtils.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/SayMyTextsUtils.java rename to src/org/chorem/android/saymytexts/SayMyTextsUtils.java diff --git a/src/main/java/org/chorem/android/saymytexts/SettingsActivity.java b/src/org/chorem/android/saymytexts/SettingsActivity.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/SettingsActivity.java rename to src/org/chorem/android/saymytexts/SettingsActivity.java diff --git a/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java rename to src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java diff --git a/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java rename to src/org/chorem/android/saymytexts/broadcastreceiver/DeviceConnectionBroadcastReceiver.java diff --git a/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java rename to src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java diff --git a/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java rename to src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java diff --git a/src/main/java/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java similarity index 100% rename from src/main/java/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java rename to src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 be3d3ea376f0265304ba01d9fcb4e8d1c1c28111 Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 13:04:59 2014 +0100 configure plugin --- src/main/AndroidManifest.xml => AndroidManifest.xml | 0 pom.xml | 2 ++ .../drawable-hdpi/ab_bottom_solid_heisendroid.9.png | Bin .../res => res}/drawable-hdpi/ab_solid_heisendroid.9.png | Bin .../drawable-hdpi/ab_stacked_solid_heisendroid.9.png | Bin .../drawable-hdpi/ab_texture_tile_heisendroid.png | Bin .../drawable-hdpi/ab_transparent_heisendroid.9.png | Bin .../drawable-hdpi/btn_cab_done_default_heisendroid.9.png | Bin .../drawable-hdpi/btn_cab_done_focused_heisendroid.9.png | Bin .../drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png | Bin .../drawable-hdpi/cab_background_bottom_heisendroid.9.png | Bin .../drawable-hdpi/cab_background_top_heisendroid.9.png | Bin .../res => res}/drawable-hdpi/ic_launcher_heisendroid.png | Bin {src/main/res => res}/drawable-hdpi/ic_menu_logo.png | Bin {src/main/res => res}/drawable-hdpi/ic_stat_heisendroid.png | Bin .../drawable-hdpi/list_focused_heisendroid.9.png | Bin .../drawable-hdpi/list_pressed_heisendroid.9.png | Bin .../drawable-hdpi/menu_dropdown_panel_heisendroid.9.png | Bin .../res => res}/drawable-hdpi/progress_bg_heisendroid.9.png | Bin .../drawable-hdpi/progress_primary_heisendroid.9.png | Bin .../drawable-hdpi/progress_secondary_heisendroid.9.png | Bin .../drawable-hdpi/spinner_ab_default_heisendroid.9.png | Bin .../drawable-hdpi/spinner_ab_disabled_heisendroid.9.png | Bin .../drawable-hdpi/spinner_ab_focused_heisendroid.9.png | Bin .../drawable-hdpi/spinner_ab_pressed_heisendroid.9.png | Bin .../drawable-hdpi/tab_selected_focused_heisendroid.9.png | Bin .../drawable-hdpi/tab_selected_heisendroid.9.png | Bin .../drawable-hdpi/tab_selected_pressed_heisendroid.9.png | Bin .../drawable-hdpi/tab_unselected_focused_heisendroid.9.png | Bin .../drawable-hdpi/tab_unselected_heisendroid.9.png | Bin .../drawable-hdpi/tab_unselected_pressed_heisendroid.9.png | Bin .../drawable-mdpi/ab_bottom_solid_heisendroid.9.png | Bin .../res => res}/drawable-mdpi/ab_solid_heisendroid.9.png | Bin .../drawable-mdpi/ab_stacked_solid_heisendroid.9.png | Bin .../drawable-mdpi/ab_texture_tile_heisendroid.png | Bin .../drawable-mdpi/ab_transparent_heisendroid.9.png | Bin .../drawable-mdpi/btn_cab_done_default_heisendroid.9.png | Bin .../drawable-mdpi/btn_cab_done_focused_heisendroid.9.png | Bin .../drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png | Bin .../drawable-mdpi/cab_background_bottom_heisendroid.9.png | Bin .../drawable-mdpi/cab_background_top_heisendroid.9.png | Bin .../res => res}/drawable-mdpi/ic_launcher_heisendroid.png | Bin {src/main/res => res}/drawable-mdpi/ic_menu_logo.png | Bin {src/main/res => res}/drawable-mdpi/ic_stat_heisendroid.png | Bin .../drawable-mdpi/list_focused_heisendroid.9.png | Bin .../drawable-mdpi/list_pressed_heisendroid.9.png | Bin .../drawable-mdpi/menu_dropdown_panel_heisendroid.9.png | Bin .../res => res}/drawable-mdpi/progress_bg_heisendroid.9.png | Bin .../drawable-mdpi/progress_primary_heisendroid.9.png | Bin .../drawable-mdpi/progress_secondary_heisendroid.9.png | Bin .../drawable-mdpi/spinner_ab_default_heisendroid.9.png | Bin .../drawable-mdpi/spinner_ab_disabled_heisendroid.9.png | Bin .../drawable-mdpi/spinner_ab_focused_heisendroid.9.png | Bin .../drawable-mdpi/spinner_ab_pressed_heisendroid.9.png | Bin .../drawable-mdpi/tab_selected_focused_heisendroid.9.png | Bin .../drawable-mdpi/tab_selected_heisendroid.9.png | Bin .../drawable-mdpi/tab_selected_pressed_heisendroid.9.png | Bin .../drawable-mdpi/tab_unselected_focused_heisendroid.9.png | Bin .../drawable-mdpi/tab_unselected_heisendroid.9.png | Bin .../drawable-mdpi/tab_unselected_pressed_heisendroid.9.png | Bin .../drawable-xhdpi/ab_bottom_solid_heisendroid.9.png | Bin .../res => res}/drawable-xhdpi/ab_solid_heisendroid.9.png | Bin .../drawable-xhdpi/ab_stacked_solid_heisendroid.9.png | Bin .../drawable-xhdpi/ab_texture_tile_heisendroid.png | Bin .../drawable-xhdpi/ab_transparent_heisendroid.9.png | Bin .../drawable-xhdpi/btn_cab_done_default_heisendroid.9.png | Bin .../drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png | Bin .../drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png | Bin .../drawable-xhdpi/cab_background_bottom_heisendroid.9.png | Bin .../drawable-xhdpi/cab_background_top_heisendroid.9.png | Bin .../res => res}/drawable-xhdpi/ic_launcher_heisendroid.png | Bin {src/main/res => res}/drawable-xhdpi/ic_menu_logo.png | Bin .../main/res => res}/drawable-xhdpi/ic_stat_heisendroid.png | Bin .../drawable-xhdpi/list_focused_heisendroid.9.png | Bin .../drawable-xhdpi/list_pressed_heisendroid.9.png | Bin .../drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png | Bin .../drawable-xhdpi/progress_bg_heisendroid.9.png | Bin .../drawable-xhdpi/progress_primary_heisendroid.9.png | Bin .../drawable-xhdpi/progress_secondary_heisendroid.9.png | Bin .../drawable-xhdpi/spinner_ab_default_heisendroid.9.png | Bin .../drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png | Bin .../drawable-xhdpi/spinner_ab_focused_heisendroid.9.png | Bin .../drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png | Bin .../drawable-xhdpi/tab_selected_focused_heisendroid.9.png | Bin .../drawable-xhdpi/tab_selected_heisendroid.9.png | Bin .../drawable-xhdpi/tab_selected_pressed_heisendroid.9.png | Bin .../drawable-xhdpi/tab_unselected_focused_heisendroid.9.png | Bin .../drawable-xhdpi/tab_unselected_heisendroid.9.png | Bin .../drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png | Bin .../drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png | Bin .../res => res}/drawable-xxhdpi/ab_solid_heisendroid.9.png | Bin .../drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png | Bin .../drawable-xxhdpi/ab_texture_tile_heisendroid.png | Bin .../drawable-xxhdpi/ab_transparent_heisendroid.9.png | Bin .../drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png | Bin .../drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png | Bin .../drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png | Bin .../drawable-xxhdpi/cab_background_bottom_heisendroid.9.png | Bin .../drawable-xxhdpi/cab_background_top_heisendroid.9.png | Bin .../res => res}/drawable-xxhdpi/ic_launcher_heisendroid.png | Bin {src/main/res => res}/drawable-xxhdpi/ic_menu_logo.png | Bin .../res => res}/drawable-xxhdpi/ic_stat_heisendroid.png | Bin .../drawable-xxhdpi/list_focused_heisendroid.9.png | Bin .../drawable-xxhdpi/list_pressed_heisendroid.9.png | Bin .../drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png | Bin .../drawable-xxhdpi/progress_bg_heisendroid.9.png | Bin .../drawable-xxhdpi/progress_primary_heisendroid.9.png | Bin .../drawable-xxhdpi/progress_secondary_heisendroid.9.png | Bin .../drawable-xxhdpi/spinner_ab_default_heisendroid.9.png | Bin .../drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png | Bin .../drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png | Bin .../drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png | Bin .../drawable-xxhdpi/tab_selected_focused_heisendroid.9.png | Bin .../drawable-xxhdpi/tab_selected_heisendroid.9.png | Bin .../drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png | Bin .../tab_unselected_focused_heisendroid.9.png | Bin .../drawable-xxhdpi/tab_unselected_heisendroid.9.png | Bin .../tab_unselected_pressed_heisendroid.9.png | Bin .../drawable/ab_background_textured_heisendroid.xml | 0 {src/main/res => res}/drawable/btn_cab_done_heisendroid.xml | 0 {src/main/res => res}/drawable/ic_launcher_heisendroid.png | Bin {src/main/res => res}/drawable/ic_menu_heisendroid.png | Bin {src/main/res => res}/drawable/ic_menu_logo.png | Bin {src/main/res => res}/drawable/ic_stat_heisendroid.png | Bin {src/main/res => res}/drawable/logo.png | Bin {src/main/res => res}/drawable/logo_small.png | Bin .../drawable/progress_horizontal_heisendroid.xml | 0 .../drawable/selectable_background_heisendroid.xml | 0 .../drawable/spinner_background_ab_heisendroid.xml | 0 .../res => res}/drawable/tab_indicator_ab_heisendroid.xml | 0 {src/main/res => res}/values-de/arrays.xml | 0 {src/main/res => res}/values-de/strings.xml | 0 {src/main/res => res}/values-fr/arrays.xml | 0 {src/main/res => res}/values-fr/strings.xml | 0 {src/main/res => res}/values-hu/arrays.xml | 0 {src/main/res => res}/values-hu/strings.xml | 0 {src/main/res => res}/values-it/arrays.xml | 0 {src/main/res => res}/values-it/strings.xml | 0 {src/main/res => res}/values-pl/arrays.xml | 0 {src/main/res => res}/values-pl/strings.xml | 0 {src/main/res => res}/values-pt-rBR/arrays.xml | 0 {src/main/res => res}/values-pt-rBR/strings.xml | 0 {src/main/res => res}/values-pt-rPT/arrays.xml | 0 {src/main/res => res}/values-pt-rPT/strings.xml | 0 {src/main/res => res}/values/arrays.xml | 0 {src/main/res => res}/values/preference_keys.xml | 0 {src/main/res => res}/values/strings.xml | 0 {src/main/res => res}/values/styles_heisendroid.xml | 0 {src/main/res => res}/xml/preferences.xml | 0 149 files changed, 2 insertions(+) diff --git a/src/main/AndroidManifest.xml b/AndroidManifest.xml similarity index 100% rename from src/main/AndroidManifest.xml rename to AndroidManifest.xml diff --git a/pom.xml b/pom.xml index 040f192..d349d67 100644 --- a/pom.xml +++ b/pom.xml @@ -174,6 +174,8 @@ <sdk> <platform>16</platform> </sdk> + <androidManifestFile>${project.basedir}/AndroidManifest.xml</androidManifestFile> + <resourceDirectory>${project.basedir}/res</resourceDirectory> <extractDuplicates>true</extractDuplicates> <device>usb</device> <zipalign> diff --git a/src/main/res/drawable-hdpi/ab_bottom_solid_heisendroid.9.png b/res/drawable-hdpi/ab_bottom_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/ab_bottom_solid_heisendroid.9.png rename to res/drawable-hdpi/ab_bottom_solid_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/ab_solid_heisendroid.9.png b/res/drawable-hdpi/ab_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/ab_solid_heisendroid.9.png rename to res/drawable-hdpi/ab_solid_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/ab_stacked_solid_heisendroid.9.png b/res/drawable-hdpi/ab_stacked_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/ab_stacked_solid_heisendroid.9.png rename to res/drawable-hdpi/ab_stacked_solid_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/ab_texture_tile_heisendroid.png b/res/drawable-hdpi/ab_texture_tile_heisendroid.png similarity index 100% rename from src/main/res/drawable-hdpi/ab_texture_tile_heisendroid.png rename to res/drawable-hdpi/ab_texture_tile_heisendroid.png diff --git a/src/main/res/drawable-hdpi/ab_transparent_heisendroid.9.png b/res/drawable-hdpi/ab_transparent_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/ab_transparent_heisendroid.9.png rename to res/drawable-hdpi/ab_transparent_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/btn_cab_done_default_heisendroid.9.png b/res/drawable-hdpi/btn_cab_done_default_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/btn_cab_done_default_heisendroid.9.png rename to res/drawable-hdpi/btn_cab_done_default_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/btn_cab_done_focused_heisendroid.9.png b/res/drawable-hdpi/btn_cab_done_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/btn_cab_done_focused_heisendroid.9.png rename to res/drawable-hdpi/btn_cab_done_focused_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png b/res/drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png rename to res/drawable-hdpi/btn_cab_done_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/cab_background_bottom_heisendroid.9.png b/res/drawable-hdpi/cab_background_bottom_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/cab_background_bottom_heisendroid.9.png rename to res/drawable-hdpi/cab_background_bottom_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/cab_background_top_heisendroid.9.png b/res/drawable-hdpi/cab_background_top_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/cab_background_top_heisendroid.9.png rename to res/drawable-hdpi/cab_background_top_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/ic_launcher_heisendroid.png b/res/drawable-hdpi/ic_launcher_heisendroid.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_launcher_heisendroid.png rename to res/drawable-hdpi/ic_launcher_heisendroid.png diff --git a/src/main/res/drawable-hdpi/ic_menu_logo.png b/res/drawable-hdpi/ic_menu_logo.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_menu_logo.png rename to res/drawable-hdpi/ic_menu_logo.png diff --git a/src/main/res/drawable-hdpi/ic_stat_heisendroid.png b/res/drawable-hdpi/ic_stat_heisendroid.png similarity index 100% rename from src/main/res/drawable-hdpi/ic_stat_heisendroid.png rename to res/drawable-hdpi/ic_stat_heisendroid.png diff --git a/src/main/res/drawable-hdpi/list_focused_heisendroid.9.png b/res/drawable-hdpi/list_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/list_focused_heisendroid.9.png rename to res/drawable-hdpi/list_focused_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/list_pressed_heisendroid.9.png b/res/drawable-hdpi/list_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/list_pressed_heisendroid.9.png rename to res/drawable-hdpi/list_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/menu_dropdown_panel_heisendroid.9.png b/res/drawable-hdpi/menu_dropdown_panel_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/menu_dropdown_panel_heisendroid.9.png rename to res/drawable-hdpi/menu_dropdown_panel_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/progress_bg_heisendroid.9.png b/res/drawable-hdpi/progress_bg_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/progress_bg_heisendroid.9.png rename to res/drawable-hdpi/progress_bg_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/progress_primary_heisendroid.9.png b/res/drawable-hdpi/progress_primary_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/progress_primary_heisendroid.9.png rename to res/drawable-hdpi/progress_primary_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/progress_secondary_heisendroid.9.png b/res/drawable-hdpi/progress_secondary_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/progress_secondary_heisendroid.9.png rename to res/drawable-hdpi/progress_secondary_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/spinner_ab_default_heisendroid.9.png b/res/drawable-hdpi/spinner_ab_default_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/spinner_ab_default_heisendroid.9.png rename to res/drawable-hdpi/spinner_ab_default_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/spinner_ab_disabled_heisendroid.9.png b/res/drawable-hdpi/spinner_ab_disabled_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/spinner_ab_disabled_heisendroid.9.png rename to res/drawable-hdpi/spinner_ab_disabled_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/spinner_ab_focused_heisendroid.9.png b/res/drawable-hdpi/spinner_ab_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/spinner_ab_focused_heisendroid.9.png rename to res/drawable-hdpi/spinner_ab_focused_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/spinner_ab_pressed_heisendroid.9.png b/res/drawable-hdpi/spinner_ab_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/spinner_ab_pressed_heisendroid.9.png rename to res/drawable-hdpi/spinner_ab_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/tab_selected_focused_heisendroid.9.png b/res/drawable-hdpi/tab_selected_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/tab_selected_focused_heisendroid.9.png rename to res/drawable-hdpi/tab_selected_focused_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/tab_selected_heisendroid.9.png b/res/drawable-hdpi/tab_selected_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/tab_selected_heisendroid.9.png rename to res/drawable-hdpi/tab_selected_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/tab_selected_pressed_heisendroid.9.png b/res/drawable-hdpi/tab_selected_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/tab_selected_pressed_heisendroid.9.png rename to res/drawable-hdpi/tab_selected_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/tab_unselected_focused_heisendroid.9.png b/res/drawable-hdpi/tab_unselected_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/tab_unselected_focused_heisendroid.9.png rename to res/drawable-hdpi/tab_unselected_focused_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/tab_unselected_heisendroid.9.png b/res/drawable-hdpi/tab_unselected_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/tab_unselected_heisendroid.9.png rename to res/drawable-hdpi/tab_unselected_heisendroid.9.png diff --git a/src/main/res/drawable-hdpi/tab_unselected_pressed_heisendroid.9.png b/res/drawable-hdpi/tab_unselected_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-hdpi/tab_unselected_pressed_heisendroid.9.png rename to res/drawable-hdpi/tab_unselected_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/ab_bottom_solid_heisendroid.9.png b/res/drawable-mdpi/ab_bottom_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/ab_bottom_solid_heisendroid.9.png rename to res/drawable-mdpi/ab_bottom_solid_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/ab_solid_heisendroid.9.png b/res/drawable-mdpi/ab_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/ab_solid_heisendroid.9.png rename to res/drawable-mdpi/ab_solid_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/ab_stacked_solid_heisendroid.9.png b/res/drawable-mdpi/ab_stacked_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/ab_stacked_solid_heisendroid.9.png rename to res/drawable-mdpi/ab_stacked_solid_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/ab_texture_tile_heisendroid.png b/res/drawable-mdpi/ab_texture_tile_heisendroid.png similarity index 100% rename from src/main/res/drawable-mdpi/ab_texture_tile_heisendroid.png rename to res/drawable-mdpi/ab_texture_tile_heisendroid.png diff --git a/src/main/res/drawable-mdpi/ab_transparent_heisendroid.9.png b/res/drawable-mdpi/ab_transparent_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/ab_transparent_heisendroid.9.png rename to res/drawable-mdpi/ab_transparent_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/btn_cab_done_default_heisendroid.9.png b/res/drawable-mdpi/btn_cab_done_default_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/btn_cab_done_default_heisendroid.9.png rename to res/drawable-mdpi/btn_cab_done_default_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/btn_cab_done_focused_heisendroid.9.png b/res/drawable-mdpi/btn_cab_done_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/btn_cab_done_focused_heisendroid.9.png rename to res/drawable-mdpi/btn_cab_done_focused_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png b/res/drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png rename to res/drawable-mdpi/btn_cab_done_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/cab_background_bottom_heisendroid.9.png b/res/drawable-mdpi/cab_background_bottom_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/cab_background_bottom_heisendroid.9.png rename to res/drawable-mdpi/cab_background_bottom_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/cab_background_top_heisendroid.9.png b/res/drawable-mdpi/cab_background_top_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/cab_background_top_heisendroid.9.png rename to res/drawable-mdpi/cab_background_top_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/ic_launcher_heisendroid.png b/res/drawable-mdpi/ic_launcher_heisendroid.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_launcher_heisendroid.png rename to res/drawable-mdpi/ic_launcher_heisendroid.png diff --git a/src/main/res/drawable-mdpi/ic_menu_logo.png b/res/drawable-mdpi/ic_menu_logo.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_menu_logo.png rename to res/drawable-mdpi/ic_menu_logo.png diff --git a/src/main/res/drawable-mdpi/ic_stat_heisendroid.png b/res/drawable-mdpi/ic_stat_heisendroid.png similarity index 100% rename from src/main/res/drawable-mdpi/ic_stat_heisendroid.png rename to res/drawable-mdpi/ic_stat_heisendroid.png diff --git a/src/main/res/drawable-mdpi/list_focused_heisendroid.9.png b/res/drawable-mdpi/list_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/list_focused_heisendroid.9.png rename to res/drawable-mdpi/list_focused_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/list_pressed_heisendroid.9.png b/res/drawable-mdpi/list_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/list_pressed_heisendroid.9.png rename to res/drawable-mdpi/list_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/menu_dropdown_panel_heisendroid.9.png b/res/drawable-mdpi/menu_dropdown_panel_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/menu_dropdown_panel_heisendroid.9.png rename to res/drawable-mdpi/menu_dropdown_panel_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/progress_bg_heisendroid.9.png b/res/drawable-mdpi/progress_bg_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/progress_bg_heisendroid.9.png rename to res/drawable-mdpi/progress_bg_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/progress_primary_heisendroid.9.png b/res/drawable-mdpi/progress_primary_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/progress_primary_heisendroid.9.png rename to res/drawable-mdpi/progress_primary_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/progress_secondary_heisendroid.9.png b/res/drawable-mdpi/progress_secondary_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/progress_secondary_heisendroid.9.png rename to res/drawable-mdpi/progress_secondary_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/spinner_ab_default_heisendroid.9.png b/res/drawable-mdpi/spinner_ab_default_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/spinner_ab_default_heisendroid.9.png rename to res/drawable-mdpi/spinner_ab_default_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/spinner_ab_disabled_heisendroid.9.png b/res/drawable-mdpi/spinner_ab_disabled_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/spinner_ab_disabled_heisendroid.9.png rename to res/drawable-mdpi/spinner_ab_disabled_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/spinner_ab_focused_heisendroid.9.png b/res/drawable-mdpi/spinner_ab_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/spinner_ab_focused_heisendroid.9.png rename to res/drawable-mdpi/spinner_ab_focused_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/spinner_ab_pressed_heisendroid.9.png b/res/drawable-mdpi/spinner_ab_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/spinner_ab_pressed_heisendroid.9.png rename to res/drawable-mdpi/spinner_ab_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/tab_selected_focused_heisendroid.9.png b/res/drawable-mdpi/tab_selected_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/tab_selected_focused_heisendroid.9.png rename to res/drawable-mdpi/tab_selected_focused_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/tab_selected_heisendroid.9.png b/res/drawable-mdpi/tab_selected_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/tab_selected_heisendroid.9.png rename to res/drawable-mdpi/tab_selected_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/tab_selected_pressed_heisendroid.9.png b/res/drawable-mdpi/tab_selected_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/tab_selected_pressed_heisendroid.9.png rename to res/drawable-mdpi/tab_selected_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/tab_unselected_focused_heisendroid.9.png b/res/drawable-mdpi/tab_unselected_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/tab_unselected_focused_heisendroid.9.png rename to res/drawable-mdpi/tab_unselected_focused_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/tab_unselected_heisendroid.9.png b/res/drawable-mdpi/tab_unselected_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/tab_unselected_heisendroid.9.png rename to res/drawable-mdpi/tab_unselected_heisendroid.9.png diff --git a/src/main/res/drawable-mdpi/tab_unselected_pressed_heisendroid.9.png b/res/drawable-mdpi/tab_unselected_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-mdpi/tab_unselected_pressed_heisendroid.9.png rename to res/drawable-mdpi/tab_unselected_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/ab_bottom_solid_heisendroid.9.png b/res/drawable-xhdpi/ab_bottom_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/ab_bottom_solid_heisendroid.9.png rename to res/drawable-xhdpi/ab_bottom_solid_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/ab_solid_heisendroid.9.png b/res/drawable-xhdpi/ab_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/ab_solid_heisendroid.9.png rename to res/drawable-xhdpi/ab_solid_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/ab_stacked_solid_heisendroid.9.png b/res/drawable-xhdpi/ab_stacked_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/ab_stacked_solid_heisendroid.9.png rename to res/drawable-xhdpi/ab_stacked_solid_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/ab_texture_tile_heisendroid.png b/res/drawable-xhdpi/ab_texture_tile_heisendroid.png similarity index 100% rename from src/main/res/drawable-xhdpi/ab_texture_tile_heisendroid.png rename to res/drawable-xhdpi/ab_texture_tile_heisendroid.png diff --git a/src/main/res/drawable-xhdpi/ab_transparent_heisendroid.9.png b/res/drawable-xhdpi/ab_transparent_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/ab_transparent_heisendroid.9.png rename to res/drawable-xhdpi/ab_transparent_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/btn_cab_done_default_heisendroid.9.png b/res/drawable-xhdpi/btn_cab_done_default_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/btn_cab_done_default_heisendroid.9.png rename to res/drawable-xhdpi/btn_cab_done_default_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png b/res/drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png rename to res/drawable-xhdpi/btn_cab_done_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png b/res/drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png rename to res/drawable-xhdpi/btn_cab_done_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/cab_background_bottom_heisendroid.9.png b/res/drawable-xhdpi/cab_background_bottom_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/cab_background_bottom_heisendroid.9.png rename to res/drawable-xhdpi/cab_background_bottom_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/cab_background_top_heisendroid.9.png b/res/drawable-xhdpi/cab_background_top_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/cab_background_top_heisendroid.9.png rename to res/drawable-xhdpi/cab_background_top_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/ic_launcher_heisendroid.png b/res/drawable-xhdpi/ic_launcher_heisendroid.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_launcher_heisendroid.png rename to res/drawable-xhdpi/ic_launcher_heisendroid.png diff --git a/src/main/res/drawable-xhdpi/ic_menu_logo.png b/res/drawable-xhdpi/ic_menu_logo.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_menu_logo.png rename to res/drawable-xhdpi/ic_menu_logo.png diff --git a/src/main/res/drawable-xhdpi/ic_stat_heisendroid.png b/res/drawable-xhdpi/ic_stat_heisendroid.png similarity index 100% rename from src/main/res/drawable-xhdpi/ic_stat_heisendroid.png rename to res/drawable-xhdpi/ic_stat_heisendroid.png diff --git a/src/main/res/drawable-xhdpi/list_focused_heisendroid.9.png b/res/drawable-xhdpi/list_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/list_focused_heisendroid.9.png rename to res/drawable-xhdpi/list_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/list_pressed_heisendroid.9.png b/res/drawable-xhdpi/list_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/list_pressed_heisendroid.9.png rename to res/drawable-xhdpi/list_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png b/res/drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png rename to res/drawable-xhdpi/menu_dropdown_panel_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/progress_bg_heisendroid.9.png b/res/drawable-xhdpi/progress_bg_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/progress_bg_heisendroid.9.png rename to res/drawable-xhdpi/progress_bg_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/progress_primary_heisendroid.9.png b/res/drawable-xhdpi/progress_primary_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/progress_primary_heisendroid.9.png rename to res/drawable-xhdpi/progress_primary_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/progress_secondary_heisendroid.9.png b/res/drawable-xhdpi/progress_secondary_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/progress_secondary_heisendroid.9.png rename to res/drawable-xhdpi/progress_secondary_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/spinner_ab_default_heisendroid.9.png b/res/drawable-xhdpi/spinner_ab_default_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/spinner_ab_default_heisendroid.9.png rename to res/drawable-xhdpi/spinner_ab_default_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png b/res/drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png rename to res/drawable-xhdpi/spinner_ab_disabled_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/spinner_ab_focused_heisendroid.9.png b/res/drawable-xhdpi/spinner_ab_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/spinner_ab_focused_heisendroid.9.png rename to res/drawable-xhdpi/spinner_ab_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png b/res/drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png rename to res/drawable-xhdpi/spinner_ab_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/tab_selected_focused_heisendroid.9.png b/res/drawable-xhdpi/tab_selected_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/tab_selected_focused_heisendroid.9.png rename to res/drawable-xhdpi/tab_selected_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/tab_selected_heisendroid.9.png b/res/drawable-xhdpi/tab_selected_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/tab_selected_heisendroid.9.png rename to res/drawable-xhdpi/tab_selected_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/tab_selected_pressed_heisendroid.9.png b/res/drawable-xhdpi/tab_selected_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/tab_selected_pressed_heisendroid.9.png rename to res/drawable-xhdpi/tab_selected_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/tab_unselected_focused_heisendroid.9.png b/res/drawable-xhdpi/tab_unselected_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/tab_unselected_focused_heisendroid.9.png rename to res/drawable-xhdpi/tab_unselected_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/tab_unselected_heisendroid.9.png b/res/drawable-xhdpi/tab_unselected_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/tab_unselected_heisendroid.9.png rename to res/drawable-xhdpi/tab_unselected_heisendroid.9.png diff --git a/src/main/res/drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png b/res/drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png rename to res/drawable-xhdpi/tab_unselected_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png b/res/drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png rename to res/drawable-xxhdpi/ab_bottom_solid_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/ab_solid_heisendroid.9.png b/res/drawable-xxhdpi/ab_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ab_solid_heisendroid.9.png rename to res/drawable-xxhdpi/ab_solid_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png b/res/drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png rename to res/drawable-xxhdpi/ab_stacked_solid_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/ab_texture_tile_heisendroid.png b/res/drawable-xxhdpi/ab_texture_tile_heisendroid.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ab_texture_tile_heisendroid.png rename to res/drawable-xxhdpi/ab_texture_tile_heisendroid.png diff --git a/src/main/res/drawable-xxhdpi/ab_transparent_heisendroid.9.png b/res/drawable-xxhdpi/ab_transparent_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ab_transparent_heisendroid.9.png rename to res/drawable-xxhdpi/ab_transparent_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png b/res/drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png rename to res/drawable-xxhdpi/btn_cab_done_default_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png b/res/drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png rename to res/drawable-xxhdpi/btn_cab_done_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png b/res/drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png rename to res/drawable-xxhdpi/btn_cab_done_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/cab_background_bottom_heisendroid.9.png b/res/drawable-xxhdpi/cab_background_bottom_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/cab_background_bottom_heisendroid.9.png rename to res/drawable-xxhdpi/cab_background_bottom_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/cab_background_top_heisendroid.9.png b/res/drawable-xxhdpi/cab_background_top_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/cab_background_top_heisendroid.9.png rename to res/drawable-xxhdpi/cab_background_top_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/ic_launcher_heisendroid.png b/res/drawable-xxhdpi/ic_launcher_heisendroid.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_launcher_heisendroid.png rename to res/drawable-xxhdpi/ic_launcher_heisendroid.png diff --git a/src/main/res/drawable-xxhdpi/ic_menu_logo.png b/res/drawable-xxhdpi/ic_menu_logo.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_menu_logo.png rename to res/drawable-xxhdpi/ic_menu_logo.png diff --git a/src/main/res/drawable-xxhdpi/ic_stat_heisendroid.png b/res/drawable-xxhdpi/ic_stat_heisendroid.png similarity index 100% rename from src/main/res/drawable-xxhdpi/ic_stat_heisendroid.png rename to res/drawable-xxhdpi/ic_stat_heisendroid.png diff --git a/src/main/res/drawable-xxhdpi/list_focused_heisendroid.9.png b/res/drawable-xxhdpi/list_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/list_focused_heisendroid.9.png rename to res/drawable-xxhdpi/list_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/list_pressed_heisendroid.9.png b/res/drawable-xxhdpi/list_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/list_pressed_heisendroid.9.png rename to res/drawable-xxhdpi/list_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png b/res/drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png rename to res/drawable-xxhdpi/menu_dropdown_panel_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/progress_bg_heisendroid.9.png b/res/drawable-xxhdpi/progress_bg_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/progress_bg_heisendroid.9.png rename to res/drawable-xxhdpi/progress_bg_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/progress_primary_heisendroid.9.png b/res/drawable-xxhdpi/progress_primary_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/progress_primary_heisendroid.9.png rename to res/drawable-xxhdpi/progress_primary_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/progress_secondary_heisendroid.9.png b/res/drawable-xxhdpi/progress_secondary_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/progress_secondary_heisendroid.9.png rename to res/drawable-xxhdpi/progress_secondary_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/spinner_ab_default_heisendroid.9.png b/res/drawable-xxhdpi/spinner_ab_default_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/spinner_ab_default_heisendroid.9.png rename to res/drawable-xxhdpi/spinner_ab_default_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png b/res/drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png rename to res/drawable-xxhdpi/spinner_ab_disabled_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png b/res/drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png rename to res/drawable-xxhdpi/spinner_ab_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png b/res/drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png rename to res/drawable-xxhdpi/spinner_ab_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/tab_selected_focused_heisendroid.9.png b/res/drawable-xxhdpi/tab_selected_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/tab_selected_focused_heisendroid.9.png rename to res/drawable-xxhdpi/tab_selected_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/tab_selected_heisendroid.9.png b/res/drawable-xxhdpi/tab_selected_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/tab_selected_heisendroid.9.png rename to res/drawable-xxhdpi/tab_selected_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png b/res/drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png rename to res/drawable-xxhdpi/tab_selected_pressed_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_focused_heisendroid.9.png b/res/drawable-xxhdpi/tab_unselected_focused_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/tab_unselected_focused_heisendroid.9.png rename to res/drawable-xxhdpi/tab_unselected_focused_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_heisendroid.9.png b/res/drawable-xxhdpi/tab_unselected_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/tab_unselected_heisendroid.9.png rename to res/drawable-xxhdpi/tab_unselected_heisendroid.9.png diff --git a/src/main/res/drawable-xxhdpi/tab_unselected_pressed_heisendroid.9.png b/res/drawable-xxhdpi/tab_unselected_pressed_heisendroid.9.png similarity index 100% rename from src/main/res/drawable-xxhdpi/tab_unselected_pressed_heisendroid.9.png rename to res/drawable-xxhdpi/tab_unselected_pressed_heisendroid.9.png diff --git a/src/main/res/drawable/ab_background_textured_heisendroid.xml b/res/drawable/ab_background_textured_heisendroid.xml similarity index 100% rename from src/main/res/drawable/ab_background_textured_heisendroid.xml rename to res/drawable/ab_background_textured_heisendroid.xml diff --git a/src/main/res/drawable/btn_cab_done_heisendroid.xml b/res/drawable/btn_cab_done_heisendroid.xml similarity index 100% rename from src/main/res/drawable/btn_cab_done_heisendroid.xml rename to res/drawable/btn_cab_done_heisendroid.xml diff --git a/src/main/res/drawable/ic_launcher_heisendroid.png b/res/drawable/ic_launcher_heisendroid.png similarity index 100% rename from src/main/res/drawable/ic_launcher_heisendroid.png rename to res/drawable/ic_launcher_heisendroid.png diff --git a/src/main/res/drawable/ic_menu_heisendroid.png b/res/drawable/ic_menu_heisendroid.png similarity index 100% rename from src/main/res/drawable/ic_menu_heisendroid.png rename to res/drawable/ic_menu_heisendroid.png diff --git a/src/main/res/drawable/ic_menu_logo.png b/res/drawable/ic_menu_logo.png similarity index 100% rename from src/main/res/drawable/ic_menu_logo.png rename to res/drawable/ic_menu_logo.png diff --git a/src/main/res/drawable/ic_stat_heisendroid.png b/res/drawable/ic_stat_heisendroid.png similarity index 100% rename from src/main/res/drawable/ic_stat_heisendroid.png rename to res/drawable/ic_stat_heisendroid.png diff --git a/src/main/res/drawable/logo.png b/res/drawable/logo.png similarity index 100% rename from src/main/res/drawable/logo.png rename to res/drawable/logo.png diff --git a/src/main/res/drawable/logo_small.png b/res/drawable/logo_small.png similarity index 100% rename from src/main/res/drawable/logo_small.png rename to res/drawable/logo_small.png diff --git a/src/main/res/drawable/progress_horizontal_heisendroid.xml b/res/drawable/progress_horizontal_heisendroid.xml similarity index 100% rename from src/main/res/drawable/progress_horizontal_heisendroid.xml rename to res/drawable/progress_horizontal_heisendroid.xml diff --git a/src/main/res/drawable/selectable_background_heisendroid.xml b/res/drawable/selectable_background_heisendroid.xml similarity index 100% rename from src/main/res/drawable/selectable_background_heisendroid.xml rename to res/drawable/selectable_background_heisendroid.xml diff --git a/src/main/res/drawable/spinner_background_ab_heisendroid.xml b/res/drawable/spinner_background_ab_heisendroid.xml similarity index 100% rename from src/main/res/drawable/spinner_background_ab_heisendroid.xml rename to res/drawable/spinner_background_ab_heisendroid.xml diff --git a/src/main/res/drawable/tab_indicator_ab_heisendroid.xml b/res/drawable/tab_indicator_ab_heisendroid.xml similarity index 100% rename from src/main/res/drawable/tab_indicator_ab_heisendroid.xml rename to res/drawable/tab_indicator_ab_heisendroid.xml diff --git a/src/main/res/values-de/arrays.xml b/res/values-de/arrays.xml similarity index 100% rename from src/main/res/values-de/arrays.xml rename to res/values-de/arrays.xml diff --git a/src/main/res/values-de/strings.xml b/res/values-de/strings.xml similarity index 100% rename from src/main/res/values-de/strings.xml rename to res/values-de/strings.xml diff --git a/src/main/res/values-fr/arrays.xml b/res/values-fr/arrays.xml similarity index 100% rename from src/main/res/values-fr/arrays.xml rename to res/values-fr/arrays.xml diff --git a/src/main/res/values-fr/strings.xml b/res/values-fr/strings.xml similarity index 100% rename from src/main/res/values-fr/strings.xml rename to res/values-fr/strings.xml diff --git a/src/main/res/values-hu/arrays.xml b/res/values-hu/arrays.xml similarity index 100% rename from src/main/res/values-hu/arrays.xml rename to res/values-hu/arrays.xml diff --git a/src/main/res/values-hu/strings.xml b/res/values-hu/strings.xml similarity index 100% rename from src/main/res/values-hu/strings.xml rename to res/values-hu/strings.xml diff --git a/src/main/res/values-it/arrays.xml b/res/values-it/arrays.xml similarity index 100% rename from src/main/res/values-it/arrays.xml rename to res/values-it/arrays.xml diff --git a/src/main/res/values-it/strings.xml b/res/values-it/strings.xml similarity index 100% rename from src/main/res/values-it/strings.xml rename to res/values-it/strings.xml diff --git a/src/main/res/values-pl/arrays.xml b/res/values-pl/arrays.xml similarity index 100% rename from src/main/res/values-pl/arrays.xml rename to res/values-pl/arrays.xml diff --git a/src/main/res/values-pl/strings.xml b/res/values-pl/strings.xml similarity index 100% rename from src/main/res/values-pl/strings.xml rename to res/values-pl/strings.xml diff --git a/src/main/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml similarity index 100% rename from src/main/res/values-pt-rBR/arrays.xml rename to res/values-pt-rBR/arrays.xml diff --git a/src/main/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml similarity index 100% rename from src/main/res/values-pt-rBR/strings.xml rename to res/values-pt-rBR/strings.xml diff --git a/src/main/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml similarity index 100% rename from src/main/res/values-pt-rPT/arrays.xml rename to res/values-pt-rPT/arrays.xml diff --git a/src/main/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml similarity index 100% rename from src/main/res/values-pt-rPT/strings.xml rename to res/values-pt-rPT/strings.xml diff --git a/src/main/res/values/arrays.xml b/res/values/arrays.xml similarity index 100% rename from src/main/res/values/arrays.xml rename to res/values/arrays.xml diff --git a/src/main/res/values/preference_keys.xml b/res/values/preference_keys.xml similarity index 100% rename from src/main/res/values/preference_keys.xml rename to res/values/preference_keys.xml diff --git a/src/main/res/values/strings.xml b/res/values/strings.xml similarity index 100% rename from src/main/res/values/strings.xml rename to res/values/strings.xml diff --git a/src/main/res/values/styles_heisendroid.xml b/res/values/styles_heisendroid.xml similarity index 100% rename from src/main/res/values/styles_heisendroid.xml rename to res/values/styles_heisendroid.xml diff --git a/src/main/res/xml/preferences.xml b/res/xml/preferences.xml similarity index 100% rename from src/main/res/xml/preferences.xml rename to res/xml/preferences.xml -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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>.
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 8c00081cb2f66bcb668494b6b0a86df07a949d35 Author: Kevin Morin <morin@codelutin.com> Date: Sun Dec 21 13:20:54 2014 +0100 merge --- .../broadcastreceiver/BootCompletedBroadcastReceiver.java | 3 --- .../saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java | 3 --- .../saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java | 6 ------ .../broadcastreceiver/SayNextActionBroadcastReceiver.java | 3 --- 4 files changed, 15 deletions(-) diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java index fc58548..554c636 100644 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/BootCompletedBroadcastReceiver.java @@ -1,6 +1,5 @@ package org.chorem.android.saymytexts.broadcastreceiver; -<<<<<<< HEAD /* * #%L * Say My Texts @@ -25,8 +24,6 @@ package org.chorem.android.saymytexts.broadcastreceiver; * #L% */ -======= ->>>>>>> feature/notification import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; diff --git a/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java index 2e160a9..cc1ea31 100644 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/DictateSmsBroadcastReceiver.java @@ -36,10 +36,7 @@ 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 --git a/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java index 54b4426..51ab4c8 100644 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/NewTextBroadcastReceiver.java @@ -35,15 +35,9 @@ 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 --git a/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java b/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java index c6e7ac6..3e146fc 100644 --- a/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java +++ b/src/org/chorem/android/saymytexts/broadcastreceiver/SayNextActionBroadcastReceiver.java @@ -40,10 +40,7 @@ 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>.
participants (1)
-
chorem.org scm