3 files changed, 5 insertions, 16 deletions
diff --git a/java/com/android/dialer/app/list/AllContactsFragment.java b/java/com/android/dialer/app/list/AllContactsFragment.java
index 093e8f384..29c0ec47f 100644
--- a/java/com/android/dialer/app/list/AllContactsFragment.java
+++ b/java/com/android/dialer/app/list/AllContactsFragment.java
@@ -38,7 +38,6 @@ import com.android.contacts.common.list.ContactEntryListAdapter;
 import com.android.contacts.common.list.ContactEntryListFragment;
 import com.android.contacts.common.list.ContactListFilter;
 import com.android.contacts.common.list.DefaultContactListAdapter;
-import com.android.contacts.common.util.FabUtil;
 import com.android.dialer.app.R;
 import com.android.dialer.app.list.ListsFragment.ListsPage;
 import com.android.dialer.app.widget.EmptyContentView;
@@ -90,8 +89,6 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi
     mEmptyListView.setActionClickedListener(this);
     getListView().setEmptyView(mEmptyListView);
     mEmptyListView.setVisibility(View.GONE);
-
-    FabUtil.addBottomPaddingToListViewForFab(getListView(), getResources());
   }
 
   @Override
diff --git a/java/com/android/dialer/app/list/ListsFragment.java b/java/com/android/dialer/app/list/ListsFragment.java
index e4206d41d..3b94e1562 100644
--- a/java/com/android/dialer/app/list/ListsFragment.java
+++ b/java/com/android/dialer/app/list/ListsFragment.java
@@ -48,7 +48,6 @@ import com.android.dialer.logging.nano.ScreenEvent;
 import com.android.dialer.util.ViewUtil;
 import com.android.dialer.voicemailstatus.VisualVoicemailEnabledChecker;
 import com.android.dialer.voicemailstatus.VoicemailStatusHelper;
-import com.android.dialer.voicemailstatus.VoicemailStatusHelperImpl;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -127,7 +126,7 @@ public class ListsFragment extends Fragment
     Trace.beginSection(TAG + " onCreate");
     super.onCreate(savedInstanceState);
 
-    mVoicemailStatusHelper = new VoicemailStatusHelperImpl();
+    mVoicemailStatusHelper = new VoicemailStatusHelper();
     mHasFetchedVoicemailStatus = false;
 
     mPrefs = PreferenceManager.getDefaultSharedPreferences(getActivity());
diff --git a/java/com/android/dialer/app/list/SearchFragment.java b/java/com/android/dialer/app/list/SearchFragment.java
index e6615aa8d..4128300df 100644
--- a/java/com/android/dialer/app/list/SearchFragment.java
+++ b/java/com/android/dialer/app/list/SearchFragment.java
@@ -23,7 +23,6 @@ import android.app.DialogFragment;
 import android.content.Intent;
 import android.content.res.Configuration;
 import android.content.res.Resources;
-import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -38,7 +37,6 @@ import com.android.contacts.common.list.ContactEntryListAdapter;
 import com.android.contacts.common.list.ContactListItemView;
 import com.android.contacts.common.list.OnPhoneNumberPickerActionListener;
 import com.android.contacts.common.list.PhoneNumberPickerFragment;
-import com.android.contacts.common.util.FabUtil;
 import com.android.dialer.animation.AnimUtils;
 import com.android.dialer.app.R;
 import com.android.dialer.app.dialpad.DialpadFragment.ErrorDialogFragment;
@@ -155,12 +153,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
   }
 
   @Override
-  public void onViewCreated(View view, Bundle savedInstanceState) {
-    super.onViewCreated(view, savedInstanceState);
-    FabUtil.addBottomPaddingToListViewForFab(getListView(), getResources());
-  }
-
-  @Override
   public Animator onCreateAnimator(int transit, boolean enter, int nextAnim) {
     Animator animator = null;
     if (nextAnim != 0) {
@@ -242,9 +234,6 @@ public class SearchFragment extends PhoneNumberPickerFragment {
     LogUtil.i("SearchFragment.onItemClick", "shortcutType: " + shortcutType);
 
     switch (shortcutType) {
-      case DialerPhoneNumberListAdapter.SHORTCUT_INVALID:
-        super.onItemClick(position, id);
-        break;
       case DialerPhoneNumberListAdapter.SHORTCUT_DIRECT_CALL:
         number = adapter.getQueryString();
         listener = getOnPhoneNumberPickerListener();
@@ -294,6 +283,10 @@ public class SearchFragment extends PhoneNumberPickerFragment {
           listener.onPickPhoneNumber(number, true /* isVideoCall */, callSpecificAppData);
         }
         break;
+      case DialerPhoneNumberListAdapter.SHORTCUT_INVALID:
+      default:
+        super.onItemClick(position, id);
+        break;
     }
   }