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

am: 50d03f4

* commit '50d03f4f654e0ce900eaa4201c732eb6c8392cef':
  Fix account screen in split screen

Change-Id: I03a079678ddad2a0e9093e848621604b0992aaf6
This commit is contained in:
Jason Monk
2016-04-19 18:41:36 +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