diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml index 10c4bad430..999bd73ec0 100644 --- a/OsmAnd/res/values/strings.xml +++ b/OsmAnd/res/values/strings.xml @@ -29,18 +29,18 @@ SQLiteDB file One image file per tile Pseudo-Mercator projection - If the \"%1$s\" option is enabled, the activity time will depend on it. + Limited by \"%1$s\", if enabled. Keep screen off Keep screen on - Select the screen timeout after waking up. (The screen will not turn off if \"%1$s\" is enabled.) + Select the screen timeout after waking up. (\"%1$s\" applies no timeout.) Proximity sensor Power button - Press the device power button to turn the screen on with OsmAnd in the foreground. + Pressing the device power button will turn the screen on with OsmAnd on top of the lock screen. Navigation instructions - During navigation only, for each navigation instruction the screen will turn on for the selected timeout span. - These options will work only if OsmAnd is in the foreground at the time the device is locked. - Use these options to wake up the screen with OsmAnd in the foreground. - Screen timeout + Each navigation instruction will turn the screen on. + Select screen wake-up options (make sure OsmAnd is in the foreground when the device is being locked): + Screen wake-up options: + Use system screen timeout Turns the screen off after the system\'s screen timeout. Screen control Always @@ -531,7 +531,7 @@ Wake on turn Adjust how long the screen should be on for. Use proximity sensor - Wave your hand over the top of the screen to turn it on while navigating. + Waving your hand across the screen will turn it on. Offroad Set up profile The profile keeps its own settings diff --git a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/WakeTimeBottomSheet.java b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/WakeTimeBottomSheet.java index d670415dda..149aa5b0a4 100644 --- a/OsmAnd/src/net/osmand/plus/settings/bottomsheets/WakeTimeBottomSheet.java +++ b/OsmAnd/src/net/osmand/plus/settings/bottomsheets/WakeTimeBottomSheet.java @@ -66,7 +66,7 @@ public class WakeTimeBottomSheet extends BasePreferenceBottomSheet { items.add(preferenceDescription); final String on = getString(R.string.keep_screen_on); - final String off = getString(R.string.keep_screen_off); + final String off = getString(R.string.keep_screen_on); // also needs to say 'on' the way the dialog is designed. final BottomSheetItemWithCompoundButton[] preferenceBtn = new BottomSheetItemWithCompoundButton[1]; preferenceBtn[0] = (BottomSheetItemWithCompoundButton) new BottomSheetItemWithCompoundButton.Builder() .setChecked(keepScreenOnEnabled) @@ -98,7 +98,7 @@ public class WakeTimeBottomSheet extends BasePreferenceBottomSheet { Context themedCtx = UiUtilities.getThemedContext(ctx, nightMode); TextView tvSliderTitle = sliderView.findViewById(android.R.id.title); - tvSliderTitle.setText(getString(R.string.shared_string_time)); + tvSliderTitle.setText(getString(R.string.wake_time)); final TextView tvSliderSummary = sliderView.findViewById(android.R.id.summary); tvSliderSummary.setText(listPreference.getEntries()[selectedEntryIndex]);