3 files changed, 36 insertions, 13 deletions
diff --git a/src/com/android/dialer/list/ListsFragment.java b/src/com/android/dialer/list/ListsFragment.java
index 916c0346b..408d5b1f1 100644
--- a/src/com/android/dialer/list/ListsFragment.java
+++ b/src/com/android/dialer/list/ListsFragment.java
@@ -248,11 +248,6 @@ public class ListsFragment extends Fragment implements CallLogQueryHandler.Liste
     }
 
     @Override
-    public void onStart() {
-        super.onStart();
-    }
-
-    @Override
     public void onResume() {
         super.onResume();
         final SharedPreferences prefs = getActivity().getSharedPreferences(
@@ -261,6 +256,9 @@ public class ListsFragment extends Fragment implements CallLogQueryHandler.Liste
         mActionBar = getActivity().getActionBar();
         fetchCalls();
         mCallLogAdapter.setLoading(true);
+        if (getUserVisibleHint()) {
+            sendScreenViewForPosition(mViewPager.getCurrentItem());
+        }
     }
 
     @Override
@@ -359,17 +357,11 @@ public class ListsFragment extends Fragment implements CallLogQueryHandler.Liste
 
     @Override
     public void onPageSelected(int position) {
-        if (position == TAB_INDEX_SPEED_DIAL && mSpeedDialFragment != null) {
-            AnalyticsUtil.sendScreenView(mSpeedDialFragment);
-        } else if (position == TAB_INDEX_RECENTS && mRecentsFragment != null) {
-            AnalyticsUtil.sendScreenView(mRecentsFragment);
-        } else if (position == TAB_INDEX_ALL_CONTACTS && mAllContactsFragment != null) {
-            AnalyticsUtil.sendScreenView(mAllContactsFragment);
-        }
         final int count = mOnPageChangeListeners.size();
         for (int i = 0; i < count; i++) {
             mOnPageChangeListeners.get(i).onPageSelected(position);
         }
+        sendScreenViewForPosition(position);
     }
 
     @Override
@@ -430,4 +422,29 @@ public class ListsFragment extends Fragment implements CallLogQueryHandler.Liste
         }
         return position;
     }
+
+    public void sendScreenViewForCurrentPosition() {
+        sendScreenViewForPosition(mViewPager.getCurrentItem());
+    }
+
+    private void sendScreenViewForPosition(int position) {
+        if (!isResumed()) {
+            return;
+        }
+        String fragmentName;
+        switch (getRtlPosition(position)) {
+            case TAB_INDEX_SPEED_DIAL:
+                fragmentName = SpeedDialFragment.class.getSimpleName();
+                break;
+            case TAB_INDEX_RECENTS:
+                fragmentName = CallLogFragment.class.getSimpleName();
+                break;
+            case TAB_INDEX_ALL_CONTACTS:
+                fragmentName = AllContactsFragment.class.getSimpleName();
+                break;
+            default:
+                return;
+        }
+        AnalyticsUtil.sendScreenView(fragmentName, getActivity(), null);
+    }
 }
diff --git a/src/com/android/dialer/list/RegularSearchFragment.java b/src/com/android/dialer/list/RegularSearchFragment.java
index 9f4e6bec9..19c7321a1 100644
--- a/src/com/android/dialer/list/RegularSearchFragment.java
+++ b/src/com/android/dialer/list/RegularSearchFragment.java
@@ -20,6 +20,7 @@ import android.view.ViewGroup;
 
 import com.android.contacts.common.list.ContactEntryListAdapter;
 import com.android.contacts.common.list.PinnedHeaderListView;
+import com.android.contacts.commonbind.analytics.AnalyticsUtil;
 import com.android.dialerbind.ObjectFactory;
 import com.android.dialer.service.CachedNumberLookupService;
 
@@ -34,6 +35,12 @@ public class RegularSearchFragment extends SearchFragment {
         configureDirectorySearch();
     }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        AnalyticsUtil.sendScreenView(this);
+    }
+
     public void configureDirectorySearch() {
         setDirectorySearchEnabled(true);
         setDirectoryResultLimit(SEARCH_DIRECTORY_RESULT_LIMIT);
diff --git a/src/com/android/dialer/list/SearchFragment.java b/src/com/android/dialer/list/SearchFragment.java
index c655bbe5f..e50d0d89e 100644
--- a/src/com/android/dialer/list/SearchFragment.java
+++ b/src/com/android/dialer/list/SearchFragment.java
@@ -70,7 +70,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
         setDarkTheme(false);
         setPhotoPosition(ContactListItemView.getDefaultPhotoPosition(false /* opposite */));
         setUseCallableUri(true);
-        AnalyticsUtil.sendScreenView(this);
 
         try {
             mActivityScrollListener = (OnListFragmentScrolledListener) activity;