Merge "Fix IllegalStateException in onBackPressed" into ub-contactsdialer-a-dev (7d9c9ec6) · Commits · e / os / android_packages_apps_Contacts

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

+23 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,8 @@ public class PeopleActivity extends ContactsActivity implements
		private MultiSelectContactsListFragment mAllFragment;
		private ContactTileListFragment mFavoritesFragment;

		private boolean mIsVisible;

		/** ViewPager for swipe */
		private ViewPager mTabPager;
		private ViewPagerTabs mViewPagerTabs;
		@@ -410,6 +412,14 @@ public class PeopleActivity extends ContactsActivity implements
		configureFragments(!mIsRecreatedInstance);
		}
		super.onStart();

		mIsVisible = true;
		}

		@Override
		protected void onStop() {
		mIsVisible = false;
		super.onStop();
		}

		@Override
		@@ -454,6 +464,13 @@ public class PeopleActivity extends ContactsActivity implements
		super.onDestroy();
		}

		/**
		* Returns true when the Activity is currently visible (between onStart and onStop).
		*/
		/* package */ boolean isVisible() {
		return mIsVisible;
		}

		private void configureFragments(boolean fromRequest) {
		if (fromRequest) {
		ContactListFilter filter = null;
		@@ -1338,6 +1355,10 @@ public class PeopleActivity extends ContactsActivity implements

		@Override
		public void onBackPressed() {
		if (!isVisible()) {
		return;
		}

		if (mActionBarAdapter.isSelectionMode()) {
		mActionBarAdapter.setSelectionMode(false);
		mAllFragment.displayCheckBoxes(false);
		@@ -1350,6 +1371,8 @@ public class PeopleActivity extends ContactsActivity implements

		@Override
		protected void onSaveInstanceState(Bundle outState) {
		mIsVisible = false;

		super.onSaveInstanceState(outState);
		mActionBarAdapter.onSaveInstanceState(outState);