AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Respect the 'Keep the screen on' setting regardless of current location mode

Browse source 
Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-11-24 18:56:55 +02:00 • committed by Viktor Govako
parent 388a3ed8ac
commit 67da0d47ab
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
android/app/src/main/java/app/organicmaps/MwmActivity.java
View file

@ -1094,6 +1094,7 @@ public class MwmActivity extends BaseMwmFragmentActivity
LocationState.nativeSetListener(this);
LocationHelper.from(this).addListener(this);
mSearchController.attach(this);
Utils.keepScreenOn(Config.isKeepScreenOnEnabled() || RoutingController.get().isNavigating(), getWindow());
}
@Override
@ -1712,11 +1713,6 @@ public class MwmActivity extends BaseMwmFragmentActivity
if (controller.isPlanning() || controller.isBuilding() || controller.isErrorEncountered())
showAddStartOrFinishFrame(controller, true);
if (newMode == FOLLOW || newMode == FOLLOW_AND_ROTATE)
Utils.keepScreenOn(Config.isKeepScreenOnEnabled() || RoutingController.get().isNavigating(), getWindow());
else
Utils.keepScreenOn(RoutingController.get().isNavigating(), getWindow());
final LocationHelper locationHelper = LocationHelper.from(this);
// Check if location was disabled by the user.

2
android/app/src/main/java/app/organicmaps/settings/SettingsPrefsFragment.java
View file

@ -765,7 +765,7 @@ public class SettingsPrefsFragment extends BaseXmlSettingsFragment
if (isKeepScreenOnEnabled != newVal)
{
Config.setKeepScreenOnEnabled(newVal);
Utils.keepScreenOn(newVal, requireActivity().getWindow());
// No need to call Utils.keepScreenOn() here, as relevant activities do it when starting / stopping.
}
return true;
});

4
android/app/src/main/java/app/organicmaps/util/Utils.java
View file

@ -76,7 +76,7 @@ public class Utils
*/
public static void keepScreenOn(boolean enable, Window w)
{
Logger.i(TAG, "enabled = " + enable + " window = " + w);
Logger.i(TAG, "KeepScreenOn = " + enable + " window = " + w);
if (enable)
w.addFlags(android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
else
@ -93,7 +93,7 @@ public class Utils
public static void showOnLockScreen(boolean enable, Activity activity)
{
Logger.i(TAG, "enabled = " + enable + " window = " + activity.getWindow());
Logger.i(TAG, "showOnLockScreen = " + enable + " window = " + activity.getWindow());
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O_MR1)
showOnLockScreenOld(enable, activity);
else