diff options
Diffstat (limited to 'src/com/android/contacts')
5 files changed, 9 insertions, 30 deletions
diff --git a/src/com/android/contacts/editor/CompactContactEditorFragment.java b/src/com/android/contacts/editor/CompactContactEditorFragment.java index 121fc88b2..e31e0639b 100644 --- a/src/com/android/contacts/editor/CompactContactEditorFragment.java +++ b/src/com/android/contacts/editor/CompactContactEditorFragment.java @@ -116,10 +116,6 @@ public class CompactContactEditorFragment extends ContactEditorBaseFragment impl mPhotoMode = photoMode; } - public void setPhotoMode(int photoMode) { - mPhotoMode = photoMode; - } - @Override public void onClick(View view) { PhotoSourceDialogFragment.show(CompactContactEditorFragment.this, mPhotoMode); diff --git a/src/com/android/contacts/editor/CompactPhotoEditorView.java b/src/com/android/contacts/editor/CompactPhotoEditorView.java index ef0565135..3481a332f 100644 --- a/src/com/android/contacts/editor/CompactPhotoEditorView.java +++ b/src/com/android/contacts/editor/CompactPhotoEditorView.java @@ -72,14 +72,16 @@ public class CompactPhotoEditorView extends LinearLayout implements View.OnClick public CompactPhotoEditorView(Context context, AttributeSet attrs) { super(context, attrs); - - final TypedValue landscapePhotoRatio = new TypedValue(); - getResources().getValue(R.dimen.quickcontact_landscape_photo_ratio, landscapePhotoRatio, - /* resolveRefs =*/ true); - mLandscapePhotoRatio = landscapePhotoRatio.getFloat(); + mLandscapePhotoRatio = getTypedFloat(R.dimen.quickcontact_landscape_photo_ratio); mIsTwoPanel = getResources().getBoolean(R.bool.quickcontact_two_panel); } + private float getTypedFloat(int resourceId) { + final TypedValue typedValue = new TypedValue(); + getResources().getValue(resourceId, typedValue, /* resolveRefs =*/ true); + return typedValue.getFloat(); + } + @Override protected void onFinishInflate() { super.onFinishInflate(); @@ -137,7 +139,6 @@ public class CompactPhotoEditorView extends LinearLayout implements View.OnClick SchedulingUtils.doOnPreDraw(this, /* drawNextFrame =*/ false, new Runnable() { @Override public void run() { - final int photoHeight, photoWidth; if (mIsTwoPanel) { // Make the photo slightly more narrow than it is tall @@ -145,8 +146,8 @@ public class CompactPhotoEditorView extends LinearLayout implements View.OnClick photoWidth = (int) (photoHeight * mLandscapePhotoRatio); } else { // Make the photo a square - photoHeight = getWidth(); - photoWidth = photoHeight; + photoWidth = getWidth(); + photoHeight = photoWidth; } final ViewGroup.LayoutParams layoutParams = getLayoutParams(); layoutParams.height = photoHeight; diff --git a/src/com/android/contacts/editor/ContactEditorBaseFragment.java b/src/com/android/contacts/editor/ContactEditorBaseFragment.java index 075aca30d..618772fbf 100644 --- a/src/com/android/contacts/editor/ContactEditorBaseFragment.java +++ b/src/com/android/contacts/editor/ContactEditorBaseFragment.java @@ -728,8 +728,6 @@ abstract public class ContactEditorBaseFragment extends Fragment implements final MenuItem sendToVoiceMailMenu = menu.findItem(R.id.menu_send_to_voicemail); final MenuItem ringToneMenu = menu.findItem(R.id.menu_set_ringtone); final MenuItem deleteMenu = menu.findItem(R.id.menu_delete); - deleteMenu.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); - deleteMenu.setIcon(R.drawable.ic_delete_white_24dp); // Set visibility of menus doneMenu.setVisible(false); diff --git a/src/com/android/contacts/editor/PhoneticNameEditorView.java b/src/com/android/contacts/editor/PhoneticNameEditorView.java index e64568721..420575cbd 100644 --- a/src/com/android/contacts/editor/PhoneticNameEditorView.java +++ b/src/com/android/contacts/editor/PhoneticNameEditorView.java @@ -151,12 +151,4 @@ public class PhoneticNameEditorView extends TextFieldsEditorView { return !TextUtils.isEmpty(family) || !TextUtils.isEmpty(middle) || !TextUtils.isEmpty(given); } - - /** {@inheritDoc} */ - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - // Remove padding below this view. - setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), 0); - } } diff --git a/src/com/android/contacts/editor/StructuredNameEditorView.java b/src/com/android/contacts/editor/StructuredNameEditorView.java index 82d6324f1..0f98f53a4 100644 --- a/src/com/android/contacts/editor/StructuredNameEditorView.java +++ b/src/com/android/contacts/editor/StructuredNameEditorView.java @@ -287,12 +287,4 @@ public class StructuredNameEditorView extends TextFieldsEditorView { return 0; } } - - /** {@inheritDoc} */ - @Override - protected void onFinishInflate() { - super.onFinishInflate(); - // Remove padding below this view. - setPadding(getPaddingLeft(), getPaddingTop(), getPaddingRight(), 0); - } } |