Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
d0479919ce
1 changed files with 3 additions and 3 deletions
|
@ -73,8 +73,8 @@ public class DashboardSettingsDialogFragment extends DialogFragment
|
|||
textView.setText(R.string.show_on_start);
|
||||
final CompoundButton compoundButton = (CompoundButton) view.findViewById(R.id.check_item);
|
||||
// FIXME Yura add settings.SHOW_DASHBOARD_ON_MAP_SCREEN
|
||||
compoundButton.setChecked(settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get());
|
||||
textView.setTextColor(settings.SHOW_DASHBOARD_ON_MAP_SCREEN.get() ? textColorPrimary
|
||||
compoundButton.setChecked(settings.SHOW_DASHBOARD_ON_START.get());
|
||||
textView.setTextColor(settings.SHOW_DASHBOARD_ON_START.get() ? textColorPrimary
|
||||
: textColorSecondary);
|
||||
compoundButton.setOnCheckedChangeListener(
|
||||
new CompoundButton.OnCheckedChangeListener() {
|
||||
|
@ -110,7 +110,7 @@ public class DashboardSettingsDialogFragment extends DialogFragment
|
|||
}
|
||||
}
|
||||
mapActivity.getDashboard().refreshDashboardFragments();
|
||||
settings.SHOW_DASHBOARD_ON_MAP_SCREEN.set(compoundButton.isChecked());
|
||||
settings.SHOW_DASHBOARD_ON_START.set(compoundButton.isChecked());
|
||||
}
|
||||
})
|
||||
.setNegativeButton(R.string.shared_string_cancel, null);
|
||||
|
|
Loading…
Reference in a new issue