summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java21
-rw-r--r--src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java2
2 files changed, 1 insertions, 22 deletions
diff --git a/src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java b/src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java
index 66a6d3f..66f1fdd 100644
--- a/src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java
+++ b/src/com/android/settings/cyanogenmod/BacklightTimeoutSeekBar.java
@@ -60,27 +60,6 @@ public class BacklightTimeoutSeekBar extends SeekBar {
}
@Override
- public void setProgress(int progress) {
- if (progress == 0) {
- progress = getMax();
- } else {
- progress--;
- }
- super.setProgress(progress);
- }
-
- @Override
- public int getProgress() {
- int progress = super.getProgress();
- if (mUpdatingThumb) {
- return progress;
- } else if (progress == getMax()) {
- return 0;
- }
- return progress + 1;
- }
-
- @Override
protected int updateTouchProgress(int lastProgress, int newProgress) {
if (newProgress < mMax) {
return newProgress;
diff --git a/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java b/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
index a15a55c..7c63f34 100644
--- a/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
+++ b/src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java
@@ -252,7 +252,7 @@ public class ButtonBacklightBrightness extends DialogPreference implements
if (buttonBrightness == 0) {
setSummary(R.string.backlight_summary_disabled);
} else if (timeout == 0) {
- setSummary(R.string.backlight_summary_enabled);
+ setSummary(R.string.backlight_timeout_unlimited);
} else {
setSummary(getContext().getString(R.string.backlight_summary_enabled_with_timeout,
getTimeoutString(timeout)));