Revert "Prepatory CallDetailActivity tweaks."
This reverts commit 11a7350843ec13c7ca4d27523e9ba146911d2767.
Change-Id: Idf62da51c934ee598c1bbc1b5052e6cea2929feb
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 591ba5c..fde1de5 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" />
<TextView
diff --git a/res/layout/call_detail_history_header.xml b/res/layout/call_detail_history_header.xml
new file mode 100644
index 0000000..def1fd8
--- /dev/null
+++ b/res/layout/call_detail_history_header.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2009 The Android Open Source Project
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<TextView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:ex="http://schemas.android.com/apk/res-auto"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:paddingTop="@dimen/call_detail_header_top_margin"
+ android:paddingBottom="@dimen/call_detail_header_bottom_margin"
+ android:paddingStart="@dimen/call_detail_horizontal_margin"
+ android:textColor="?attr/call_log_secondary_text_color"
+ android:textSize="@dimen/call_log_secondary_text_size"
+ android:fontFamily="sans-serif-medium"
+ android:singleLine="true"
+ android:text="@string/call_detail_list_header"
+ />
diff --git a/res/menu/call_details_options.xml b/res/menu/call_details_options.xml
index 414b671..0e9e5c9 100644
--- a/res/menu/call_details_options.xml
+++ b/res/menu/call_details_options.xml
@@ -16,6 +16,16 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/call_details_menu">
+ <item android:id="@+id/menu_trash"
+ android:icon="@drawable/ic_delete_24dp"
+ android:showAsAction="ifRoom"
+ android:title="@string/call_log_trash_voicemail" />
+
+ <item android:id="@+id/menu_remove_from_call_log"
+ android:icon="@drawable/ic_delete_24dp"
+ android:showAsAction="ifRoom"
+ android:title="@string/call_log_remove_from_call_log" />
+
<item android:id="@+id/menu_edit_number_before_call"
android:title="@string/call_log_edit_number_before_call" />
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 394f499..b36066a 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -39,9 +39,9 @@
<!-- Size of contact photos in the call log and call details. -->
<dimen name="contact_photo_size">40dp</dimen>
<dimen name="call_detail_button_spacing">2dip</dimen>
- <dimen name="call_detail_horizontal_margin">20dp</dimen>
- <dimen name="call_detail_top_margin">16dp</dimen>
- <dimen name="call_detail_bottom_margin">16dp</dimen>
+ <dimen name="call_detail_horizontal_margin">16dp</dimen>
+ <dimen name="call_detail_top_margin">36dp</dimen>
+ <dimen name="call_detail_bottom_margin">32dp</dimen>
<dimen name="call_detail_header_top_margin">20dp</dimen>
<dimen name="call_detail_header_bottom_margin">9dp</dimen>
<dimen name="call_detail_translation_z">0.5dp</dimen>
diff --git a/res/values/ids.xml b/res/values/ids.xml
index 14a2e59..0034fe3 100644
--- a/res/values/ids.xml
+++ b/res/values/ids.xml
@@ -15,7 +15,6 @@
-->
<resources>
- <item type="id" name="call_detail_delete_menu_item" />
<item type="id" name="context_menu_copy_to_clipboard" />
<item type="id" name="context_menu_copy_transcript_to_clipboard" />
<item type="id" name="context_menu_edit_before_call" />
diff --git a/res/values/strings.xml b/res/values/strings.xml
index f3b25d2..c8b238f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -70,9 +70,6 @@
<!-- Text for undo button in snackbar for blocking/unblocking number. [CHAR LIMIT=10] -->
<string name="block_number_undo">UNDO</string>
- <!-- Menu item in call details used to remove a call or voicemail from the call log. -->
- <string name="call_details_delete">Delete</string>
-
<!-- Menu item used to copy a number from the call log to the dialer so it can be edited before calling it -->
<string name="call_log_edit_number_before_call">Edit number before call</string>
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java
index 7cb517b..d95b55e 100644
--- a/src/com/android/dialer/CallDetailActivity.java
+++ b/src/com/android/dialer/CallDetailActivity.java
@@ -321,24 +321,23 @@
@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 @@
@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 ac56332..3b488a8 100644
--- a/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
+++ b/src/com/android/dialer/calllog/CallDetailHistoryAdapter.java
@@ -38,6 +38,8 @@
* 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 @@
@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);