diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-15 21:19:47 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-05-15 21:19:48 +0000 |
commit | eead2a1eac894ff47cf10514c79cb717cc7db5b8 (patch) | |
tree | 2d4044e4523deb6351fc1198b8bb2803e5cb663a /src | |
parent | 437858ccdf5257760310d90004030a597e514f3e (diff) | |
parent | 752956e3add8b9fff107e1637120a74a61a5fead (diff) |
Merge "Remove redundant long-click listener."
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 571787577..daeaf2c6f 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -99,7 +99,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O DialpadFragment.HostInterface, ListsFragment.HostInterface, SpeedDialFragment.HostInterface, - OnDragDropListener, View.OnLongClickListener, + OnDragDropListener, OnPhoneNumberPickerActionListener, ViewPager.OnPageChangeListener { private static final String TAG = "DialtactsActivity"; @@ -493,22 +493,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O } @Override - public boolean onLongClick(View view) { - switch (view.getId()) { - case R.id.floating_action_button: - if (mIsDialpadShown) { - // Dial button was pressed; tell the Dialpad fragment - mDialpadFragment.dialButtonPressed(); - return true; // Consume the event - } - default: - Log.wtf(TAG, "Unexpected onClick event from " + view); - break; - } - return false; - } - - @Override protected void onActivityResult(int requestCode, int resultCode, Intent data) { if (requestCode == ACTIVITY_REQUEST_CODE_VOICE_SEARCH) { if (resultCode == RESULT_OK) { @@ -775,8 +759,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O } final FragmentTransaction transaction = getFragmentManager().beginTransaction(); - - SearchFragment fragment; if (mInDialpadSearch && mSmartDialSearchFragment != null) { transaction.remove(mSmartDialSearchFragment); } else if (mInRegularSearch && mRegularSearchFragment != null) { @@ -792,7 +774,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mInDialpadSearch = smartDialSearch; mInRegularSearch = !smartDialSearch; - fragment = (SearchFragment) getFragmentManager().findFragmentByTag(tag); + SearchFragment fragment = (SearchFragment) getFragmentManager().findFragmentByTag(tag); if (fragment == null) { if (smartDialSearch) { fragment = new SmartDialSearchFragment(); |