commit 67c54102ecbfc87e36d6daa6d3638bfc5b0c6482
author Jason Monk <jmonk@google.com> Mon Feb 01 14:27:58 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Feb 01 14:27:58 2016 +0000
tree b2a113ba5c160e19c484babae8817fc66228899f
parent c8457a8605e747113377105b52372b3acc350fc6
parent 77467e04d4bd3a1be21b0f192ff98ac377dad5b8

Merge "Fix dream settings initial state."

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();
         }
     }