archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Better handling & fixing of settings behavior on Android 1.5 phones

Browse Source
pull/14/head
Tim Su 15 years ago
parent 5eb20de821
commit 6d4a7536ee
4 changed files with 28 additions and 39 deletions
Show Stats Download Patch File Download Diff File

3
astrid/plugin-src/com/todoroo/astrid/reminders/Notifications.java
Unescape Escape View File

@ -280,12 +280,11 @@ public class Notifications extends BroadcastReceiver {
notificationManager.notify(notificationId, notification);
if (voiceReminder) {
for(int i = 0; i < 50; i++) {
AndroidUtilities.sleepDeep(100);
if(audioManager.getMode() != AudioManager.MODE_RINGTONE)
break;
AndroidUtilities.sleepDeep(100);
}
try {
System.err.println("QUEUESPEAK " + text);
VoiceOutputService.getVoiceOutputInstance().queueSpeak(text);
} catch (VerifyError e) {
// unavailable

1
astrid/res/xml/preferences.xml
Unescape Escape View File

@ -34,6 +34,7 @@
<CheckBoxPreference
android:key="@string/p_voiceInputCreatesTask"
android:title="@string/EPr_voiceInputCreatesTask_title"
android:dependency="@string/p_voiceInputEnabled"
android:defaultValue="false" />
<CheckBoxPreference
android:key="@string/p_voiceRemindersEnabled"

61
astrid/src/com/todoroo/astrid/activity/EditPreferences.java
Unescape Escape View File

@ -22,7 +22,6 @@ import android.net.Uri;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen;
@ -219,31 +218,36 @@ public class EditPreferences extends TodorooPreferences {
}
}
// statistics service
else if (r.getString(R.string.p_statistics).equals(preference.getKey())) {
if (value != null && !(Boolean)value)
preference.setSummary(R.string.EPr_statistics_desc_disabled);
else
preference.setSummary(R.string.EPr_statistics_desc_enabled);
}
// voice input and output
else if (r.getString(R.string.p_voiceInputEnabled).equals(preference.getKey())) {
if(!addOnService.hasPowerPack())
return;
if (r.getString(R.string.p_voiceInputEnabled).equals(preference.getKey())) {
if (value != null && !(Boolean)value)
preference.setSummary(R.string.EPr_voiceInputEnabled_desc_disabled);
else
preference.setSummary(R.string.EPr_voiceInputEnabled_desc_enabled);
onVoiceInputStatusChanged(preference, (Boolean)value);
} else if (r.getString(R.string.p_voiceRemindersEnabled).equals(preference.getKey())) {
if (value != null && !(Boolean)value)
preference.setSummary(R.string.EPr_voiceRemindersEnabled_desc_disabled);
else
preference.setSummary(R.string.EPr_voiceRemindersEnabled_desc_enabled);
onVoiceReminderStatusChanged(preference, (Boolean)value);
} else if (r.getString(R.string.p_voiceInputCreatesTask).equals(preference.getKey())) {
if (value != null && !(Boolean)value)
preference.setSummary(R.string.EPr_voiceInputCreatesTask_desc_disabled);
else
preference.setSummary(R.string.EPr_voiceInputCreatesTask_desc_enabled);
}
// statistics service
else if (r.getString(R.string.p_statistics).equals(preference.getKey())) {
if (value != null && !(Boolean)value)
preference.setSummary(R.string.EPr_statistics_desc_disabled);
else
preference.setSummary(R.string.EPr_statistics_desc_enabled);
}
}
@Override
@ -257,34 +261,19 @@ public class EditPreferences extends TodorooPreferences {
}
public void addPreferenceListeners() {
Resources r = getResources();
findPreference(r.getString(R.string.p_voiceInputEnabled)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference pref, Object newValue) {
onVoiceInputStatusChanged(pref, (Boolean)newValue);
return true;
}
});
findPreference(r.getString(R.string.p_voiceRemindersEnabled)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference pref, Object newValue) {
onVoiceReminderStatusChanged(pref, (Boolean)newValue);
return true;
}
});
//
}
private void onVoiceReminderStatusChanged(Preference preference, boolean newValue) {
System.err.println
("!!!! LAJLKSDJDS " + newValue);
if(!newValue)
return;
private void onVoiceReminderStatusChanged(final Preference preference, boolean newValue) {
try {
VoiceOutputService.getVoiceOutputInstance().checkIsTTSInstalled();
VoiceOutputService.getVoiceOutputInstance();
if(newValue)
VoiceOutputService.getVoiceOutputInstance().checkIsTTSInstalled();
} catch (VerifyError e) {
((CheckBoxPreference)preference).setChecked(false);
// doesn't work :(
preference.setEnabled(false);
Preferences.setBoolean(preference.getKey(), false);
}
}
@ -335,10 +324,10 @@ public class EditPreferences extends TodorooPreferences {
r.getString(R.string.EPr_voiceInputUnavailable_dlg),
new OnClickListener() {
@Override
public void onClick(DialogInterface dialog,
int which) {
public void onClick(DialogInterface dialog1,
int which1) {
((CheckBoxPreference)preference).setChecked(false);
dialog.dismiss();
dialog1.dismiss();
}
});
}

2
astrid/src/com/todoroo/astrid/utility/Constants.java
Unescape Escape View File

@ -30,7 +30,7 @@ public final class Constants {
/**
* Whether to turn on debugging logging and UI
*/
public static final boolean DEBUG = true;
public static final boolean DEBUG = false;
/**
* Upgrade time

Write Preview
Loading…
Cancel
Save