2 files changed, 6 insertions, 14 deletions
diff --git a/java/com/android/dialer/postcall/PostCallActivity.java b/java/com/android/dialer/postcall/PostCallActivity.java
index 8da03dcd1..28cf5709e 100644
--- a/java/com/android/dialer/postcall/PostCallActivity.java
+++ b/java/com/android/dialer/postcall/PostCallActivity.java
@@ -27,13 +27,13 @@ import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.telephony.SmsManager;
-import android.widget.Toolbar;
 import com.android.dialer.common.Assert;
 import com.android.dialer.common.LogUtil;
 import com.android.dialer.enrichedcall.EnrichedCallCapabilities;
 import com.android.dialer.enrichedcall.EnrichedCallComponent;
 import com.android.dialer.enrichedcall.EnrichedCallManager;
 import com.android.dialer.util.PermissionsUtil;
+import com.android.dialer.widget.DialerToolbar;
 import com.android.dialer.widget.MessageFragment;
 
 /** Activity used to send post call messages after a phone call. */
@@ -56,10 +56,7 @@ public class PostCallActivity extends AppCompatActivity implements MessageFragme
     super.onCreate(bundle);
     setContentView(R.layout.post_call_activity);
 
-    Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-    toolbar.setTitle(getString(R.string.post_call_message));
-    toolbar.setNavigationOnClickListener(v -> finish());
-
+    ((DialerToolbar) findViewById(R.id.toolbar)).setTitle(R.string.post_call_message);
     useRcs = canUseRcs(getIntent().getStringExtra(KEY_PHONE_NUMBER));
     LogUtil.i("PostCallActivity.onCreate", "useRcs: %b", useRcs);
 
diff --git a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
index 6ea8126c5..256c110b9 100644
--- a/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
+++ b/java/com/android/dialer/postcall/res/layout/post_call_activity.xml
@@ -26,13 +26,8 @@
     android:layout_alignParentBottom="true"
     android:background="@color/background_dialer_white"/>
 
-  <Toolbar
-    android:id="@+id/toolbar"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:minHeight="?attr/actionBarSize"
-    android:titleTextAppearance="@style/toolbar_title_text"
-    android:subtitleTextAppearance="@style/toolbar_subtitle_text"
-    android:navigationIcon="@drawable/quantum_ic_close_white_24"
-    android:background="@color/dialer_theme_color"/>
+  <com.android.dialer.widget.DialerToolbar
+      android:id="@+id/toolbar"
+      android:layout_width="match_parent"
+      android:layout_height="wrap_content"/>
 </RelativeLayout>
 \ No newline at end of file