commit de61df7b6aa3c234fcd540066528ad7da81eaf47
author Wenyi Wang <wenyiw@google.com> Wed Jan 04 18:00:49 2017 -0800
committer Wenyi Wang <wenyiw@google.com> Wed Jan 04 20:02:53 2017 -0800
tree 372c954353b13b79f801b2d93a5cbf9b80aa2c0e
parent ebcac11695abe42e10f34f5b6894c8ff43e91cbd

[DO NOT MERGE] Clean up PeopleActivity in i-dev

- Rename occurrences of allFragment as listFragment
- Misc style changes to make it consistent w/ master-dev

Bug: 34066506

Test: quick sanity test

Change-Id: If2c820831ae5f6be752f1eed4f40517e94f76ff6

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 bc2c592..34ed844 100644
--- a/src/com/android/contacts/activities/PeopleActivity.java
+++ b/src/com/android/contacts/activities/PeopleActivity.java
@@ -69,7 +69,6 @@
 
 import com.android.contacts.AppCompatContactsActivity;
 import com.android.contacts.ContactSaveService;
-import com.android.contacts.ContactsUtils;
 import com.android.contacts.R;
 import com.android.contacts.compat.CompatUtils;
 import com.android.contacts.editor.ContactEditorFragment;
@@ -235,7 +234,7 @@
 
     // Update sync status for accounts in current ContactListFilter
     private void onSyncStateUpdated() {
-        if (isAllFragmentInSearchMode() || isAllFragmentInSelectionMode()) {
+        if (isListFragmentInSearchMode() || isListFragmentInSelectionMode()) {
             return;
         }
 
@@ -317,7 +316,7 @@
         private void stopSearchAndSelection() {
             final MultiSelectContactsListFragment listFragment;
             if (isAllContactsView() || isAccountView()) {
-                listFragment = getAllFragment();
+                listFragment = getListFragment();
             } else if (isGroupView()) {
                 listFragment = getGroupFragment();
             } else {
@@ -603,7 +602,7 @@
 
         final FragmentManager fragmentManager = getFragmentManager();
 
-        setUpAllFragment(fragmentManager);
+        setUpListFragment(fragmentManager);
 
         mMembersFragment = (GroupMembersFragment) fragmentManager.findFragmentByTag(TAG_GROUP_VIEW);
 
@@ -641,7 +640,7 @@
         LayoutInflater.from(this).inflate(layoutResID, parent);
     }
 
-    private void setUpAllFragment(FragmentManager fragmentManager) {
+    private void setUpListFragment(FragmentManager fragmentManager) {
         mContactsListFragment = (DefaultContactBrowseListFragment)
                 fragmentManager.findFragmentByTag(TAG_ALL);
 
@@ -738,8 +737,8 @@
 
     private void initializeHomeVisibility() {
         // Remove the navigation icon if we return to the fragment in a search or select state
-        if (getToolbar() != null && (isAllFragmentInSelectionMode()
-                || isAllFragmentInSearchMode() || isGroupsFragmentInSelectionMode()
+        if (getToolbar() != null && (isListFragmentInSelectionMode()
+                || isListFragmentInSearchMode() || isGroupsFragmentInSelectionMode()
                 || isGroupsFragmentInSearchMode())) {
             getToolbar().setNavigationIcon(null);
         }
@@ -750,7 +749,8 @@
                 || isInSecondLevel()) {
             return true;
         }
-        return isAllFragmentInSearchMode() || isAllFragmentInSelectionMode();
+        return isListFragmentInSearchMode()
+                || isListFragmentInSelectionMode();
     }
 
     public void showFabWithAnimation(boolean showFab) {
@@ -885,13 +885,14 @@
             return;
         }
 
-        // If feature highlight is present, let it handle the back event before mContactsListFragment.
+        // If feature highlight is present, let it handle the back event before
+        // mContactsListFragment.
         if (FeatureHighlightHelper.tryRemoveHighlight(this)) {
             return;
         }
 
         // Handle the back event in "first level" - mContactsListFragment.
-        if (maybeHandleInAllFragment()) {
+        if (maybeHandleInListFragment()) {
             return;
         }
 
@@ -920,13 +921,13 @@
     }
 
     // Returns true if back event is handled in this method.
-    private boolean maybeHandleInAllFragment() {
-        if (isAllFragmentInSelectionMode()) {
+    private boolean maybeHandleInListFragment() {
+        if (isListFragmentInSelectionMode()) {
             mContactsListFragment.getActionBarAdapter().setSelectionMode(false);
             return true;
         }
 
-        if (isAllFragmentInSearchMode()) {
+        if (isListFragmentInSearchMode()) {
             mContactsListFragment.getActionBarAdapter().setSearchMode(false);
             if (mContactsListFragment.wasSearchResultClicked()) {
                 mContactsListFragment.resetSearchResultClicked();
@@ -948,12 +949,12 @@
         return false;
     }
 
-    private boolean isAllFragmentInSelectionMode() {
+    private boolean isListFragmentInSelectionMode() {
         return mContactsListFragment != null && mContactsListFragment.getActionBarAdapter() != null
                 && mContactsListFragment.getActionBarAdapter().isSelectionMode();
     }
 
-    private boolean isAllFragmentInSearchMode() {
+    private boolean isListFragmentInSearchMode() {
         return mContactsListFragment != null && mContactsListFragment.getActionBarAdapter() != null
                 && mContactsListFragment.getActionBarAdapter().isSearchMode();
     }
@@ -1133,7 +1134,7 @@
         updateStatusBarBackground(ContextCompat.getColor(this, R.color.primary_color_dark));
     }
 
-    protected DefaultContactBrowseListFragment getAllFragment() {
+    protected DefaultContactBrowseListFragment getListFragment() {
         return mContactsListFragment;
     }