From 4cbc973e15f98618638e12ea36651d15191e3301 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Thu, 24 Apr 2014 14:38:58 -0700 Subject: Remove floating action bar constants and configurations method. These have been moved to ContactsCommon, and are now invoked in Dialer from ContactsCommon. Bug: 13956531 Change-Id: If8f97d8700b6b9549c43636b4ceb64adf37e6894 --- src/com/android/dialer/DialtactsActivity.java | 31 ++------------------------- 1 file changed, 2 insertions(+), 29 deletions(-) (limited to 'src') diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 5dabb930d..3603696bf 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -65,6 +65,7 @@ import com.android.contacts.common.activity.TransactionSafeActivity; import com.android.contacts.common.dialog.ClearFrequentsDialog; import com.android.contacts.common.interactions.ImportExportDialogFragment; import com.android.contacts.common.list.OnPhoneNumberPickerActionListener; +import com.android.contacts.common.util.ViewUtil; import com.android.dialer.calllog.CallLogActivity; import com.android.dialer.database.DialerDatabaseHelper; import com.android.dialer.dialpad.DialpadFragment; @@ -329,7 +330,7 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O mFragmentsFrame = findViewById(R.id.dialtacts_frame); mFloatingActionButton = findViewById(R.id.floating_action_button); - setupFloatingActionButton(mFloatingActionButton); + ViewUtil.setupFloatingActionButton(mFloatingActionButton, getResources()); mDialButton = findViewById(R.id.dial_button); mDialButton.setOnClickListener(this); @@ -888,34 +889,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O return resolveInfo != null && resolveInfo.size() > 0; } - private void setupFloatingActionButton(View view) { - // Once layout is complete and the floating action button has been assigned a width - // and height, assign the outline. - view.addOnLayoutChangeListener(new OnLayoutChangeListener() { - @Override - public void onLayoutChange(View v, - int left, - int top, - int right, - int bottom, - int oldLeft, - int oldTop, - int oldRight, - int oldBottom) { - final Outline outline = new Outline(); - final int minDimension = Math.min(right - left, bottom - top); - if (minDimension <= 0) { - return; - } - outline.setRoundRect(0, 0, right - left, bottom - top, minDimension / 2); - v.setOutline(outline); - v.setClipToOutline(true); - } - }); - view.setTranslationZ(getResources().getDimensionPixelSize( - R.dimen.floating_action_button_translation_z)); - } - @Override public void showCallHistory() { // Use explicit CallLogActivity intent instead of ACTION_VIEW + -- cgit v1.2.3