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

Commit d212cfa1 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fixed a bug where the icon of children could be colored" into nyc-dev

parents 57e4a67b 7d1c63e6

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

+1 −1
Original line number Diff line number Diff line
@@ -1346,7 +1346,7 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
            expandButton.setVisibility(VISIBLE);

            mNotificationHeader.setOnClickListener(mExpandClickListener);

            mNotificationHeaderWrapper = NotificationViewWrapper.wrap(getContext(),

                    mNotificationHeader);

                    mNotificationHeader, this);

            addView(mNotificationHeader, indexOfChild(mChildrenContainer) + 1);

            mTranslateableViews.add(mNotificationHeader);

        } else {

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

+6 −3
Original line number Diff line number Diff line
@@ -307,7 +307,8 @@ public class NotificationContentView extends FrameLayout { 
        addView(child);

        mContractedChild = child;

        mContractedChild.addOnLayoutChangeListener(mLayoutUpdater);

        mContractedWrapper = NotificationViewWrapper.wrap(getContext(), child);

        mContractedWrapper = NotificationViewWrapper.wrap(getContext(), child,

                mContainingNotification);

        selectLayout(false /* animate */, true /* force */);

        mContractedWrapper.setDark(mDark, false /* animate */, 0 /* delay */);

    }
@@ -321,7 +322,8 @@ public class NotificationContentView extends FrameLayout { 
        addView(child);

        mExpandedChild = child;

        mExpandedChild.addOnLayoutChangeListener(mLayoutUpdater);

        mExpandedWrapper = NotificationViewWrapper.wrap(getContext(), child);

        mExpandedWrapper = NotificationViewWrapper.wrap(getContext(), child,

                mContainingNotification);

        selectLayout(false /* animate */, true /* force */);

    }
@@ -334,7 +336,8 @@ public class NotificationContentView extends FrameLayout { 
        addView(child);

        mHeadsUpChild = child;

        mHeadsUpChild.addOnLayoutChangeListener(mLayoutUpdater);

        mHeadsUpWrapper = NotificationViewWrapper.wrap(getContext(), child);

        mHeadsUpWrapper = NotificationViewWrapper.wrap(getContext(), child,

                mContainingNotification);

        selectLayout(false /* animate */, true /* force */);

    }

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigPictureTemplateViewWrapper.java

+5 −2
Original line number Diff line number Diff line
@@ -23,13 +23,16 @@ import android.os.Bundle; 
import android.service.notification.StatusBarNotification;

import android.view.View;



import com.android.systemui.statusbar.ExpandableNotificationRow;



/**

 * Wraps a notification containing a big picture template

 */

public class NotificationBigPictureTemplateViewWrapper extends NotificationTemplateViewWrapper {



    protected NotificationBigPictureTemplateViewWrapper(Context ctx, View view) {

        super(ctx, view);

    protected NotificationBigPictureTemplateViewWrapper(Context ctx, View view,

            ExpandableNotificationRow row) {

        super(ctx, view, row);

    }



    @Override

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationBigTextTemplateViewWrapper.java

+4 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ import android.service.notification.StatusBarNotification; 
import android.view.View;



import com.android.internal.widget.ImageFloatingTextView;

import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.TransformableView;



/**
@@ -30,8 +31,9 @@ public class NotificationBigTextTemplateViewWrapper extends NotificationTemplate 


    private ImageFloatingTextView mBigtext;



    protected NotificationBigTextTemplateViewWrapper(Context ctx, View view) {

        super(ctx, view);

    protected NotificationBigTextTemplateViewWrapper(Context ctx, View view,

            ExpandableNotificationRow row) {

        super(ctx, view, row);

    }



    private void resolveViews(StatusBarNotification notification) {

packages/SystemUI/src/com/android/systemui/statusbar/notification/NotificationCustomViewWrapper.java

+3 −2
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.view.View; 


import com.android.systemui.R;

import com.android.systemui.ViewInvertHelper;

import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.phone.NotificationPanelView;



/**
@@ -44,8 +45,8 @@ public class NotificationCustomViewWrapper extends NotificationViewWrapper { 
    private boolean mShouldInvertDark;

    private boolean mShowingLegacyBackground;



    protected NotificationCustomViewWrapper(View view) {

        super(view);

    protected NotificationCustomViewWrapper(View view, ExpandableNotificationRow row) {

        super(view, row);

        mInvertHelper = new ViewInvertHelper(view, NotificationPanelView.DOZE_ANIMATION_DURATION);

    }