Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-08-27 16:30:06 +02:00
commit 1811297e33
2 changed files with 7 additions and 2 deletions

View file

@ -188,10 +188,14 @@ public class AdvancedDataFragment extends Fragment {
deleteItemImageButton.setOnClickListener(new View.OnClickListener() { deleteItemImageButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
LOG.debug("onClick(" + "v=" + v + ") tag=" + tag
+ "; editPoiData.tags" + editPoiData.tags);
linearLayout.removeView((View) v.getParent()); linearLayout.removeView((View) v.getParent());
editPoiData.tags.remove(tag); editPoiData.tags.remove(tag);
LOG.debug("editPoiData.tags" + editPoiData.tags + " mIsUserInput=" + mIsUserInput);
if (mIsUserInput) if (mIsUserInput)
editPoiData.notifyDatasetChanged(mTagsChangedListener); editPoiData.notifyDatasetChanged(null);
LOG.debug("editPoiData.tags" + editPoiData.tags);
} }
}); });
tagEditText.addTextChangedListener(new TextWatcher() { tagEditText.addTextChangedListener(new TextWatcher() {

View file

@ -225,7 +225,8 @@ public class BasicDataFragment extends Fragment {
@Override @Override
public void onUntriggered() { public void onUntriggered() {
adapter.replaceOpeningHours(new OpeningHoursParser.OpeningHours());
adapter.updateViews();
} }
} }