|
|
|
@ -104,6 +104,7 @@ import com.todoroo.astrid.ui.NestableViewPager;
|
|
|
|
|
import com.todoroo.astrid.ui.PopupControlSet;
|
|
|
|
|
import com.todoroo.astrid.ui.ReminderControlSet;
|
|
|
|
|
import com.todoroo.astrid.ui.TaskEditMoreControls;
|
|
|
|
|
import com.todoroo.astrid.utility.AstridPreferences;
|
|
|
|
|
import com.todoroo.astrid.utility.Flags;
|
|
|
|
|
import com.todoroo.astrid.voice.VoiceInputAssistant;
|
|
|
|
|
import com.todoroo.astrid.voice.VoiceRecognizer;
|
|
|
|
@ -1175,15 +1176,21 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
|
|
|
|
|
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
boolean useSaveAndCancel = Preferences.getBoolean(R.string.p_save_and_cancel, false);
|
|
|
|
|
|
|
|
|
|
if (useSaveAndCancel || AstridPreferences.useTabletLayout(getActivity())) {
|
|
|
|
|
if (useSaveAndCancel) {
|
|
|
|
|
item = menu.add(Menu.NONE, MENU_DISCARD_ID, 0, R.string.TEA_menu_discard);
|
|
|
|
|
item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_close));
|
|
|
|
|
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!(getActivity() instanceof TaskEditActivity)) {
|
|
|
|
|
item = menu.add(Menu.NONE, MENU_SAVE_ID, 0, R.string.TEA_menu_save);
|
|
|
|
|
item.setIcon(ThemeService.getDrawable(R.drawable.ic_menu_save));
|
|
|
|
|
item.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
boolean wouldShowComments = actFmPreferenceService.isLoggedIn() && menu.findItem(MENU_COMMENTS_REFRESH_ID) == null;
|
|
|
|
|
if(wouldShowComments && showEditComments) {
|
|
|
|
|