From 77467e04d4bd3a1be21b0f192ff98ac377dad5b8 Mon Sep 17 00:00:00 2001 From: Jason Monk Date: Sat, 30 Jan 2016 12:15:11 -0500 Subject: [PATCH] Fix dream settings initial state. The empty view wasn't being updated initially by the fragment so it was being left in an empty state since no preferences are added after the fact. Bug: 25609200 Change-Id: Ib9aa02ba94bf7077d01892d96d79d39203047f4d --- src/com/android/settings/DreamSettings.java | 12 +++++++----- .../android/settings/SettingsPreferenceFragment.java | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java index 958baa8a996..33278981b6b 100644 --- a/src/com/android/settings/DreamSettings.java +++ b/src/com/android/settings/DreamSettings.java @@ -258,8 +258,9 @@ public class DreamSettings extends SettingsPreferenceFragment implements logd("refreshFromBackend()"); mRefreshing = true; boolean dreamsEnabled = mBackend.isEnabled(); - if (mSwitchBar.isChecked() != dreamsEnabled) + if (mSwitchBar.isChecked() != dreamsEnabled) { mSwitchBar.setChecked(dreamsEnabled); + } if (getPreferenceScreen() == null) { setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext())); @@ -273,15 +274,16 @@ public class DreamSettings extends SettingsPreferenceFragment implements new DreamInfoPreference(getPrefContext(), dreamInfos.get(i))); } } - if (mMenuItemsWhenEnabled != null) - for (MenuItem menuItem : mMenuItemsWhenEnabled) + if (mMenuItemsWhenEnabled != null) { + for (MenuItem menuItem : mMenuItemsWhenEnabled) { menuItem.setEnabled(dreamsEnabled); + } + } mRefreshing = false; } private static void logd(String msg, Object... args) { - if (DEBUG) - Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args)); + if (DEBUG) Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args)); } private class DreamInfoPreference extends Preference { diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java index d2ce2851180..41fd79549cf 100644 --- a/src/com/android/settings/SettingsPreferenceFragment.java +++ b/src/com/android/settings/SettingsPreferenceFragment.java @@ -197,6 +197,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF mCurrentRootAdapter = getListView().getAdapter(); mCurrentRootAdapter.registerAdapterDataObserver(mDataSetObserver); mIsDataSetObserverRegistered = true; + onDataSetChanged(); } }