Merge "Fix account screen in split screen" into nyc-dev

am: 43059b7

* commit '43059b7e7c0b2ca89088a3e73799cdbba2c3e90d':
  Fix account screen in split screen

Change-Id: Ic0bf62fedbeca0800fd807ee7c5839fa564fbd42
This commit is contained in:
Jason Monk
2016-04-19 18:22:29 +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