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

Commit ebce0115 authored by Daniel Sandler's avatar Daniel Sandler
Browse files

ICS updates to notification layouts. 

Of note:

1. There is no "X" (veto) button anymore. (Well, there is,
   but it's offscreen so it should still be available to
   assistive devices.) Users can use "Clear all" or the new
   swipe-to-veto gesture to clear notifications.

2. As a consequence of #1, your layout goes all the way to
   the right edge of the notifications panel again. Enjoy
   the extra space!

3. The numeric bubble in the notification icon is now capped
   at "999+" like it is in the expanded notification view.
   (Note that this involves a couple of new public framework
   resources: one to indicate the number beyond which the
   substitution string will be used, and one specifying a
   localizable substitution string.)

Bug: 4651514
Bug: 4686329
Bug: 4501990
Change-Id: I0e6bdb6aec4fe5bfc927eb1aba955d444a9414ec
parent f2288c96

api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -1374,6 +1374,7 @@ package android { 
    field public static final int config_longAnimTime = 17694722; // 0x10e0002

    field public static final int config_mediumAnimTime = 17694721; // 0x10e0001

    field public static final int config_shortAnimTime = 17694720; // 0x10e0000

    field public static final int status_bar_notification_info_maxnum = 17694723; // 0x10e0003

  }















  public static final class R.interpolator {










@@ -1460,6 +1461,7 @@ package android {













    field public static final int search_go = 17039372; // 0x104000c















    field public static final int selectAll = 17039373; // 0x104000d















    field public static final int selectTextMode = 17039382; // 0x1040016













    field public static final int status_bar_notification_info_overflow = 17039383; // 0x1040017















    field public static final int unknownName = 17039374; // 0x104000e















    field public static final int untitled = 17039375; // 0x104000f















    field public static final int yes = 17039379; // 0x1040013

























core/java/android/app/Notification.java



+5
−5




























Original line number
Diff line number
Diff line








@@ -929,15 +929,15 @@ public class Notification implements Parcelable













            if (mContentInfo != null) {















                contentView.setTextViewText(R.id.info, mContentInfo);















            } else if (mNumber > 0) {













                if (mNumber > 999) {













                    contentView.setTextViewText(R.id.info, "999+");













                final int tooBig = mContext.getResources().getInteger(













                        R.integer.status_bar_notification_info_maxnum);













                if (mNumber > tooBig) {













                    contentView.setTextViewText(R.id.info, mContext.getResources().getString(













                                R.string.status_bar_notification_info_overflow));















                } else {















                    NumberFormat f = NumberFormat.getIntegerInstance();















                    contentView.setTextViewText(R.id.info, f.format(mNumber));















                }













                contentView.setFloat(R.id.info, "setTextSize",













                        mContext.getResources().getDimensionPixelSize(













                            R.dimen.status_bar_content_number_size));















            } else {















                contentView.setViewVisibility(R.id.info, View.GONE);















            }

































core/res/res/layout/status_bar_latest_event_content.xml



+4
−35




























Original line number
Diff line number
Diff line















<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"













    android:id="@+id/status_bar_latest_event_content"















    android:layout_width="match_parent"















    android:layout_height="match_parent"















    >









@@ -8,41 +9,9 @@













        android:background="@drawable/notify_panel_notification_icon_bg"















        android:scaleType="center"















        />













    <LinearLayout













        android:layout_width="0dp"













        android:layout_height="wrap_content"













        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"













            android:layout_width="match_parent"













            android:layout_height="wrap_content"













            android:singleLine="true"













            android:ellipsize="marquee"













            android:fadingEdge="horizontal"













            android:layout_marginBottom="-3dp"













            />













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













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













    <include layout="@layout/status_bar_latest_event_content_large_icon" 















        android:layout_width="match_parent"















        android:layout_height="wrap_content"













            android:layout_weight="1"













            android:layout_marginTop="-2dp"













            android:singleLine="true"













            android:ellipsize="marquee"













            android:fadingEdge="horizontal"













            />













    </LinearLayout>













    <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:paddingLeft="8dp"













        android:layout_gravity="center"















        />















</LinearLayout>




































core/res/res/layout/status_bar_latest_event_content_large_icon.xml



+49
−34




























Original line number
Diff line number
Diff line















<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"













    android:id="@+id/status_bar_latest_event_content_large_icon"















    android:layout_width="match_parent"













    android:layout_height="match_parent"













    >













    <LinearLayout













        android:layout_width="0dp"















    android:layout_height="wrap_content"













        android:layout_gravity="center_vertical"













        android:layout_weight="1"













    android:layout_gravity="center"















    android:orientation="vertical"













        android:paddingLeft="16dp"













    android:paddingLeft="8dp"













    android:paddingRight="8dp"















    >















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















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









@@ -17,34 +14,52 @@













        android:singleLine="true"















        android:ellipsize="marquee"















        android:fadingEdge="horizontal"













            android:layout_marginBottom="-3dp"















        />













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













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















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















        android:layout_width="match_parent"















        android:layout_height="wrap_content"













            android:layout_weight="1"















        android:layout_marginTop="-2dp"













        android:layout_marginBottom="-2dp"













        android:singleLine="true"













        android:fadingEdge="horizontal"













        android:ellipsize="marquee"













        android:visibility="gone"













        android:alpha="0.7"













        />













    <LinearLayout













        android:layout_width="match_parent"













        android:layout_height="wrap_content"













        android:orientation="horizontal"













        android:alpha="0.7"













        >













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













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













            android:layout_width="0dp"













            android:layout_height="wrap_content"













            android:layout_weight="1"













            android:layout_gravity="center"















            android:singleLine="true"















            android:ellipsize="marquee"















            android:fadingEdge="horizontal"















            />













    </LinearLayout>















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















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















            android:layout_width="wrap_content"













        android:layout_height="match_parent"













            android:layout_height="wrap_content"













            android:layout_gravity="center"













            android:layout_weight="0"















            android:singleLine="true"













        android:gravity="center_vertical"













        android:paddingLeft="4dp"













        android:paddingRight="4dp"













            android:gravity="center"













            android:paddingLeft="8dp"















            />















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















            android:layout_width="wrap_content"















            android:layout_height="wrap_content"













        android:layout_gravity="bottom"













        android:layout_marginBottom="13dip"













            android:layout_gravity="center"













            android:layout_weight="0"















            android:scaleType="center"













            android:paddingLeft="8dp"















            />















    </LinearLayout>

























</LinearLayout>
























core/res/res/values-sw600dp/styles.xml



+0
−21




























Original line number
Diff line number
Diff line








@@ -15,27 +15,6 @@













-->































<resources>













    <!-- Status Bar Styles -->



























    <style name="TextAppearance.StatusBar">













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













    </style>













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













    </style>













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













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













    </style>



























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













    </style>













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













        <item name="android:textColor">#ff999999</item>













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













    </style>













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













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













    </style>





























    <style name="TextAppearance.Holo.Widget.TabWidget">















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















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