Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2018-01-12 10:50:31 +01:00
commit 1e63a82ce6

View file

@ -62,7 +62,7 @@ public class AudioVideoNoteMenuController extends MenuController {
} }
}; };
rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete); rightTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_delete);
rightTitleButtonController.leftIconId = R.drawable.ic_action_delete_dark; rightTitleButtonController.updateStateListDrawableIcon(R.drawable.ic_action_delete_dark, true);
} }
updateData(); updateData();
@ -136,7 +136,7 @@ public class AudioVideoNoteMenuController extends MenuController {
if (!mRecording.isPhoto()) { if (!mRecording.isPhoto()) {
if (mPlugin.isPlaying(mRecording)) { if (mPlugin.isPlaying(mRecording)) {
leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_control_stop); leftTitleButtonController.caption = getMapActivity().getString(R.string.shared_string_control_stop);
leftTitleButtonController.leftIconId = R.drawable.ic_action_rec_stop; leftTitleButtonController.updateStateListDrawableIcon(R.drawable.ic_action_rec_stop, true);
int pos = mPlugin.getPlayingPosition(); int pos = mPlugin.getPlayingPosition();
String durationStr; String durationStr;
if (pos == -1) { if (pos == -1) {
@ -149,14 +149,14 @@ public class AudioVideoNoteMenuController extends MenuController {
rightTitleButtonController.visible = false; rightTitleButtonController.visible = false;
} else { } else {
leftTitleButtonController.caption = getMapActivity().getString(R.string.recording_context_menu_play); leftTitleButtonController.caption = getMapActivity().getString(R.string.recording_context_menu_play);
leftTitleButtonController.leftIconId = R.drawable.ic_play_dark; leftTitleButtonController.updateStateListDrawableIcon(R.drawable.ic_play_dark, true);
String durationStr = mRecording.getPlainDuration(accessibilityEnabled); String durationStr = mRecording.getPlainDuration(accessibilityEnabled);
leftTitleButtonController.needRightText = true; leftTitleButtonController.needRightText = true;
leftTitleButtonController.rightTextCaption = "" + durationStr; leftTitleButtonController.rightTextCaption = "" + durationStr;
} }
} else { } else {
leftTitleButtonController.caption = getMapActivity().getString(R.string.recording_context_menu_show); leftTitleButtonController.caption = getMapActivity().getString(R.string.recording_context_menu_show);
leftTitleButtonController.leftIconId = R.drawable.ic_action_view; leftTitleButtonController.updateStateListDrawableIcon(R.drawable.ic_action_view, true);
} }
} }