From 73bc910eee877d8f3f7f547e4fce809465f02805 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Fri, 2 Oct 2015 23:50:23 +0000 Subject: Revert "Prepatory CallDetailActivity tweaks." This reverts commit 11a7350843ec13c7ca4d27523e9ba146911d2767. Change-Id: Idf62da51c934ee598c1bbc1b5052e6cea2929feb --- res/layout/call_detail.xml | 3 +- res/layout/call_detail_history_header.xml | 30 ++++++++++++++++ res/menu/call_details_options.xml | 10 ++++++ res/values/dimens.xml | 6 ++-- res/values/ids.xml | 1 - res/values/strings.xml | 3 -- src/com/android/dialer/CallDetailActivity.java | 42 +++++++++++----------- .../dialer/calllog/CallDetailHistoryAdapter.java | 28 ++++++++++++--- 8 files changed, 87 insertions(+), 36 deletions(-) create mode 100644 res/layout/call_detail_history_header.xml diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml index 591ba5c45..fde1de5c1 100644 --- a/res/layout/call_detail.xml +++ b/res/layout/call_detail.xml @@ -60,8 +60,7 @@ android:textColor="?attr/call_log_primary_text_color" android:textSize="@dimen/call_log_primary_text_size" android:includeFontPadding="false" - android:layout_marginTop="2dp" - android:layout_marginBottom="3dp" + android:layout_marginBottom="5dp" android:singleLine="true" /> + + + diff --git a/res/menu/call_details_options.xml b/res/menu/call_details_options.xml index 414b6711a..0e9e5c9d0 100644 --- a/res/menu/call_details_options.xml +++ b/res/menu/call_details_options.xml @@ -16,6 +16,16 @@ + + + + diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 394f49946..b36066a94 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -39,9 +39,9 @@ 40dp 2dip - 20dp - 16dp - 16dp + 16dp + 36dp + 32dp 20dp 9dp 0.5dp diff --git a/res/values/ids.xml b/res/values/ids.xml index 14a2e5980..0034fe3d4 100644 --- a/res/values/ids.xml +++ b/res/values/ids.xml @@ -15,7 +15,6 @@ --> - diff --git a/res/values/strings.xml b/res/values/strings.xml index f3b25d2ed..c8b238f03 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -70,9 +70,6 @@ UNDO - - Delete - Edit number before call diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index 7cb517bbd..d95b55ecb 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -321,24 +321,23 @@ public class CallDetailActivity extends AppCompatActivity @Override public boolean onCreateOptionsMenu(Menu menu) { - final MenuItem deleteMenuItem = menu.add( - Menu.NONE, - R.id.call_detail_delete_menu_item, - Menu.NONE, - R.string.call_details_delete); - deleteMenuItem.setIcon(R.drawable.ic_delete_24dp); - deleteMenuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM); - deleteMenuItem.setOnMenuItemClickListener(this); - getMenuInflater().inflate(R.menu.call_details_options, menu); return super.onCreateOptionsMenu(menu); } @Override public boolean onPrepareOptionsMenu(Menu menu) { + // This action deletes all elements in the group from the call log. + // We don't have this action for voicemails, because you can just use the trash button. + menu.findItem(R.id.menu_remove_from_call_log) + .setVisible(!hasVoicemail()) + .setOnMenuItemClickListener(this); menu.findItem(R.id.menu_edit_number_before_call) .setVisible(mHasEditNumberBeforeCallOption) .setOnMenuItemClickListener(this); + menu.findItem(R.id.menu_trash) + .setVisible(hasVoicemail()) + .setOnMenuItemClickListener(this); menu.findItem(R.id.menu_report) .setVisible(mHasReportMenuOption) .setOnMenuItemClickListener(this); @@ -348,25 +347,24 @@ public class CallDetailActivity extends AppCompatActivity @Override public boolean onMenuItemClick(MenuItem item) { switch (item.getItemId()) { - case R.id.call_detail_delete_menu_item: - if (hasVoicemail()) { - CallLogAsyncTaskUtil.deleteVoicemail( - this, mVoicemailUri, mCallLogAsyncTaskListener); - } else { - final StringBuilder callIds = new StringBuilder(); - for (Uri callUri : getCallLogEntryUris()) { - if (callIds.length() != 0) { - callIds.append(","); - } - callIds.append(ContentUris.parseId(callUri)); + case R.id.menu_remove_from_call_log: + final StringBuilder callIds = new StringBuilder(); + for (Uri callUri : getCallLogEntryUris()) { + if (callIds.length() != 0) { + callIds.append(","); } - CallLogAsyncTaskUtil.deleteCalls( - this, callIds.toString(), mCallLogAsyncTaskListener); + callIds.append(ContentUris.parseId(callUri)); } + CallLogAsyncTaskUtil.deleteCalls( + this, callIds.toString(), mCallLogAsyncTaskListener); break; case R.id.menu_edit_number_before_call: startActivity(new Intent(Intent.ACTION_DIAL, CallUtil.getCallUri(mNumber))); break; + case R.id.menu_trash: + CallLogAsyncTaskUtil.deleteVoicemail( + this, mVoicemailUri, mCallLogAsyncTaskListener); + break; } return true; } diff --git a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java index ac56332ce..3b488a8ae 100644 --- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java +++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java @@ -38,6 +38,8 @@ import java.util.ArrayList; * Adapter for a ListView containing history items from the details of a call. */ public class CallDetailHistoryAdapter extends BaseAdapter { + /** The top element is a blank header, which is hidden under the rest of the UI. */ + private static final int VIEW_TYPE_HEADER = 0; /** Each history item shows the detail of a call. */ private static final int VIEW_TYPE_HISTORY_ITEM = 1; @@ -67,37 +69,53 @@ public class CallDetailHistoryAdapter extends BaseAdapter { @Override public int getCount() { - return mPhoneCallDetails.length; + return mPhoneCallDetails.length + 1; } @Override public Object getItem(int position) { - return mPhoneCallDetails[position]; + if (position == 0) { + return null; + } + return mPhoneCallDetails[position - 1]; } @Override public long getItemId(int position) { - return position; + if (position == 0) { + return -1; + } + return position - 1; } @Override public int getViewTypeCount() { - return 1; + return 2; } @Override public int getItemViewType(int position) { + if (position == 0) { + return VIEW_TYPE_HEADER; + } return VIEW_TYPE_HISTORY_ITEM; } @Override public View getView(int position, View convertView, ViewGroup parent) { + if (position == 0) { + final View header = convertView == null + ? mLayoutInflater.inflate(R.layout.call_detail_history_header, parent, false) + : convertView; + return header; + } + // Make sure we have a valid convertView to start with final View result = convertView == null ? mLayoutInflater.inflate(R.layout.call_detail_history_item, parent, false) : convertView; - PhoneCallDetails details = mPhoneCallDetails[position]; + PhoneCallDetails details = mPhoneCallDetails[position - 1]; CallTypeIconsView callTypeIconView = (CallTypeIconsView) result.findViewById(R.id.call_type_icon); TextView callTypeTextView = (TextView) result.findViewById(R.id.call_type_text); -- cgit v1.2.3