Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
7cb66adf46
2 changed files with 18 additions and 20 deletions
|
@ -591,7 +591,7 @@ public class ConfigureMapMenu {
|
|||
@Override
|
||||
public boolean onContextMenuClick(ArrayAdapter<ContextMenuItem> a, int itemId, int pos,
|
||||
boolean isChecked) {
|
||||
if (!isChecked) {
|
||||
if (!isChecked && !useDescription) {
|
||||
for (int i = 0; i < prefs.size(); i++) {
|
||||
prefs.get(i).set(false);
|
||||
}
|
||||
|
@ -606,10 +606,8 @@ public class ConfigureMapMenu {
|
|||
}
|
||||
|
||||
};
|
||||
ContextMenuItem.ItemBuilder builder = new ContextMenuItem.ItemBuilder()
|
||||
.setTitleId(strId, activity)
|
||||
.setIcon(icon)
|
||||
.setListener(clickListener);
|
||||
ContextMenuItem.ItemBuilder builder = new ContextMenuItem.ItemBuilder().setTitleId(strId, activity)
|
||||
.setIcon(icon).setListener(clickListener);
|
||||
if (useDescription) {
|
||||
final String descr = getDescription(prefs);
|
||||
builder.setDescription(descr);
|
||||
|
|
Loading…
Reference in a new issue