commit 7712aef22da432331a67c710cfc18bce2c493887
author Jay Shrauner <shrauner@google.com> Fri Sep 25 14:14:28 2015 -0700
committer Jay Shrauner <shrauner@google.com> Fri Sep 25 14:14:28 2015 -0700
tree 1dd477402f54e6db5b42d20dc2ef8b77d3106fbb
parent 3daa9a34380f0368292f366c397c26f7e90db0df

Use TransactionSafeActivity

Remove custom visibility tracking.

Bug:24294419
Change-Id: I554a1277aa3fa9575c93191b99b7e6b484596379

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

diff --git a/src/com/android/contacts/activities/ContactSelectionActivity.java b/src/com/android/contacts/activities/ContactSelectionActivity.java
index fd45906..f2c9301 100644
--- a/src/com/android/contacts/activities/ContactSelectionActivity.java
+++ b/src/com/android/contacts/activities/ContactSelectionActivity.java
@@ -84,8 +84,6 @@
     private ContactsIntentResolver mIntentResolver;
     protected ContactEntryListFragment<?> mListFragment;
 
-    private boolean mIsVisible;
-
     private int mActionCode = -1;
     private boolean mIsSearchMode;
     private boolean mIsSearchSupported;
@@ -139,25 +137,6 @@
         prepareSearchViewAndActionBar();
     }
 
-    @Override
-    protected void onStart() {
-        super.onStart();
-        mIsVisible = true;
-    }
-
-    @Override
-    protected void onStop() {
-        mIsVisible = false;
-        super.onStop();
-    }
-
-    /**
-     * Returns true when the Activity is currently visible (between onStart and onStop).
-     */
-    /* package */ boolean isVisible() {
-        return mIsVisible;
-    }
-
     private void prepareSearchViewAndActionBar() {
         final ActionBar actionBar = getActionBar();
         mSearchViewContainer = LayoutInflater.from(actionBar.getThemedContext())
@@ -233,7 +212,6 @@
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-        mIsVisible = false;
         super.onSaveInstanceState(outState);
         outState.putInt(KEY_ACTION_CODE, mActionCode);
         outState.putBoolean(KEY_SEARCH_MODE, mIsSearchMode);
@@ -690,7 +668,7 @@
 
     @Override
     public void onBackPressed() {
-        if (!isVisible()) {
+        if (!isSafeToCommitTransactions()) {
             return;
         }
 

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

diff --git a/src/com/android/contacts/activities/PeopleActivity.java b/src/com/android/contacts/activities/PeopleActivity.java
index ec78b4d..49d02a8 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -142,8 +142,6 @@
     private MultiSelectContactsListFragment mAllFragment;
     private ContactTileListFragment mFavoritesFragment;
 
-    private boolean mIsVisible;
-
     /** ViewPager for swipe */
     private ViewPager mTabPager;
     private ViewPagerTabs mViewPagerTabs;
@@ -412,14 +410,6 @@
             configureFragments(!mIsRecreatedInstance);
         }
         super.onStart();
-
-        mIsVisible = true;
-    }
-
-    @Override
-    protected void onStop() {
-        mIsVisible = false;
-        super.onStop();
     }
 
     @Override
@@ -464,13 +454,6 @@
         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;
@@ -1355,7 +1338,7 @@
 
     @Override
     public void onBackPressed() {
-        if (!isVisible()) {
+        if (!isSafeToCommitTransactions()) {
             return;
         }
 
@@ -1371,8 +1354,6 @@
 
     @Override
     protected void onSaveInstanceState(Bundle outState) {
-        mIsVisible = false;
-
         super.onSaveInstanceState(outState);
         mActionBarAdapter.onSaveInstanceState(outState);