commit 77467e04d4bd3a1be21b0f192ff98ac377dad5b8
author Jason Monk <jmonk@google.com> Sat Jan 30 12:15:11 2016 -0500
committer Jason Monk <jmonk@google.com> Sat Jan 30 12:15:11 2016 -0500
tree 7fdab322140644a12c2d196384608411e433c5c7
parent 7368750b4f8f93424aa2f80a206583962d82c434

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

diff --git a/src/com/android/settings/DreamSettings.java b/src/com/android/settings/DreamSettings.java
index 958baa8..3327898 100644
--- a/src/com/android/settings/DreamSettings.java
+++ b/src/com/android/settings/DreamSettings.java
@@ -258,8 +258,9 @@
         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 @@
                         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 {

src/com/android/settings/SettingsPreferenceFragment.java

diff --git a/src/com/android/settings/SettingsPreferenceFragment.java b/src/com/android/settings/SettingsPreferenceFragment.java
index d2ce285..41fd795 100644
--- a/src/com/android/settings/SettingsPreferenceFragment.java
+++ b/src/com/android/settings/SettingsPreferenceFragment.java
@@ -197,6 +197,7 @@
             mCurrentRootAdapter = getListView().getAdapter();
             mCurrentRootAdapter.registerAdapterDataObserver(mDataSetObserver);
             mIsDataSetObserverRegistered = true;
+            onDataSetChanged();
         }
     }