diff options
author | Roman Birg <roman@cyngn.com> | 2015-07-10 15:46:18 -0700 |
---|---|---|
committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2016-01-28 14:30:48 +0000 |
commit | bc5366f143279e7cc97b93333084a415bec4e718 (patch) | |
tree | a85e8fbe1a82a94b9e2dfb46c40465b49b4e2e38 | |
parent | 2d5803e75affe08246bbab95f97b4f2b52ed3765 (diff) | |
download | packages_apps_Settings-bc5366f143279e7cc97b93333084a415bec4e718.zip packages_apps_Settings-bc5366f143279e7cc97b93333084a415bec4e718.tar.gz packages_apps_Settings-bc5366f143279e7cc97b93333084a415bec4e718.tar.bz2 |
Settings: hide light pulse settings if not available
Instead of disabling the pulse length and speed hide them, since they
will not be enabled during the lifetime of the dialog
REF: CYNGNOS-426
Change-Id: Ie0c8b9f27e1de32c9559e5ffdb61c73d8b2ff42f
Signed-off-by: Roman Birg <roman@cyngn.com>
-rw-r--r-- | src/com/android/settings/notificationlight/LightSettingsDialog.java | 42 |
1 files changed, 26 insertions, 16 deletions
diff --git a/src/com/android/settings/notificationlight/LightSettingsDialog.java b/src/com/android/settings/notificationlight/LightSettingsDialog.java index faecf62..d2d4e84 100644 --- a/src/com/android/settings/notificationlight/LightSettingsDialog.java +++ b/src/com/android/settings/notificationlight/LightSettingsDialog.java @@ -136,27 +136,33 @@ public class LightSettingsDialog extends AlertDialog implements mHexColorInput = (EditText) layout.findViewById(R.id.hex_color_input); mNewColor = (ColorPanelView) layout.findViewById(R.id.color_panel); mLightsDialogDivider = (View) layout.findViewById(R.id.lights_dialog_divider); + mPulseSpeedOn = (Spinner) layout.findViewById(R.id.on_spinner); + mPulseSpeedOff = (Spinner) layout.findViewById(R.id.off_spinner); mColorPicker.setOnColorChangedListener(this); mColorPicker.setColor(color, true); mHexColorInput.setOnFocusChangeListener(this); - mPulseSpeedOn = (Spinner) layout.findViewById(R.id.on_spinner); - PulseSpeedAdapter pulseSpeedAdapter = new PulseSpeedAdapter( - R.array.notification_pulse_length_entries, - R.array.notification_pulse_length_values, - speedOn); - mPulseSpeedOn.setAdapter(pulseSpeedAdapter); - mPulseSpeedOn.setSelection(pulseSpeedAdapter.getTimePosition(speedOn)); - mPulseSpeedOn.setOnItemSelectedListener(mPulseSelectionListener); - mPulseSpeedOff = (Spinner) layout.findViewById(R.id.off_spinner); - pulseSpeedAdapter = new PulseSpeedAdapter(R.array.notification_pulse_speed_entries, - R.array.notification_pulse_speed_values, - speedOff); - mPulseSpeedOff.setAdapter(pulseSpeedAdapter); - mPulseSpeedOff.setSelection(pulseSpeedAdapter.getTimePosition(speedOff)); - mPulseSpeedOff.setOnItemSelectedListener(mPulseSelectionListener); + if (onOffChangeable) { + PulseSpeedAdapter pulseSpeedAdapter = new PulseSpeedAdapter( + R.array.notification_pulse_length_entries, + R.array.notification_pulse_length_values, + speedOn); + mPulseSpeedOn.setAdapter(pulseSpeedAdapter); + mPulseSpeedOn.setSelection(pulseSpeedAdapter.getTimePosition(speedOn)); + mPulseSpeedOn.setOnItemSelectedListener(mPulseSelectionListener); + + pulseSpeedAdapter = new PulseSpeedAdapter(R.array.notification_pulse_speed_entries, + R.array.notification_pulse_speed_values, + speedOff); + mPulseSpeedOff.setAdapter(pulseSpeedAdapter); + mPulseSpeedOff.setSelection(pulseSpeedAdapter.getTimePosition(speedOff)); + mPulseSpeedOff.setOnItemSelectedListener(mPulseSelectionListener); + } else { + View speedSettingsGroup = layout.findViewById(R.id.speed_title_view); + speedSettingsGroup.setVisibility(View.GONE); + } mPulseSpeedOn.setEnabled(onOffChangeable); mPulseSpeedOff.setEnabled((speedOn != 1) && onOffChangeable); @@ -242,7 +248,11 @@ public class LightSettingsDialog extends AlertDialog implements @SuppressWarnings("unchecked") public int getPulseSpeedOn() { - return ((Pair<String, Integer>) mPulseSpeedOn.getSelectedItem()).second; + if (mPulseSpeedOn.isEnabled()) { + return ((Pair<String, Integer>) mPulseSpeedOn.getSelectedItem()).second; + } else { + return 1; + } } @SuppressWarnings("unchecked") |