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

Commit 53e64a43 authored by Selim Cinek's avatar Selim Cinek
Browse files

Adapted the big picture template 

Change-Id: Ia66c5f12a8688b2f0c6ea51fb8dbdefc39f62f8f
parent 03d0d659

core/java/android/app/Notification.java

+7 −0
Original line number Diff line number Diff line
@@ -3810,6 +3810,13 @@ public class Notification implements Parcelable 
                contentView.setTextViewText(R.id.text, mBuilder.processLegacyText(mSummaryText));

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

            }

            int imageMinHeight = mBuilder.mContext.getResources().getDimensionPixelSize(

                    R.dimen.notification_big_picture_content_min_height_with_picture);

            // We need to make space for the right image, so we're enforcing a minheight if there

            // is a picture.

            int minHeight = (mBuilder.mN.mLargeIcon == null) ? 0 : imageMinHeight;

            contentView.setInt(R.id.notification_main_column, "setMinimumHeight", minHeight);



            if (mBigLargeIconSet) {

                mBuilder.mN.mLargeIcon = oldLargeIcon;

            }

core/java/android/view/View.java

+1 −0
Original line number Diff line number Diff line
@@ -19429,6 +19429,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
     *

     * @attr ref android.R.styleable#View_minHeight

     */

    @RemotableViewMethod

    public void setMinimumHeight(int minHeight) {

        mMinHeight = minHeight;

        requestLayout();

core/res/res/layout/notification_template_material_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
<FrameLayout 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="64dp"

    android:layout_height="wrap_content"

    android:tag="base"

    >

    <include layout="@layout/notification_template_header" />

core/res/res/layout/notification_template_material_big_base.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
        android:layout_marginStart="@dimen/notification_content_margin_start"

        android:layout_marginTop="@dimen/notification_content_margin_top"

        android:layout_marginEnd="@dimen/notification_content_margin_end"

        android:minHeight="@dimen/notification_large_icon_height"

        android:minHeight="@dimen/notification_min_content_height"

        android:orientation="vertical"

        >

        <include layout="@layout/notification_template_part_line1" />

core/res/res/layout/notification_template_material_big_picture.xml

+47 −25
Original line number Diff line number Diff line
@@ -21,31 +21,53 @@ 
    android:layout_height="match_parent"

    android:tag="bigPicture"

    >

    <include layout="@layout/notification_template_header" />

    <include layout="@layout/notification_template_right_icon" />

    <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_gravity="top"

            android:layout_marginStart="@dimen/notification_content_margin_start"

            android:layout_marginEnd="@dimen/notification_content_margin_end"

            android:layout_marginTop="@dimen/notification_content_margin_top"

            android:orientation="vertical"

            >

        <LinearLayout

            android:id="@+id/notification_main_column"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical">

            <include layout="@layout/notification_template_part_line1"/>

            <include layout="@layout/notification_template_part_line2"/>

            <include layout="@layout/notification_template_part_line3"/>

        </LinearLayout>

        <ImageView

                android:id="@+id/big_picture"

                android:layout_width="match_parent"

        android:layout_height="192dp"

        android:layout_marginTop="@dimen/notification_min_height"

        android:layout_gravity="bottom"

                android:layout_height="0dp"

                android:adjustViewBounds="true"

                android:layout_weight="1"

                android:layout_marginTop="13dp"

                android:layout_marginBottom="16dp"

                android:scaleType="centerCrop"

                />

    <include layout="@layout/notification_template_material_base"

        android:layout_width="match_parent"

        android:layout_height="@dimen/notification_min_height"

        />

  <FrameLayout

        <ImageView

                android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="228dp"

        android:layout_gravity="bottom"

        android:background="#CCEEEEEE"

        >

                android:layout_height="1dp"

                android:layout_marginStart="-16dp"

                android:layout_marginEnd="-16dp"

                android:clipChildren="false"

                android:id="@+id/action_divider"

                android:visibility="gone"

                android:background="@drawable/notification_template_divider" />

        <include

                layout="@layout/notification_material_action_list"

                android:id="@+id/actions"

            android:layout_gravity="bottom"

                android:layout_marginStart="-16dp"

                android:layout_marginEnd="-16dp"

                android:clipChildren="false"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                />

    </FrameLayout>

    </LinearLayout>

</FrameLayout>