diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-13 23:18:06 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-13 23:18:06 +0000 |
commit | 904eb21b49a54e034e42d16598f6751e42c82f8f (patch) | |
tree | 718835c63a669020ccc5546472111985f4410b4e /java/com/android/dialer/app | |
parent | b21b9f9b2efbc358ee9806af87b7edc3f82af4da (diff) | |
parent | 7bea0364b6f8932f54cdb518de1014f408f0f3f3 (diff) |
Merge changes Ie58920b7,Iaaf84ab9
* changes:
Fixed crash in RemoteContactCusror.
Log swiping and clicking for switching tabs.
Diffstat (limited to 'java/com/android/dialer/app')
-rw-r--r-- | java/com/android/dialer/app/list/ListsFragment.java | 46 |
1 files changed, 46 insertions, 0 deletions
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java index dc1bd94ae..8dbe18cee 100644 --- a/java/com/android/dialer/app/list/ListsFragment.java +++ b/java/com/android/dialer/app/list/ListsFragment.java @@ -16,6 +16,8 @@ package com.android.dialer.app.list; +import static android.support.v4.view.ViewPager.SCROLL_STATE_SETTLING; + import android.app.Fragment; import android.content.SharedPreferences; import android.database.ContentObserver; @@ -77,6 +79,13 @@ public class ListsFragment extends Fragment implements OnPageChangeListener, Lis private CallLogQueryHandler mCallLogQueryHandler; private UiAction.Type[] actionTypeList; + private final DialerImpression.Type[] swipeImpressionList = + new DialerImpression.Type[DialtactsPagerAdapter.TAB_COUNT_WITH_VOICEMAIL]; + private final DialerImpression.Type[] clickImpressionList = + new DialerImpression.Type[DialtactsPagerAdapter.TAB_COUNT_WITH_VOICEMAIL]; + + // Only for detecting page selected by swiping or clicking. + private boolean onPageScrolledBeforeScrollStateSettling; private final ContentObserver mVoicemailStatusObserver = new ContentObserver(new Handler()) { @@ -156,6 +165,24 @@ public class ListsFragment extends Fragment implements OnPageChangeListener, Lis actionTypeList[DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL] = UiAction.Type.CHANGE_TAB_TO_VOICEMAIL; + swipeImpressionList[DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL] = + DialerImpression.Type.SWITCH_TAB_TO_FAVORITE_BY_SWIPE; + swipeImpressionList[DialtactsPagerAdapter.TAB_INDEX_HISTORY] = + DialerImpression.Type.SWITCH_TAB_TO_CALL_LOG_BY_SWIPE; + swipeImpressionList[DialtactsPagerAdapter.TAB_INDEX_ALL_CONTACTS] = + DialerImpression.Type.SWITCH_TAB_TO_CONTACTS_BY_SWIPE; + swipeImpressionList[DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL] = + DialerImpression.Type.SWITCH_TAB_TO_VOICEMAIL_BY_SWIPE; + + clickImpressionList[DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL] = + DialerImpression.Type.SWITCH_TAB_TO_FAVORITE_BY_CLICK; + clickImpressionList[DialtactsPagerAdapter.TAB_INDEX_HISTORY] = + DialerImpression.Type.SWITCH_TAB_TO_CALL_LOG_BY_CLICK; + clickImpressionList[DialtactsPagerAdapter.TAB_INDEX_ALL_CONTACTS] = + DialerImpression.Type.SWITCH_TAB_TO_CONTACTS_BY_CLICK; + clickImpressionList[DialtactsPagerAdapter.TAB_INDEX_VOICEMAIL] = + DialerImpression.Type.SWITCH_TAB_TO_VOICEMAIL_BY_CLICK; + String[] tabTitles = new String[DialtactsPagerAdapter.TAB_COUNT_WITH_VOICEMAIL]; tabTitles[DialtactsPagerAdapter.TAB_INDEX_SPEED_DIAL] = getResources().getString(R.string.tab_speed_dial); @@ -240,6 +267,11 @@ public class ListsFragment extends Fragment implements OnPageChangeListener, Lis @Override public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) { + // onPageScrolled(0, 0, 0) is called when app launch. And we should ignore it. + // It's also called when swipe right from first tab, but we don't care. + if (positionOffsetPixels != 0) { + onPageScrolledBeforeScrollStateSettling = true; + } mTabIndex = mAdapter.getRtlPosition(position); final int count = mOnPageChangeListeners.size(); @@ -250,6 +282,16 @@ public class ListsFragment extends Fragment implements OnPageChangeListener, Lis @Override public void onPageSelected(int position) { + // onPageScrollStateChanged(SCROLL_STATE_SETTLING) must be called before this. + // If onPageScrolled() is called before that, the page is selected by swiping; + // otherwise the page is selected by clicking. + if (onPageScrolledBeforeScrollStateSettling) { + Logger.get(getContext()).logImpression(swipeImpressionList[position]); + onPageScrolledBeforeScrollStateSettling = false; + } else { + Logger.get(getContext()).logImpression(clickImpressionList[position]); + } + PerformanceReport.recordClick(actionTypeList[position]); LogUtil.i("ListsFragment.onPageSelected", "position: %d", position); @@ -275,6 +317,10 @@ public class ListsFragment extends Fragment implements OnPageChangeListener, Lis @Override public void onPageScrollStateChanged(int state) { + if (state != SCROLL_STATE_SETTLING) { + onPageScrolledBeforeScrollStateSettling = false; + } + final int count = mOnPageChangeListeners.size(); for (int i = 0; i < count; i++) { mOnPageChangeListeners.get(i).onPageScrollStateChanged(state); |