PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix dream settings initial state."

Browse Source
This commit is contained in:
Jason Monk
2016-02-01 14:27:58 +00:00
committed by Android (Google) Code Review
parent c8457a8605 77467e04d4
commit 67c54102ec
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/DreamSettings.java
View File

@@ -258,8 +258,9 @@ public class DreamSettings extends SettingsPreferenceFragment implements
logd("refreshFromBackend()"); logd("refreshFromBackend()");
mRefreshing = true; mRefreshing = true;
boolean dreamsEnabled = mBackend.isEnabled(); boolean dreamsEnabled = mBackend.isEnabled();
if (mSwitchBar.isChecked() != dreamsEnabled) if (mSwitchBar.isChecked() != dreamsEnabled) {
mSwitchBar.setChecked(dreamsEnabled); mSwitchBar.setChecked(dreamsEnabled);
}
if (getPreferenceScreen() == null) { if (getPreferenceScreen() == null) {
setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext())); setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getContext()));
@@ -273,15 +274,16 @@ public class DreamSettings extends SettingsPreferenceFragment implements
new DreamInfoPreference(getPrefContext(), dreamInfos.get(i))); new DreamInfoPreference(getPrefContext(), dreamInfos.get(i)));
} }
} }
if (mMenuItemsWhenEnabled != null) if (mMenuItemsWhenEnabled != null) {
for (MenuItem menuItem : mMenuItemsWhenEnabled) for (MenuItem menuItem : mMenuItemsWhenEnabled) {
menuItem.setEnabled(dreamsEnabled); menuItem.setEnabled(dreamsEnabled);
}
}
mRefreshing = false; mRefreshing = false;
} }
private static void logd(String msg, Object... args) { private static void logd(String msg, Object... args) {
if (DEBUG) if (DEBUG) Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
Log.d(TAG, args == null || args.length == 0 ? msg : String.format(msg, args));
} }
private class DreamInfoPreference extends Preference { private class DreamInfoPreference extends Preference {

1
src/com/android/settings/SettingsPreferenceFragment.java
View File

@@ -197,6 +197,7 @@ public abstract class SettingsPreferenceFragment extends InstrumentedPreferenceF
mCurrentRootAdapter = getListView().getAdapter(); mCurrentRootAdapter = getListView().getAdapter();
mCurrentRootAdapter.registerAdapterDataObserver(mDataSetObserver); mCurrentRootAdapter.registerAdapterDataObserver(mDataSetObserver);
mIsDataSetObserverRegistered = true; mIsDataSetObserverRegistered = true;
onDataSetChanged();
} }
} }