Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f349972f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Some text polish" into rvc-dev am: 56c820fb 

Original change: undetermined

Change-Id: Ia8ca1f7e5977299de3515fa057e1cd22bf1dc359
parents 12df24bb 56c820fb

res/layout/notification_sbn_log_row.xml

+6 −12
Original line number Diff line number Diff line
@@ -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"

res/values/styles.xml

+2 −3
Original line number Diff line number Diff line 
<?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>

src/com/android/settings/notification/history/NotificationHistoryViewHolder.java

+1 −1
Original line number Diff line number Diff line
@@ -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) {