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

Commit 7775f52e authored by Daniel Sandler's avatar Daniel Sandler Committed by Android (Google) Code Review
Browse files

Merge "Bring timestamps back to notifications." into ics-mr1

parents a67217c3 e3723303

core/res/res/layout/status_bar_latest_event_content_large_icon.xml

+25 −7
Original line number Diff line number Diff line
@@ -7,6 +7,12 @@ 
    android:paddingLeft="12dp"

    android:paddingRight="12dp"

    >

    <LinearLayout

        android:id="@+id/line1"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        >

        <TextView android:id="@+id/title"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"

            android:layout_width="match_parent"
@@ -14,9 +20,21 @@ 
            android:singleLine="true"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:layout_weight="1"

            />

        <DateTimeView android:id="@+id/time"

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Time"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center"

            android:layout_weight="0"

            android:singleLine="true"

            android:gravity="center"

            android:paddingLeft="8dp"

            />

    </LinearLayout>

    <TextView android:id="@+id/text2"

        android:textAppearance="@style/TextAppearance.StatusBar.EventContent"

        android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Line2"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="-2dp"

core/res/res/values/styles.xml

+10 −3
Original line number Diff line number Diff line
@@ -216,8 +216,8 @@ please see styles_device_defaults.xml. 
        <item name="windowEnterAnimation">@null</item>

        <item name="windowExitAnimation">@anim/fade_out</item>

    </style>

    <!-- Status Bar Styles -->



    <!-- Status Bar Styles -->

    <style name="TextAppearance.StatusBar">

        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>

    </style>
@@ -229,18 +229,25 @@ please see styles_device_defaults.xml. 


    <style name="TextAppearance.StatusBar.Icon">

    </style>

    <!-- Notification content styles -->

    <style name="TextAppearance.StatusBar.EventContent">

        <item name="android:textColor">?android:attr/textColorSecondary</item>

        <item name="android:textSize">13sp</item>

        <item name="android:textSize">12sp</item>

    </style>

    <style name="TextAppearance.StatusBar.EventContent.Title">

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:textSize">16sp</item>

        <item name="android:textStyle">bold</item>

    </style>

    <style name="TextAppearance.StatusBar.EventContent.Info">

    <style name="TextAppearance.StatusBar.EventContent.Line2">

        <item name="android:textSize">13sp</item>

    </style>

    <style name="TextAppearance.StatusBar.EventContent.Info">

        <!-- inherit all -->

    </style>

    <style name="TextAppearance.StatusBar.EventContent.Time">

        <!-- inherit all -->

    </style>



    <style name="TextAppearance.Small.CalendarViewWeekDayView">

        <item name="android:textStyle">bold</item>