Merge remote-tracking branch 'upstream/master'

Fix brightness manager on video playback
XPRIZE · Sep 25, 2017 · 0cc595e · 0cc595e
2 parents c8258ec + 94dca20
commit 0cc595e
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
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)
         {