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

Commit 11d43082 authored by Daniel Sandler's avatar Daniel Sandler Committed by Android Git Automerger
Browse files

am c88b19fc: am 34430260: Merge "Fit and finish on status bar:" into honeycomb 

* commit 'c88b19fc':
  Fit and finish on status bar:
parents 3ae881ff c88b19fc

core/res/res/drawable-hdpi/notify_panel_notification_icon_bg.png

0 → 100644
+1 KiB
Loading image diff...

core/res/res/drawable-mdpi/notify_panel_notification_icon_bg.png

0 → 100644
+1.1 KiB
Loading image diff...

core/res/res/layout-xlarge/status_bar_latest_event_content.xml

+5 −4
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
    android:layout_height="match_parent"

    >

    <ImageView android:id="@+id/icon"

        android:layout_width="48dp"

        android:layout_height="64dp"

        android:layout_marginLeft="4dp"

        android:layout_width="@dimen/notification_large_icon_width"

        android:layout_height="@dimen/notification_large_icon_height"

        android:background="@drawable/notify_panel_notification_icon_bg"

        android:scaleType="center"

        />

    <LinearLayout
@@ -14,7 +14,7 @@ 
        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingLeft="8dp"

        android:paddingLeft="16dp"

        >

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

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
@@ -23,6 +23,7 @@ 
            android:singleLine="true"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:layout_marginBottom="-4dp"

            />

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

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

core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml

+22 −13
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingLeft="16dp"

        >

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

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent.Title"
@@ -16,6 +17,7 @@ 
            android:singleLine="true"

            android:ellipsize="marquee"

            android:fadingEdge="horizontal"

            android:layout_marginBottom="-4dp"

            />

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

            android:textAppearance="@style/TextAppearance.StatusBar.EventContent"
@@ -28,20 +30,27 @@ 
            android:fadingEdge="horizontal"

            />

    </LinearLayout>

    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        >

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

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

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:singleLine="true"

            android:gravity="center_vertical"

            android:layout_alignParentLeft="true"

            android:paddingLeft="8dp"

            />

        <ImageView android:id="@+id/icon"

        android:layout_width="48dp"

        android:layout_height="32dp"

        android:layout_gravity="top"

        android:layout_marginTop="8dp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentBottom="true"

            android:layout_alignRight="@id/info"

            android:layout_marginBottom="8dip"

            android:scaleType="center"

            />

    </RelativeLayout>

</LinearLayout>

core/res/res/values/dimens.xml

+2 −2
Original line number Diff line number Diff line
@@ -70,9 +70,9 @@ 
    <item type="dimen" name="dialog_min_width_minor">95%</item>



    <!-- The width of the big icons in notifications. -->

    <dimen name="notification_large_icon_width">60dp</dimen>

    <dimen name="notification_large_icon_width">64dp</dimen>

    <!-- The width of the big icons in notifications. -->

    <dimen name="notification_large_icon_height">60dp</dimen>

    <dimen name="notification_large_icon_height">64dp</dimen>



    <!-- Minimum width of the search view text entry area. -->

    <dimen name="search_view_text_min_width">160dip</dimen>