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

Commit 82cab1b5 authored by Chris Wren's avatar Chris Wren Committed by Android Git Automerger
Browse files

am 683ab00a: fix underfull content bug in inbox and big text templates. 

* commit '683ab00a':
  fix underfull content bug in inbox and big text templates.
parents 03b80dc8 683ab00a

core/java/android/app/Notification.java

+6 −5
Original line number Diff line number Diff line
@@ -1923,6 +1923,7 @@ public class Notification implements Parcelable 
                contentView.setViewVisibility(rowId, View.GONE);

            }





            int i=0;

            while (i < mTexts.size() && i < rowIds.length) {

                CharSequence str = mTexts.get(i);
@@ -1933,11 +1934,11 @@ public class Notification implements Parcelable 
                i++;

            }



            if  (mTexts.size() > rowIds.length) {

                contentView.setViewVisibility(R.id.inbox_more, View.VISIBLE);

            } else {

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

            }

            contentView.setViewVisibility(R.id.inbox_end_pad,

                    mTexts.size() > 0 ? View.VISIBLE : View.GONE);



            contentView.setViewVisibility(R.id.inbox_more,

                    mTexts.size() > rowIds.length ? View.VISIBLE : View.GONE);



            return contentView;

        }

core/res/res/layout/notification_action_list.xml

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
    android:layout_height="wrap_content"

    android:orientation="horizontal"

    android:visibility="gone"

    android:layout_marginBottom="8dp"

    android:showDividers="middle"

    android:divider="?android:attr/listDivider"

    android:dividerPadding="12dp"

core/res/res/layout/notification_template_big_text.xml

+3 −2
Original line number Diff line number Diff line
@@ -34,13 +34,14 @@ 
        android:layout_gravity="fill_vertical"

        android:layout_marginStart="@dimen/notification_large_icon_width"

        android:orientation="vertical"

        android:paddingTop="2dp"

        android:paddingTop="0dp"

        android:paddingBottom="2dp"

        android:gravity="top"

        >

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/notification_large_icon_height"

            android:orientation="vertical"

            android:layout_marginStart="8dp"

            android:layout_marginEnd="8dp"
@@ -50,7 +51,7 @@ 
                android:id="@+id/line1"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:paddingTop="6dp"

                android:paddingTop="8dp"

                android:orientation="horizontal"

                android:layout_gravity="top"

                android:layout_weight="0"

core/res/res/layout/notification_template_inbox.xml

+153 −138
Original line number Diff line number Diff line
@@ -36,10 +36,17 @@ 
        android:layout_marginStart="@dimen/notification_large_icon_width"

        android:minHeight="@dimen/notification_large_icon_height"

        android:orientation="vertical"

        android:paddingTop="2dp"

        android:paddingTop="0dp"

        android:paddingBottom="2dp"

        android:gravity="top"

        >

        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:minHeight="@dimen/notification_large_icon_height"

            android:paddingTop="2dp"

            android:orientation="vertical"

            >

            <LinearLayout

                android:id="@+id/line1"

                android:layout_width="match_parent"
@@ -188,11 +195,19 @@ 
                android:layout_weight="1"

                android:text="@android:string/ellipsis"

                />

            <FrameLayout 

                android:id="@+id/inbox_end_pad"

                android:layout_width="match_parent"

                android:layout_height="8dip"

                android:visibility="gone"

                android:layout_weight="0"

            />

        </LinearLayout>

        <ImageView

            android:layout_width="match_parent"

            android:layout_height="1px"

            android:layout_height="1dip"

            android:layout_marginTop="-1px"

            android:id="@+id/action_divider"

            android:visibility="gone"

            android:background="?android:attr/dividerHorizontal" />

        <include

            layout="@layout/notification_action_list"
@@ -202,9 +217,9 @@ 
            />

        <ImageView

            android:layout_width="match_parent"

            android:layout_height="1px"

            android:layout_height="1dip"

            android:layout_marginTop="-1px"

            android:id="@+id/overflow_divider"

            android:layout_marginTop="8dp"

            android:visibility="visible"

            android:background="?android:attr/dividerHorizontal" />

        <LinearLayout

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -208,6 +208,7 @@ 
  <java-symbol type="id" name="inbox_text5" />

  <java-symbol type="id" name="inbox_text6" />

  <java-symbol type="id" name="inbox_more" />

  <java-symbol type="id" name="inbox_end_pad" />

  <java-symbol type="id" name="status_bar_latest_event_content" />

  <java-symbol type="id" name="action_divider" />

  <java-symbol type="id" name="overflow_divider" />