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

fix Screen control strings logic

Browse source
This commit is contained in:
sonora 2020-05-29 18:40:18 +02:00
parent 15cd44e59c
commit aa7e987f55
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
OsmAnd/res/values/strings.xml
View file

@ -29,18 +29,18 @@
<string name="sqlite_db_file">SQLiteDB file</string>
<string name="one_image_per_tile">One image file per tile</string>
<string name="pseudo_mercator_projection">Pseudo-Mercator projection</string>
<string name="screen_timeout_descr">If the \"%1$s\" option is enabled, the activity time will depend on it.</string>
<string name="screen_timeout_descr">Limited by \"%1$s\", if enabled.</string>
<string name="keep_screen_off">Keep screen off</string>
<string name="keep_screen_on">Keep screen on</string>
<string name="turn_screen_on_wake_time_descr">Select the screen timeout after waking up. (The screen will not turn off if \"%1$s\" is enabled.)</string>
<string name="turn_screen_on_wake_time_descr">Select the screen timeout after waking up. (\"%1$s\" applies no timeout.)</string>
<string name="turn_screen_on_proximity_sensor">Proximity sensor</string>
<string name="turn_screen_on_power_button">Power button</string>
<string name="turn_screen_on_power_button_descr">Press the device power button to turn the screen on with OsmAnd in the foreground.</string>
<string name="turn_screen_on_power_button_descr">Pressing the device power button will turn the screen on with OsmAnd on top of the lock screen.</string>
<string name="turn_screen_on_navigation_instructions">Navigation instructions</string>
<string name="turn_screen_on_navigation_instructions_descr">During navigation only, for each navigation instruction the screen will turn on for the selected timeout span.</string>
<string name="turn_screen_on_descr">These options will work only if OsmAnd is in the foreground at the time the device is locked.</string>
<string name="turn_screen_on_options_descr">Use these options to wake up the screen with OsmAnd in the foreground.</string>
<string name="system_screen_timeout">Screen timeout</string>
<string name="turn_screen_on_navigation_instructions_descr">Each navigation instruction will turn the screen on.</string>
<string name="turn_screen_on_descr">Select screen wake-up options (make sure OsmAnd is in the foreground when the device is being locked):</string>
<string name="turn_screen_on_options_descr">Screen wake-up options:</string>
<string name="system_screen_timeout">Use system screen timeout</string>
<string name="system_screen_timeout_descr">Turns the screen off after the system\'s screen timeout.</string>
<string name="screen_control">Screen control</string>
<string name="shared_string_always">Always</string>
@ -531,7 +531,7 @@
<string name="turn_screen_on_router">Wake on turn</string>
<string name="turn_screen_on_time_descr">Adjust how long the screen should be on for.</string>
<string name="turn_screen_on_sensor">Use proximity sensor</string>
<string name="turn_screen_on_sensor_descr">Wave your hand over the top of the screen to turn it on while navigating.</string>
<string name="turn_screen_on_sensor_descr">Waving your hand across the screen will turn it on.</string>
<string name="app_mode_offroad">Offroad</string>
<string name="edit_profile_setup_title">Set up profile</string>
<string name="edit_profile_setup_subtitle">The profile keeps its own settings</string>

4
OsmAnd/src/net/osmand/plus/settings/bottomsheets/WakeTimeBottomSheet.java
View file

@ -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]);