mirror of https://github.com/tasks/tasks
Merge and resolve conflicts from upstream/master
Sam Bosley
12 years ago
commit
b29f8f5cc2
@ -1,103 +0,0 @@
|
||||
/**
|
||||
* Copyright (c) 2012 Todoroo Inc
|
||||
*
|
||||
* See the file "LICENSE" for the full license governing this code.
|
||||
*/
|
||||
package com.todoroo.astrid.core;
|
||||
|
||||
import android.content.res.Resources;
|
||||
import android.preference.Preference;
|
||||
import android.preference.Preference.OnPreferenceChangeListener;
|
||||
import android.preference.PreferenceScreen;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.timsu.astrid.R;
|
||||
import com.todoroo.andlib.utility.AndroidUtilities;
|
||||
import com.todoroo.andlib.utility.TodorooPreferenceActivity;
|
||||
import com.todoroo.astrid.activity.EditPreferences;
|
||||
import com.todoroo.astrid.utility.Constants;
|
||||
|
||||
public class LabsPreferences extends TodorooPreferenceActivity {
|
||||
|
||||
@Override
|
||||
public int getPreferenceResource() {
|
||||
return R.xml.preferences_labs;
|
||||
}
|
||||
|
||||
public static final int RESULT_TLA_NEEDS_REFRESH = 3;
|
||||
public static final int RESULT_NEEDS_SYNC = 4;
|
||||
|
||||
private class SetResultOnPreferenceChangeListener implements OnPreferenceChangeListener {
|
||||
private final int resultCode;
|
||||
public SetResultOnPreferenceChangeListener(int resultCode) {
|
||||
this.resultCode = resultCode;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onPreferenceChange(Preference p, Object newValue) {
|
||||
setResult(resultCode);
|
||||
updatePreferences(p, newValue);
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onCreate(android.os.Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
EditPreferences.removeForbiddenPreferences(getPreferenceScreen(), getResources());
|
||||
|
||||
if (!AndroidUtilities.isTabletSized(this)) {
|
||||
PreferenceScreen screen = getPreferenceScreen();
|
||||
screen.removePreference(screen.findPreference(getString(R.string.p_force_phone_layout)));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void updatePreferences(Preference preference, Object value) {
|
||||
final Resources r = getResources();
|
||||
|
||||
String key = preference.getKey();
|
||||
if (r.getString(R.string.p_swipe_lists_performance_key).equals(key)) {
|
||||
preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_TLA_NEEDS_REFRESH));
|
||||
|
||||
int index = 0;
|
||||
if(value instanceof String && !TextUtils.isEmpty((String)value))
|
||||
index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_swipe_lists_performance_mode_values), (String)value);
|
||||
if (index < 0)
|
||||
index = 0;
|
||||
|
||||
String name = r.getStringArray(R.array.EPr_swipe_lists_performance_mode)[index];
|
||||
String desc = r.getStringArray(R.array.EPr_swipe_lists_performance_desc)[index];
|
||||
preference.setSummary(r.getString(R.string.EPr_swipe_lists_display, name, desc));
|
||||
} else if (r.getString(R.string.p_field_missed_calls).equals(key)) {
|
||||
setEnabledSummary(preference, value,
|
||||
R.string.MCA_missed_calls_pref_desc_enabled, R.string.MCA_missed_calls_pref_desc_disabled);
|
||||
} else if (r.getString(R.string.p_use_contact_picker).equals(key)) {
|
||||
setEnabledSummary(preference, value,
|
||||
R.string.EPr_use_contact_picker_desc_enabled, R.string.EPr_use_contact_picker_desc_disabled);
|
||||
} else if (r.getString(R.string.p_third_party_addons).equals(key)) {
|
||||
setEnabledSummary(preference, value,
|
||||
R.string.EPr_third_party_addons_desc_enabled, R.string.EPr_third_party_addons_desc_disabled);
|
||||
} else if (r.getString(R.string.p_end_at_deadline).equals(key)){
|
||||
setEnabledSummary(preference, value, R.string.EPr_cal_start_at_due_time, R.string.EPr_cal_end_at_due_time);
|
||||
} else if (r.getString(R.string.p_ideas_tab_enabled).equals(key)) {
|
||||
if (!Constants.MARKET_STRATEGY.allowIdeasTab()) {
|
||||
PreferenceScreen screen = getPreferenceScreen();
|
||||
screen.removePreference(preference);
|
||||
}
|
||||
} else if (r.getString(R.string.p_force_phone_layout).equals(key)) {
|
||||
preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_TLA_NEEDS_REFRESH));
|
||||
} else if (r.getString(R.string.p_show_featured_lists_labs).equals(key)) {
|
||||
preference.setOnPreferenceChangeListener(new SetResultOnPreferenceChangeListener(RESULT_NEEDS_SYNC));
|
||||
}
|
||||
}
|
||||
|
||||
private void setEnabledSummary(Preference preference, Object value, int enabledStr, int disabledStr) {
|
||||
if (value != null && (Boolean) value) {
|
||||
preference.setSummary(enabledStr);
|
||||
} else {
|
||||
preference.setSummary(disabledStr);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,42 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
** Copyright (c) 2012 Todoroo Inc
|
||||
**
|
||||
** See the file "LICENSE" for the full license governing this code.
|
||||
-->
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/EPr_labs_header"
|
||||
android:summary="@string/EPr_labs_desc">
|
||||
<ListPreference
|
||||
android:key="@string/p_swipe_lists_performance_key"
|
||||
android:title="@string/EPr_swipe_lists_performance_title"
|
||||
android:entries="@array/EPr_swipe_lists_performance_mode"
|
||||
android:entryValues="@array/EPr_swipe_lists_performance_mode_values"
|
||||
android:summary="@string/EPr_swipe_lists_performance_subtitle" />
|
||||
<CheckBoxPreference
|
||||
android:key="@string/p_use_contact_picker"
|
||||
android:title="@string/EPr_use_contact_picker"/>
|
||||
<CheckBoxPreference
|
||||
android:key="@string/p_field_missed_calls"
|
||||
android:title="@string/MCA_missed_calls_pref_title"/>
|
||||
<CheckBoxPreference
|
||||
android:key="@string/p_third_party_addons"
|
||||
android:title="@string/EPr_third_party_addons" />
|
||||
<CheckBoxPreference
|
||||
android:key="@string/p_ideas_tab_enabled"
|
||||
android:title="@string/EPr_ideas_tab_enabled"
|
||||
android:summary="@string/EPr_ideas_tab_description" />
|
||||
<CheckBoxPreference
|
||||
android:title="@string/EPr_cal_end_or_start_at_due_time"
|
||||
android:key = "@string/p_end_at_deadline" />
|
||||
<CheckBoxPreference
|
||||
android:title="@string/EPr_force_phone_layout"
|
||||
android:key="@string/p_force_phone_layout"
|
||||
android:defaultValue="false"/>
|
||||
<CheckBoxPreference
|
||||
android:title="@string/EPr_show_featured_lists"
|
||||
android:key="@string/p_show_featured_lists_labs"
|
||||
android:defaultValue="false"/>
|
||||
|
||||
</PreferenceScreen>
|
||||
@ -0,0 +1,39 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<PreferenceScreen
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:title="@string/EPr_powerpack_header">
|
||||
<PreferenceScreen
|
||||
android:title="@string/EPr_powerpack_header"
|
||||
android:summary="@string/EPr_powerpack_summary">
|
||||
|
||||
<PreferenceScreen android:title="@string/p_files_dir" android:key="@string/p_files_dir" />
|
||||
|
||||
<com.todoroo.astrid.ui.MultilineCheckboxPreference
|
||||
android:key="@string/p_voiceRemindersEnabled"
|
||||
android:title="@string/EPr_voiceRemindersEnabled_title"
|
||||
android:defaultValue="false" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="@string/p_field_missed_calls"
|
||||
android:title="@string/MCA_missed_calls_pref_title"/>
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="@string/p_third_party_addons"
|
||||
android:title="@string/EPr_third_party_addons" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:key="@string/p_ideas_tab_enabled"
|
||||
android:title="@string/EPr_ideas_tab_enabled"
|
||||
android:summary="@string/EPr_ideas_tab_description" />
|
||||
|
||||
<CheckBoxPreference
|
||||
android:title="@string/EPr_cal_end_or_start_at_due_time"
|
||||
android:key = "@string/p_end_at_deadline" />
|
||||
|
||||
<com.todoroo.astrid.ui.MultilineCheckboxPreference
|
||||
android:key="@string/p_statistics"
|
||||
android:title="@string/EPr_statistics_title"
|
||||
android:defaultValue="true" />
|
||||
|
||||
</PreferenceScreen>
|
||||
</PreferenceScreen>
|
||||
Loading…
Reference in New Issue