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

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

Merge "Expand too-small notifications to fill 64dp."

parents f66bc73f bc5559f1

core/res/res/layout/notification_template_base.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:background="@android:color/background_dark"

    android:background="@android:color/background_dark"

    android:id="@+id/status_bar_latest_event_content"

    android:id="@+id/status_bar_latest_event_content"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="64dp"

    internal:layout_minHeight="64dp"

    internal:layout_minHeight="64dp"

    internal:layout_maxHeight="64dp"

    internal:layout_maxHeight="64dp"

    >

    >

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+11 −3
Original line number Original line Diff line number Diff line
@@ -354,9 +354,10 @@ public abstract class BaseStatusBar extends SystemUI implements 
        LayoutInflater inflater = (LayoutInflater)mContext.getSystemService(

        LayoutInflater inflater = (LayoutInflater)mContext.getSystemService(

                Context.LAYOUT_INFLATER_SERVICE);

                Context.LAYOUT_INFLATER_SERVICE);

        View row = inflater.inflate(R.layout.status_bar_notification_row, parent, false);

        View row = inflater.inflate(R.layout.status_bar_notification_row, parent, false);



        // XXX: temporary: while testing big notifications, auto-expand all of them

        // XXX: temporary: while testing big notifications, auto-expand all of them

        ViewGroup.LayoutParams lp = row.getLayoutParams();

        ViewGroup.LayoutParams lp = row.getLayoutParams();

        if (sbn.notification.bigContentView != null) {

        if (large != null) {

            lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;

            lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;

        } else {

        } else {

            lp.height = minHeight;

            lp.height = minHeight;
@@ -372,9 +373,16 @@ public abstract class BaseStatusBar extends SystemUI implements 
        // bind the click event to the content area

        // bind the click event to the content area

        ViewGroup content = (ViewGroup)row.findViewById(R.id.content);

        ViewGroup content = (ViewGroup)row.findViewById(R.id.content);

        ViewGroup adaptive = (ViewGroup)row.findViewById(R.id.adaptive);

        ViewGroup adaptive = (ViewGroup)row.findViewById(R.id.adaptive);

        // XXX: update to allow controls within notification views



        // Ensure that R.id.content is properly set to 64dp high if 1U

        lp = content.getLayoutParams();

        if (large == null) {

            lp.height = minHeight;

        }

        content.setLayoutParams(lp);



        content.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);

        content.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);

//        content.setOnFocusChangeListener(mFocusChangeListener);



        PendingIntent contentIntent = sbn.notification.contentIntent;

        PendingIntent contentIntent = sbn.notification.contentIntent;

        if (contentIntent != null) {

        if (contentIntent != null) {

            final View.OnClickListener listener = new NotificationClicker(contentIntent,

            final View.OnClickListener listener = new NotificationClicker(contentIntent,

tests/StatusBar/src/com/android/statusbartest/NotificationTestList.java

+10 −2
Original line number Original line Diff line number Diff line
@@ -24,6 +24,7 @@ import android.content.ContentResolver; 
import android.content.Intent;

import android.content.Intent;

import android.graphics.Bitmap;

import android.graphics.Bitmap;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.BitmapDrawable;

import android.os.Bundle;

import android.os.Environment;

import android.os.Environment;

import android.os.Vibrator;

import android.os.Vibrator;

import android.os.Handler;

import android.os.Handler;
@@ -44,10 +45,10 @@ public class NotificationTestList extends TestActivity 
    private final static String TAG = "NotificationTestList";

    private final static String TAG = "NotificationTestList";





    NotificationManager mNM;

    NotificationManager mNM;

    Vibrator mVibrator = (Vibrator)getSystemService(VIBRATOR_SERVICE);

    Vibrator mVibrator;

    Handler mHandler = new Handler();

    Handler mHandler = new Handler();





    long mActivityCreateTime = System.currentTimeMillis();

    long mActivityCreateTime;

    long mChronometerBase = 0;

    long mChronometerBase = 0;





    boolean mProgressDone = true;

    boolean mProgressDone = true;
@@ -66,6 +67,13 @@ public class NotificationTestList extends TestActivity 
    };

    };

    final int kUnnumberedIconResID = R.drawable.notificationx;

    final int kUnnumberedIconResID = R.drawable.notificationx;





    @Override

    public void onCreate(Bundle icicle) {

        super.onCreate(icicle);

        mVibrator = (Vibrator)getSystemService(VIBRATOR_SERVICE);

        mActivityCreateTime = System.currentTimeMillis();

    }



    @Override

    @Override

    protected String tag() {

    protected String tag() {

        return TAG;

        return TAG;