Merge pull request mozilla-b2g#622 from vingtetun/settings2

Let the user configure the brightness
daleharvey · Feb 24, 2012 · 4144f76 · 4144f76
2 parents 3552973 + 68fa234
commit 4144f76
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 26 deletions.
diff --git a/apps/settings/js/settings.js b/apps/settings/js/settings.js
@@ -40,6 +40,15 @@ Gaia.SettingsApp = {
       })(radios[i]);
     }
 
+    var brightness = document.getElementById('brightness-level');
+    brightness.addEventListener('click', function clickBrightness(evt) {
+      var rect = brightness.getBoundingClientRect();
+      var position = Math.ceil((evt.clientX - rect.left) / (rect.width / 10));
+      screen.mozBrightness = position / 10;
+      brightness.value = position;
+    });
+    brightness.value = screen.mozBrigthness * 10;
+
     window.parent.postMessage('appready', '*');
   },
   handleEvent: function(evt) {

diff --git a/apps/settings/settings.html b/apps/settings/settings.html
@@ -179,32 +179,17 @@
     <!-- Display -->
     <div id="display" class="view" data-title="Display">
       <ul class="tableView">
-      <li id="brightness">
-        <label>Brightness level</label>
-        <progress id="brightness-input" value="1" max="1"></progress>
-        <br/ >
-        <span class="comment">Waiting for <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=707626">bug 707626</a></span>
-      </li>
-      <li>
-        <span>Lock Screen</span>
-        <label class="checkbox">
-          <input type="checkbox" name="lockscreen.enabled"/>
-          <span class="checkbox-inner"></span>
-        </label>
-      </li>
-      <li id="screentimeout">
-        <label for="screentimeout-input">Screen Timeout</label>
-        <select>
-          <option value="0">Never</option>
-          <option value="15">15 seconds</option>
-          <option value="30">30 seconds</option>
-          <option value="60">1 minute</option>
-          <option value="120">2 minutes</option>
-          <option value="600">10 minutes</option>
-        </select>
-        <br/ >
-        <span class="comment">Waiting for <a href="https://bugzilla.mozilla.org/show_bug.cgi?id=707626">bug 707626</a></span>
-      </li>
+        <li id="brightness">
+          <label>Brigthness level</label>
+          <progress id="brightness-level" value="10" max="10"></progress>
+        </li>
+        <li>
+          <span>Lock Screen</span>
+          <label class="checkbox">
+            <input type="checkbox" name="lockscreen.enabled"/>
+            <span class="checkbox-inner"></span>
+          </label>
+        </li>
       </ul>
     </div>