Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Undo inverting setting, remove method from BaseSettingsFragment

Browse source
This commit is contained in:
androiddevkotlin 2021-04-05 13:00:16 +03:00
parent 96d6aff021
commit 8c37068918
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd/src/net/osmand/plus/routing/VoiceRouter.java
View file

@ -702,7 +702,7 @@ public class VoiceRouter {
boolean isPlay = true; boolean isPlay = true;
ExitInfo exitInfo = next.getExitInfo(); ExitInfo exitInfo = next.getExitInfo();
if (tParam != null) { if (tParam != null) {
if (exitInfo != null && !Algorithms.isEmpty(exitInfo.getRef()) && !settings.SPEAK_EXIT_NUMBER_NAMES.get()) { if (exitInfo != null && !Algorithms.isEmpty(exitInfo.getRef()) && settings.SPEAK_EXIT_NUMBER_NAMES.get()) {
String stringRef = getSpeakableExitRef(exitInfo.getRef()); String stringRef = getSpeakableExitRef(exitInfo.getRef());
p.takeExit(tParam, dist, stringRef, getIntRef(exitInfo.getRef()), getSpeakableExitName(next, exitInfo, true)); p.takeExit(tParam, dist, stringRef, getIntRef(exitInfo.getRef()), getSpeakableExitName(next, exitInfo, true));
} else { } else {
@ -777,7 +777,7 @@ public class VoiceRouter {
ExitInfo exitInfo = next.getExitInfo(); ExitInfo exitInfo = next.getExitInfo();
boolean isplay = true; boolean isplay = true;
if (tParam != null) { if (tParam != null) {
if (exitInfo != null && !Algorithms.isEmpty(exitInfo.getRef()) && !settings.SPEAK_EXIT_NUMBER_NAMES.get()) { if (exitInfo != null && !Algorithms.isEmpty(exitInfo.getRef()) && settings.SPEAK_EXIT_NUMBER_NAMES.get()) {
String stringRef = getSpeakableExitRef(exitInfo.getRef()); String stringRef = getSpeakableExitRef(exitInfo.getRef());
p.takeExit(tParam, stringRef, getIntRef(exitInfo.getRef()), getSpeakableExitName(next, exitInfo, !suppressDest)); p.takeExit(tParam, stringRef, getIntRef(exitInfo.getRef()), getSpeakableExitName(next, exitInfo, !suppressDest));
} else { } else {

6
OsmAnd/src/net/osmand/plus/settings/fragments/BaseSettingsFragment.java
View file

@ -924,12 +924,6 @@ public abstract class BaseSettingsFragment extends PreferenceFragmentCompat impl
} }
} }
public void setupSpeedCamerasAlert() {
Preference speedCamerasAlert = findPreference(settings.SPEED_CAMERAS_UNINSTALLED.getId());
speedCamerasAlert.setIcon(getContentIcon(R.drawable.ic_action_alert));
speedCamerasAlert.setVisible(!settings.SPEED_CAMERAS_UNINSTALLED.get());
}
public void setupPrefRoundedBg(PreferenceViewHolder holder) { public void setupPrefRoundedBg(PreferenceViewHolder holder) {
View selectableView = holder.itemView.findViewById(R.id.selectable_list_item); View selectableView = holder.itemView.findViewById(R.id.selectable_list_item);
if (selectableView != null) { if (selectableView != null) {

6
OsmAnd/src/net/osmand/plus/settings/fragments/ScreenAlertsFragment.java
View file

@ -164,4 +164,10 @@ public class ScreenAlertsFragment extends BaseSettingsFragment implements OnPref
showCameras.setIcon(getIcon(R.drawable.list_warnings_speed_camera)); showCameras.setIcon(getIcon(R.drawable.list_warnings_speed_camera));
showCameras.setVisible(!settings.SPEED_CAMERAS_UNINSTALLED.get()); showCameras.setVisible(!settings.SPEED_CAMERAS_UNINSTALLED.get());
} }
public void setupSpeedCamerasAlert() {
Preference speedCamerasAlert = findPreference(settings.SPEED_CAMERAS_UNINSTALLED.getId());
speedCamerasAlert.setIcon(getContentIcon(R.drawable.ic_action_alert));
speedCamerasAlert.setVisible(!settings.SPEED_CAMERAS_UNINSTALLED.get());
}
} }