Merge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f
am: ee3164bd42
Change-Id: I63a71e144fd3b93c2c9b285cd637ba656092fa79
This commit is contained in:
@@ -24,6 +24,7 @@ import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settings.widget.DisabledCheckBoxPreference;
|
||||
|
||||
public class ZenModeVisEffectPreferenceController
|
||||
extends AbstractZenModePreferenceController
|
||||
@@ -78,9 +79,9 @@ public class ZenModeVisEffectPreferenceController
|
||||
if (parentSuppressed) {
|
||||
((CheckBoxPreference) preference).setChecked(parentSuppressed);
|
||||
onPreferenceChange(preference, parentSuppressed);
|
||||
preference.setEnabled(false);
|
||||
((DisabledCheckBoxPreference) preference).enableCheckbox(false);
|
||||
} else {
|
||||
preference.setEnabled(true);
|
||||
((DisabledCheckBoxPreference) preference).enableCheckbox(true);
|
||||
((CheckBoxPreference) preference).setChecked(suppressed);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user