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

Merge remote-tracking branch 'origin/r3.7'

Browse source
This commit is contained in:
Victor Shcherb 2020-06-03 15:44:45 +02:00
commit 0774ea9101
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/src/net/osmand/plus/activities/MapActivity.java
View file

@ -1992,7 +1992,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
@Override @Override
public void unlock() { public void unlock() {
changeKeyguardFlags(true, false); changeKeyguardFlags(true, true);
} }
@Override @Override

6
OsmAnd/src/net/osmand/plus/helpers/LockHelper.java
View file

@ -118,9 +118,11 @@ public class LockHelper implements SensorEventListener {
private void lock() { private void lock() {
releaseWakeLocks(); releaseWakeLocks();
int unlockTime = turnScreenOnTime.get();
if (lockUIAdapter != null) { if (lockUIAdapter != null) {
if (!(useSystemScreenTimeout.get() && turnScreenOnPowerButton.get()) && unlockTime != 0) { boolean useSystemTimeout = useSystemScreenTimeout.get();
boolean usePowerButton = useSystemTimeout && turnScreenOnPowerButton.get()
|| !useSystemTimeout && turnScreenOnTime.get() == 0 && turnScreenOnPowerButton.get();
if (!usePowerButton) {
lockUIAdapter.lock(); lockUIAdapter.lock();
} }
} }