1 files changed, 35 insertions, 27 deletions

diff --git a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
index 8c0705fe0..02874a9d8 100644
--- a/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
+++ b/java/com/android/dialer/main/impl/bottomnav/res/layout/bottom_nav_item.xml
@@ -16,41 +16,49 @@
   -->
 <com.android.dialer.main.impl.bottomnav.BottomNavItem
     xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackgroundBorderless"
+    android:minWidth="80dp"
     android:minHeight="56dp"
-    android:minWidth="80dp">
+    android:gravity="center"
+    android:background="?android:attr/selectableItemBackgroundBorderless">
 
-  <ImageView
-      android:id="@+id/bottom_nav_item_image"
-      android:layout_width="24dp"
-      android:layout_height="24dp"
-      android:layout_marginTop="8dp"
-      android:layout_alignParentTop="true"
-      android:layout_centerHorizontal="true"/>
+  <FrameLayout
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/bottom_nav_item_image"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_marginTop="8dp"/>
+
+    <TextView
+        android:id="@+id/notification_badge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="top|end"
+        android:layout_marginTop="2dp"
+        android:paddingStart="6dp"
+        android:paddingEnd="6dp"
+        android:paddingBottom="1dp"
+        android:minHeight="20dp"
+        android:minWidth="20dp"
+        android:gravity="center"
+        android:textSize="12sp"
+        android:textColor="?android:attr/textColorPrimaryInverse"
+        android:background="@drawable/notification_badge"
+        android:fontFamily="sans-serif-medium"
+        android:visibility="invisible"/>
+  </FrameLayout>
 
-  <TextView
-      android:id="@+id/notification_badge"
-      style="@style/Dialer.TextAppearance.OVERLINE"
-      android:layout_width="16dp"
-      android:layout_height="16dp"
-      android:layout_marginTop="2dp"
-      android:layout_marginStart="-8dp"
-      android:layout_alignParentTop="true"
-      android:layout_toEndOf="@id/bottom_nav_item_image"
-      android:background="@drawable/notification_badge"
-      android:gravity="center"
-      android:textColor="?android:attr/colorBackgroundFloating"
-      android:textSize="11dp"
-      android:visibility="invisible"/>
   <TextView
       android:id="@+id/bottom_nav_item_text"
-      style="@style/Dialer.TextAppearance.SubHeader2"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginBottom="8dp"
-      android:layout_below="@id/bottom_nav_item_image"
-      android:layout_centerHorizontal="true"
-      android:gravity="center_horizontal"/>
+      android:gravity="center_horizontal"
+      android:textSize="12sp"
+      style="@style/Dialer.TextAppearance.Secondary"/>
 </com.android.dialer.main.impl.bottomnav.BottomNavItem>
\ No newline at end of file