Merge remote-tracking branch 'upstream/master'

Jamie Stuart · Jamie Stuart · commit 0cc595ed1404 · 2017-09-25T15:43:55.000+01:00
Fix brightness manager on video playback
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/src/main/java/org/onebillion/onecourse/mainui/OBSetupMenu.java b/app/src/main/java/org/onebillion/onecourse/mainui/OBSetupMenu.java
@@ -138,6 +138,8 @@ public void start ()
         super.start();
         setStatus(STATUS_AWAITING_CLICK);
         //
+        OBBrightnessManager.sharedManager.setScreenSleepTimeToMax();
+        //
         OBUtils.runOnOtherThread(new OBUtils.RunLambda()
         {
             @Override
diff --git a/app/src/main/java/org/onebillion/onecourse/utils/OBBrightnessManager.java b/app/src/main/java/org/onebillion/onecourse/utils/OBBrightnessManager.java
@@ -197,7 +197,7 @@ public boolean updateBrightness (boolean loop)
         long elapsed = currentTimeStamp - lastTouchTimeStamp;
         float percentage = (elapsed < checkIntervalMS) ? maxBrightness() : (elapsed < checkIntervalMS * 2) ? maxBrightness() / 2.0f : (elapsed < checkIntervalMS * 3) ? maxBrightness() / 4.0f : 0.0f;
         //
-//        MainActivity.log("updateBrightness : " + elapsed + " " + percentage);
+        MainActivity.log("updateBrightness : " + elapsed + " " + percentage);
         //
         if (lastBrightness != percentage)
         {

Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,8 @@ public void start ()`
`138`	`138`	`super.start();`
`139`	`139`	`setStatus(STATUS_AWAITING_CLICK);`
`140`	`140`	`//`
	`141`	`+ OBBrightnessManager.sharedManager.setScreenSleepTimeToMax();`
	`142`	`+ //`
`141`	`143`	`OBUtils.runOnOtherThread(new OBUtils.RunLambda()`
`142`	`144`	`{`
`143`	`145`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ public boolean updateBrightness (boolean loop)`
`197`	`197`	`long elapsed = currentTimeStamp - lastTouchTimeStamp;`
`198`	`198`	`float percentage = (elapsed < checkIntervalMS) ? maxBrightness() : (elapsed < checkIntervalMS * 2) ? maxBrightness() / 2.0f : (elapsed < checkIntervalMS * 3) ? maxBrightness() / 4.0f : 0.0f;`
`199`	`199`	`//`
`200`		`-// MainActivity.log("updateBrightness : " + elapsed + " " + percentage);`
	`200`	`+ MainActivity.log("updateBrightness : " + elapsed + " " + percentage);`
`201`	`201`	`//`
`202`	`202`	`if (lastBrightness != percentage)`
`203`	`203`	`{`