diff options
Diffstat (limited to 'java/com/android/dialer/calldetails')
4 files changed, 13 insertions, 16 deletions
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"> - <Toolbar + <com.android.dialer.widget.DialerToolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" - android:background="@color/dialer_theme_color" - android:elevation="4dp" - android:titleTextAppearance="@style/toolbar_title_text" - android:title="@string/call_details" - android:navigationIcon="@drawable/quantum_ic_arrow_back_white_24"/> + android:layout_height="wrap_content"/> <android.support.v7.widget.RecyclerView android:id="@+id/recycler_view" diff --git a/java/com/android/dialer/calldetails/res/menu/call_details_menu.xml b/java/com/android/dialer/calldetails/res/menu/call_details_menu.xml index c2d1032da..df0c34827 100644 --- a/java/com/android/dialer/calldetails/res/menu/call_details_menu.xml +++ b/java/com/android/dialer/calldetails/res/menu/call_details_menu.xml @@ -14,10 +14,11 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License --> -<menu xmlns:android="http://schemas.android.com/apk/res/android"> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> <item android:id="@+id/call_detail_delete_menu_item" android:icon="@drawable/quantum_ic_delete_white_24" android:title="@string/delete" - android:showAsAction="ifRoom"/> + app:showAsAction="ifRoom"/> </menu>
\ No newline at end of file |