From e00c9fe163d19ee380b922e3fcbe736216d78ccc Mon Sep 17 00:00:00 2001 From: Yorke Lee Date: Sat, 12 Apr 2014 12:42:06 -0700 Subject: Use ViewPager in main Dialer view This change replaces PhoneFavoriteFragment with ListsFragment, a fragment that contains a Viewpager that will eventually contain 3 fragments - Speed Dial, Recents (an abridged call log) and All Contacts. For now, only speed dial and all contacts are in the viewpager due to the call log fragment not playing nice with being embedded in a parent fragment. ViewPagerTabs is a newly added custom view that serves as a indicator for ViewPager tabs. It behaves similarly to the newly deprecated ActionBar tabs, but can be placed anywhere on screen. Bug: 13935070 Change-Id: I916c516dc295246b2a95de2f0dc726784c2ee0cc --- src/com/android/dialer/DialtactsActivity.java | 113 ++++++++++++++------------ 1 file changed, 60 insertions(+), 53 deletions(-) (limited to 'src/com/android/dialer/DialtactsActivity.java') diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index c59db95dc..8b9b71ada 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -71,6 +71,7 @@ import com.android.dialer.dialpad.SmartDialPrefix; import com.android.dialer.interactions.PhoneNumberInteraction; import com.android.dialer.list.AllContactsActivity; import com.android.dialer.list.DragDropController; +import com.android.dialer.list.ListsFragment; import com.android.dialer.list.OnDragDropListener; import com.android.dialer.list.OnListFragmentScrolledListener; import com.android.dialer.list.PhoneFavoriteFragment; @@ -94,7 +95,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O DialpadFragment.HostInterface, PhoneFavoriteFragment.OnShowAllContactsListener, PhoneFavoriteFragment.HostInterface, - OnDragDropListener, View.OnLongClickListener { + OnDragDropListener, View.OnLongClickListener, + OnPhoneNumberPickerActionListener { private static final String TAG = "DialtactsActivity"; public static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG); @@ -128,11 +130,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private static final int ANIMATION_DURATION = 250; - /** - * The main fragment displaying the user's favorites and frequent contacts - */ - private PhoneFavoriteFragment mPhoneFavoriteFragment; - /** * Fragment containing the dialpad that slides into view */ @@ -148,6 +145,11 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O */ private SmartDialSearchFragment mSmartDialSearchFragment; + /** + * Fragment containing the speed dial list, recents list, and all contacts list. + */ + private ListsFragment mListsFragment; + private View mFakeActionBar; private View mMenuButton; private View mCallHistoryButton; @@ -188,6 +190,21 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O private DialerDatabaseHelper mDialerDatabaseHelper; + private class OverflowPopupMenu extends PopupMenu { + public OverflowPopupMenu(Context context, View anchor) { + super(context, anchor); + } + + @Override + public void show() { + final Menu menu = getMenu(); + final MenuItem clearFrequents = menu.findItem(R.id.menu_clear_frequents); + // TODO: Check mPhoneFavoriteFragment.hasFrequents() + clearFrequents.setVisible(true); + super.show(); + } + } + /** * Listener used when one of phone numbers in search UI is selected. This will initiate a * phone call using the phone number. @@ -287,7 +304,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O // is null. Otherwise the fragment manager takes care of recreating these fragments. if (savedInstanceState == null) { getFragmentManager().beginTransaction() - .add(R.id.dialtacts_frame, new PhoneFavoriteFragment(), TAG_FAVORITES_FRAGMENT) + .add(R.id.dialtacts_frame, new ListsFragment(), TAG_FAVORITES_FRAGMENT) .add(R.id.dialtacts_container, new DialpadFragment(), TAG_DIALPAD_FRAGMENT) .commit(); } else { @@ -369,12 +386,8 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O if (mFragmentsFrame != null) { mFragmentsFrame.setAlpha(1.0f); } - } else if (fragment instanceof PhoneFavoriteFragment) { - mPhoneFavoriteFragment = (PhoneFavoriteFragment) fragment; - mPhoneFavoriteFragment.setListener(mPhoneFavoriteListener); - if (mFragmentsFrame != null) { - mFragmentsFrame.setAlpha(1.0f); - } + } else if (fragment instanceof ListsFragment) { + mListsFragment = (ListsFragment) fragment; } } @@ -582,7 +595,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O .setInterpolator(hideActionBarInterpolator).setDuration(ANIMATION_DURATION); } - if (mPhoneFavoriteFragment != null && mPhoneFavoriteFragment.isVisible()) { + if (mListsFragment != null && mListsFragment.isVisible()) { // If the favorites fragment is showing, fade to blank. mFragmentsFrame.animate().alpha(0.0f); } @@ -608,12 +621,20 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O .setInterpolator(showActionBarInterpolator).setDuration(ANIMATION_DURATION); } - if (mPhoneFavoriteFragment != null && mPhoneFavoriteFragment.isVisible()) { + if (mListsFragment != null && mListsFragment.isVisible()) { mFragmentsFrame.animate().alpha(1.0f); } getActionBar().show(); } + private void hideInputMethod(View view) { + final InputMethodManager imm = (InputMethodManager) getSystemService( + Context.INPUT_METHOD_SERVICE); + if (imm != null && view != null) { + imm.hideSoftInputFromWindow(view.getWindowToken(), 0); + } + } + @Override public boolean onCreateOptionsMenu(Menu menu) { if (DEBUG) { @@ -711,29 +732,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O return !isDialIntent(getIntent()) ? CALL_ORIGIN_DIALTACTS : null; } - private final PhoneFavoriteFragment.Listener mPhoneFavoriteListener = - new PhoneFavoriteFragment.Listener() { - @Override - public void onContactSelected(Uri contactUri) { - PhoneNumberInteraction.startInteractionForPhoneCall( - DialtactsActivity.this, contactUri, getCallOrigin()); - } - - @Override - public void onCallNumberDirectly(String phoneNumber) { - Intent intent = CallUtil.getCallIntent(phoneNumber, getCallOrigin()); - startActivity(intent); - } - }; - - private void hideInputMethod(View view) { - final InputMethodManager imm = (InputMethodManager) getSystemService( - Context.INPUT_METHOD_SERVICE); - if (imm != null && view != null) { - imm.hideSoftInputFromWindow(view.getWindowToken(), 0); - } - } - /** * Shows the search fragment */ @@ -752,12 +750,10 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O final FragmentTransaction transaction = getFragmentManager().beginTransaction(); SearchFragment fragment; - if (mInDialpadSearch) { + if (mInDialpadSearch && mSmartDialSearchFragment != null) { transaction.remove(mSmartDialSearchFragment); - } else if (mInRegularSearch) { + } else if (mInRegularSearch && mRegularSearchFragment != null) { transaction.remove(mRegularSearchFragment); - } else { - transaction.remove(mPhoneFavoriteFragment); } final String tag; @@ -860,19 +856,10 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O @Override public void onListFragmentScroll(int firstVisibleItem, int visibleItemCount, int totalItemCount) { - - // Hide the action bar when scrolling down in the speed dial list, and show it again when - // scrolling back up. - if (firstVisibleItem > mPreviousFirstVisibleItem) { - getActionBar().hide(); - } else if (firstVisibleItem < mPreviousFirstVisibleItem) { - getActionBar().show(); - } - mPreviousFirstVisibleItem = firstVisibleItem; + // TODO: No-op for now. This should eventually show/hide the actionBar based on + // interactions with the ListsFragments. } - private int mPreviousFirstVisibleItem = 0; - @Override public void setDialButtonEnabled(boolean enabled) { if (mDialButton != null) { @@ -943,4 +930,24 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O public void setDragDropController(DragDropController dragController) { mRemoveViewContainer.setDragDropController(dragController); } + + @Override + public void onPickPhoneNumberAction(Uri dataUri) { + mPhoneNumberPickerActionListener.onPickPhoneNumberAction(dataUri); + } + + @Override + public void onCallNumberDirectly(String phoneNumber) { + mPhoneNumberPickerActionListener.onCallNumberDirectly(phoneNumber); + } + + @Override + public void onShortcutIntentCreated(Intent intent) { + mPhoneNumberPickerActionListener.onShortcutIntentCreated(intent); + } + + @Override + public void onHomeInActionBarSelected() { + mPhoneNumberPickerActionListener.onHomeInActionBarSelected(); + } } -- cgit v1.2.3