Settings: fix a few color picker inconsistentcies

Don't assume we can pulse when calling setAllValues().

Don't display both on/off pulse values when it cannot pulse.

Default to Always on when we can't pulse.

Ref: CYNGNOS-403
Change-Id: Ie356cdc35cb545dd51896697f89ef265ada1147f
Signed-off-by: Roman Birg <roman@cyngn.com>

diff --git a/src/com/android/settings/notificationlight/ApplicationLightPreference.java b/src/com/android/settings/notificationlight/ApplicationLightPreference.java
index 9feb050..a12f45b 100644 (file)
--- a/src/com/android/settings/notificationlight/ApplicationLightPreference.java
+++ b/src/com/android/settings/notificationlight/ApplicationLightPreference.java
@@ -148,7 +148,7 @@ public class ApplicationLightPreference extends DialogPreference {
             mOnValueView.setText(mapLengthValue(mOnValue));
         }
         if (mOffValueView != null) {
-            if (mOnValue == 1) {
+            if (mOnValue == 1 || !mOnOffChangeable) {
                 mOffValueView.setVisibility(View.GONE);
             } else {
                 mOffValueView.setVisibility(View.VISIBLE);
@@ -226,7 +226,6 @@ public class ApplicationLightPreference extends DialogPreference {
         mColorValue = color;
         mOnValue = onValue;
         mOffValue = offValue;
-        mOnOffChangeable = true;
         updatePreferenceViews();
     }
 
@@ -260,6 +259,9 @@ public class ApplicationLightPreference extends DialogPreference {
     }
 
     private String mapLengthValue(Integer time) {
+        if (!mOnOffChangeable) {
+            return getContext().getString(R.string.pulse_length_always_on);
+        }
         if (time == DEFAULT_TIME) {
             return getContext().getString(R.string.default_time);
         }