From d8046e520a866b9948ee9ba47cf642b441ca8e23 Mon Sep 17 00:00:00 2001 From: Eric Erfanian Date: Thu, 6 Apr 2017 09:41:50 -0700 Subject: Update AOSP Dialer source from internal google3 repository at cl/152373142. Test: make, treehugger This CL updates the AOSP Dialer source with all the changes that have gone into the private google3 repository. This includes all the changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017). This goal of these drops is to keep the AOSP source in sync with the internal google3 repository. Currently these sync are done by hand with very minor modifications to the internal source code. See the Android.mk file for list of modifications. Our current goal is to do frequent drops (daily if possible) and eventually switched to an automated process. Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217 --- .../android/dialer/calldetails/CallDetailsActivity.java | 14 +++++++------- .../dialer/calldetails/CallDetailsEntryViewHolder.java | 1 + .../calldetails/res/layout/call_details_activity.xml | 9 ++------- .../dialer/calldetails/res/menu/call_details_menu.xml | 5 +++-- 4 files changed, 13 insertions(+), 16 deletions(-) (limited to 'java/com/android/dialer/calldetails') diff --git a/java/com/android/dialer/calldetails/CallDetailsActivity.java b/java/com/android/dialer/calldetails/CallDetailsActivity.java index bb2f58083..757c6eed2 100644 --- a/java/com/android/dialer/calldetails/CallDetailsActivity.java +++ b/java/com/android/dialer/calldetails/CallDetailsActivity.java @@ -26,8 +26,9 @@ import android.support.annotation.NonNull; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.Toolbar; +import android.support.v7.widget.Toolbar.OnMenuItemClickListener; import android.view.MenuItem; -import android.widget.Toolbar; import com.android.dialer.callcomposer.nano.CallComposerContact; import com.android.dialer.calldetails.nano.CallDetailsEntries; import com.android.dialer.calldetails.nano.CallDetailsEntries.CallDetailsEntry; @@ -38,7 +39,7 @@ import com.android.dialer.logging.nano.DialerImpression; import com.android.dialer.protos.ProtoParsers; /** Displays the details of a specific call log entry. */ -public class CallDetailsActivity extends AppCompatActivity { +public class CallDetailsActivity extends AppCompatActivity implements OnMenuItemClickListener { private static final String EXTRA_CALL_DETAILS_ENTRIES = "call_details_entries"; private static final String EXTRA_CONTACT = "contact"; @@ -61,11 +62,10 @@ public class CallDetailsActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.call_details_activity); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setActionBar(toolbar); toolbar.inflateMenu(R.menu.call_details_menu); - toolbar.setNavigationOnClickListener(v -> finish()); + toolbar.setOnMenuItemClickListener(this); + toolbar.setTitle(R.string.call_details); onHandleIntent(getIntent()); } @@ -89,14 +89,14 @@ public class CallDetailsActivity extends AppCompatActivity { } @Override - public boolean onOptionsItemSelected(MenuItem item) { + public boolean onMenuItemClick(MenuItem item) { if (item.getItemId() == R.id.call_detail_delete_menu_item) { Logger.get(this).logImpression(DialerImpression.Type.USER_DELETED_CALL_LOG_ITEM); AsyncTaskExecutors.createAsyncTaskExecutor().submit(TASK_DELETE, new DeleteCallsTask()); item.setEnabled(false); return true; } - return super.onOptionsItemSelected(item); + return false; } /** Delete specified calls from the call log. */ diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java index 86036a319..a8958d911 100644 --- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java @@ -95,6 +95,7 @@ public class CallDetailsEntryViewHolder extends ViewHolder { (entry.features & Calls.FEATURES_PULLED_EXTERNALLY) == Calls.FEATURES_PULLED_EXTERNALLY; callTime.setTextColor(getColorForCallType(context, callType)); + callTypeIcon.clear(); callTypeIcon.add(callType); callTypeIcon.setShowVideo((entry.features & Calls.FEATURES_VIDEO) == Calls.FEATURES_VIDEO); callTypeIcon.setShowHd(MotorolaUtils.shouldShowHdIconInCallLog(context, entry.features)); diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml b/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml index 79f283705..10927af73 100644 --- a/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml +++ b/java/com/android/dialer/calldetails/res/layout/call_details_activity.xml @@ -20,15 +20,10 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + android:layout_height="wrap_content"/> - + + app:showAsAction="ifRoom"/> \ No newline at end of file -- cgit v1.2.3