From 651b4249b9c0648d9238ed2dab6e9ad1aa64ca43 Mon Sep 17 00:00:00 2001 From: Alan Viverette Date: Thu, 5 Sep 2013 13:32:40 -0700 Subject: [PATCH] Apply implicit parent dependency when adding to PreferenceGroup BUG: 10493706 Change-Id: Iba741d8dd4e72bc5aef5c033e42a9ba4fb0c523b --- core/java/android/preference/PreferenceGroup.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/java/android/preference/PreferenceGroup.java b/core/java/android/preference/PreferenceGroup.java index a5e05ba31a745..5f8c78d269e62 100644 --- a/core/java/android/preference/PreferenceGroup.java +++ b/core/java/android/preference/PreferenceGroup.java @@ -210,10 +210,7 @@ public abstract class PreferenceGroup extends Preference implements GenericInfla * @return Whether to allow adding the preference (true), or not (false). */ protected boolean onPrepareAddPreference(Preference preference) { - if (!super.isEnabled()) { - preference.setEnabled(false); - } - + preference.onParentChanged(this, shouldDisableDependents()); return true; }