Commit 4107ea08 authored Jul 27, 2015 by Ed Falk Committed by Gerrit Code Review Jul 29, 2015

Disable sim toggle switch if preference is disabled



Normally, if a SwitchPreference is disabled, the Switch
GUI element is also disabled. MultiSimEnablerPreference added
an "explicitly disabled" flag to allow a client to explicitly
disable the switch. However, as written, the code was looking
at the "explicitly disabled" flag only, and ignoring whether
or not the preference was disabled. This change fixes that.

JALEBI-139

Signed-off-by: Edward Falk <efalk@cyngn.com>
Cherry picked from cm-12.1, eb04e7cc

Change-Id: I33de46fa19808075756933fbbb32e53e32ca8eab

parent 453d7205

src/com/android/settings/sim/MultiSimEnablerPreference.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -127,7 +127,7 @@ public class MultiSimEnablerPreference extends SwitchPreference implements
		boolean isSubValid = isCurrentSubValid();
		setEnabled(isSubValid);
		if (mSwitch != null) {
		mSwitch.setEnabled(!mExplicitlyDisabled);
		mSwitch.setEnabled(isSubValid && !mExplicitlyDisabled);
		}

		logd("update() isSubValid " + isSubValid);