Settings : Recompute highlight index upon changes (946b1e21) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/SettingsPreferenceFragment.java

+6 −5

Original line number	Diff line number	Diff line
		@@ -72,12 +72,12 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
		private DataSetObserver mDataSetObserver = new DataSetObserver() {
		@Override
		public void onChanged() {
		highlightPreferenceIfNeeded();
		highlightPreferenceIfNeeded(true);
		}

		@Override
		public void onInvalidated() {
		highlightPreferenceIfNeeded();
		highlightPreferenceIfNeeded(true);
		}
		};

		@@ -149,7 +149,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
		final Bundle args = getArguments();
		if (args != null) {
		mPreferenceKey = args.getString(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY);
		highlightPreferenceIfNeeded();
		highlightPreferenceIfNeeded(false);
		}
		}

		@@ -196,8 +196,9 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
		}
		}

		public void highlightPreferenceIfNeeded() {
		if (isAdded() && !mPreferenceHighlighted &&!TextUtils.isEmpty(mPreferenceKey)) {
		public void highlightPreferenceIfNeeded(boolean forceHighlight) {
		if (isAdded() && (!mPreferenceHighlighted \|\| forceHighlight)
		&& !TextUtils.isEmpty(mPreferenceKey)) {
		highlightPreference(mPreferenceKey);
		}
		}