Merge "Prevent action-bar icons from changing while QuickContacts active." into jb-dev (f0eb46a5) · Commits · e / os / android_packages_apps_Contacts

src/com/android/contacts/activities/PeopleActivity.java

+6 −10

Original line number	Original line	Diff line number	Diff line
	@@ -150,7 +150,7 @@ public class PeopleActivity extends ContactsActivity

	private ContactsUnavailableFragment mContactsUnavailableFragment;		private ContactsUnavailableFragment mContactsUnavailableFragment;
	private ProviderStatusWatcher mProviderStatusWatcher;		private ProviderStatusWatcher mProviderStatusWatcher;
	private int mProviderStatus = -1;		private int mProviderStatus;

	private boolean mOptionsMenuContactsAvailable;		private boolean mOptionsMenuContactsAvailable;

	@@ -490,8 +490,6 @@ public class PeopleActivity extends ContactsActivity
	@Override		@Override
	protected void onPause() {		protected void onPause() {
	mOptionsMenuContactsAvailable = false;		mOptionsMenuContactsAvailable = false;

	mProviderStatus = -1;
	mProviderStatusWatcher.stop();		mProviderStatusWatcher.stop();
	super.onPause();		super.onPause();
	}		}
	@@ -499,8 +497,9 @@ public class PeopleActivity extends ContactsActivity
	@Override		@Override
	protected void onResume() {		protected void onResume() {
	super.onResume();		super.onResume();

	mProviderStatusWatcher.start();		mProviderStatusWatcher.start();
	showContactsUnavailableFragmentIfNecessary();		updateViewConfiguration(true);

	// Re-register the listener, which may have been cleared when onSaveInstanceState was		// Re-register the listener, which may have been cleared when onSaveInstanceState was
	// called. See also: onSaveInstanceState		// called. See also: onSaveInstanceState
	@@ -983,15 +982,12 @@ public class PeopleActivity extends ContactsActivity

	@Override		@Override
	public void onProviderStatusChange() {		public void onProviderStatusChange() {
	showContactsUnavailableFragmentIfNecessary();		updateViewConfiguration(false);
	}		}

	private void showContactsUnavailableFragmentIfNecessary() {		private void updateViewConfiguration(boolean forceUpdate) {
	int providerStatus = mProviderStatusWatcher.getProviderStatus();		int providerStatus = mProviderStatusWatcher.getProviderStatus();
	if (providerStatus == mProviderStatus) {		if (!forceUpdate && (providerStatus == mProviderStatus)) return;
	return;
	}

	mProviderStatus = providerStatus;		mProviderStatus = providerStatus;

	View contactsUnavailableView = findViewById(R.id.contacts_unavailable_view);		View contactsUnavailableView = findViewById(R.id.contacts_unavailable_view);