Merge "Fix account screen in split screen" into nyc-dev am: 43059b7

am: 4619c9c

* commit '4619c9cf4a37a510d646321eba670c831ee5f703':
  Fix account screen in split screen

Change-Id: I34a6c6f43a511212c851ace8e551e23c6d640832
This commit is contained in:
Jason Monk
2016-04-19 18:29:40 +00:00
committed by android-build-merger

View File

@@ -191,6 +191,7 @@ public class AccountSettings extends SettingsPreferenceFragment
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
cleanUpPreferences();
updateUi(); updateUi();
mManagedProfileBroadcastReceiver.register(getActivity()); mManagedProfileBroadcastReceiver.register(getActivity());
listenToAccountUpdates(); listenToAccountUpdates();
@@ -201,7 +202,6 @@ public class AccountSettings extends SettingsPreferenceFragment
super.onPause(); super.onPause();
stopListeningToAccountUpdates(); stopListeningToAccountUpdates();
mManagedProfileBroadcastReceiver.unregister(getActivity()); mManagedProfileBroadcastReceiver.unregister(getActivity());
cleanUpPreferences();
} }
@Override @Override