From e32e6cc981f0e6cf147972f6611b7101e100722d Mon Sep 17 00:00:00 2001
From: Julia Reynolds <juliacr@google.com>
Date: Mon, 1 Jun 2020 14:57:30 -0400
Subject: [PATCH] Some text polish

- Update styles and alignment

Test: manual
Fixes: 157769522
Change-Id: I92113b5e7a918e1ec31acb64aa10457f4c762760
---
 res/layout/notification_sbn_log_row.xml        | 18 ++++++------------
 res/values/styles.xml                          |  5 ++---
 .../history/NotificationHistoryViewHolder.java |  2 +-
 3 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/res/layout/notification_sbn_log_row.xml b/res/layout/notification_sbn_log_row.xml
index 7a3e6d7d817..6156d261ebb 100644
--- a/res/layout/notification_sbn_log_row.xml
+++ b/res/layout/notification_sbn_log_row.xml
@@ -32,7 +32,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="@*android:dimen/status_bar_icon_size"
-            android:paddingBottom="6dp">
+            android:gravity="center_vertical"
+            android:layout_marginBottom="6dp">
 
             <ImageView
                 android:id="@+id/icon"
@@ -62,11 +63,10 @@
 
             <ImageView
                 android:id="@+id/alerted_icon"
-                android:layout_width="@*android:dimen/status_bar_icon_size"
-                android:layout_height="@*android:dimen/status_bar_icon_size"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_marginStart="6dp"
-                android:paddingTop="1dp"
                 android:scaleType="fitCenter"
                 android:visibility="gone"
                 android:tint="?android:attr/textColorSecondary"
@@ -75,11 +75,9 @@
 
             <ImageView
                 android:id="@+id/profile_badge"
-                android:layout_width="@*android:dimen/status_bar_icon_size"
-                android:layout_height="@*android:dimen/status_bar_icon_size"
-                android:layout_centerVertical="true"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="6dp"
-                android:paddingTop="1dp"
                 android:scaleType="fitCenter"
                 android:contentDescription="@*android:string/notification_work_profile_content_description"
                 android:layout_toStartOf="@id/timestamp"
@@ -89,11 +87,7 @@
                 android:id="@+id/timestamp"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:minHeight="@*android:dimen/status_bar_icon_size"
-                android:layout_alignBottom="@android:id/widget_frame"
                 android:layout_alignParentEnd="true"
-                android:layout_alignTop="@android:id/widget_frame"
-                android:layout_centerVertical="true"
                 android:ellipsize="end"
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.NotificationHistory.AppName"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2fd0afbfa62..a60fbd5eadf 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
 <!-- Copyright (C) 2006 The Android Open Source Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
@@ -344,11 +343,11 @@
     </style>
 
     <style name="TextAppearance.NotificationHistory.Title">
-        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>
     </style>
 
     <style name="TextAppearance.NotificationHistory.Text">
-        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>
+        <item name="android:fontFamily">@*android:string/config_bodyFontFamily</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
diff --git a/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java b/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
index ef4f0da3bd9..4991548e2c7 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryViewHolder.java
@@ -45,7 +45,7 @@ public class NotificationHistoryViewHolder extends RecyclerView.ViewHolder {
 
     void setTitle(CharSequence title) {
         mTitle.setText(title);
-        mTitle.setVisibility(title != null ? View.VISIBLE : View.GONE);
+        mTitle.setVisibility(title != null ? View.VISIBLE : View.INVISIBLE);
     }
 
     void setPostedTime(long postedTime) {