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

Commit 7d6bc7dd authored by András Kurucz's avatar András Kurucz Committed by Automerger Merge Worker
Browse files

Merge "Remove unused code from ExpandableNotificationRow" into tm-qpr-dev am:... 

Merge "Remove unused code from ExpandableNotificationRow" into tm-qpr-dev am: 9f00d05c am: 78c4586c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19678982



Change-Id: Ib403076f70bff248b0ddb2ea9e58715350873394
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 15be16e8 78c4586c

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

+0 −23
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.app.Notification.Action.SEMANTIC_ACTION_MARK_CONVERSATION_ 
import static android.service.notification.NotificationListenerService.REASON_CANCEL;



import static com.android.systemui.statusbar.notification.row.NotificationContentView.VISIBLE_TYPE_HEADSUP;

import static com.android.systemui.statusbar.notification.row.NotificationRowContentBinder.FLAG_CONTENT_VIEW_PUBLIC;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;
@@ -236,11 +235,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
     */

    private boolean mIsHeadsUp;



    /**

     * Whether or not the notification should be redacted on the lock screen, i.e has sensitive

     * content which should be redacted on the lock screen.

     */

    private boolean mNeedsRedaction;

    private boolean mLastChronometerRunning = true;

    private ViewStub mChildrenContainerStub;

    private GroupMembershipManager mGroupMembershipManager;
@@ -1502,23 +1496,6 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
        mUseIncreasedHeadsUpHeight = use;

    }



    /** @deprecated TODO: Remove this when the old pipeline code is removed. */

    @Deprecated

    public void setNeedsRedaction(boolean needsRedaction) {

        if (mNeedsRedaction != needsRedaction) {

            mNeedsRedaction = needsRedaction;

            if (!isRemoved()) {

                RowContentBindParams params = mRowContentBindStage.getStageParams(mEntry);

                if (needsRedaction) {

                    params.requireContentViews(FLAG_CONTENT_VIEW_PUBLIC);

                } else {

                    params.markContentViewsFreeable(FLAG_CONTENT_VIEW_PUBLIC);

                }

                mRowContentBindStage.requestRebind(mEntry, null /* callback */);

            }

        }

    }



    public interface ExpansionLogger {

        void logNotificationExpansion(String key, boolean userAction, boolean expanded);

    }

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/row/ExpandableNotificationRowTest.java

+1 −13
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ import static com.google.common.truth.Truth.assertThat; 


import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;
@@ -58,8 +57,8 @@ import com.android.systemui.plugins.statusbar.NotificationMenuRowPlugin; 
import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.statusbar.notification.AboveShelfChangedListener;

import com.android.systemui.statusbar.notification.FeedbackIcon;

import com.android.systemui.statusbar.notification.row.ExpandableView.OnHeightChangedListener;

import com.android.systemui.statusbar.notification.collection.NotificationEntry;

import com.android.systemui.statusbar.notification.row.ExpandableView.OnHeightChangedListener;

import com.android.systemui.statusbar.notification.stack.NotificationChildrenContainer;



import org.junit.Assert;
@@ -259,17 +258,6 @@ public class ExpandableNotificationRowTest extends SysuiTestCase { 
        verify(row).updateShelfIconColor();

    }



    @Test

    public void setNeedsRedactionFreesViewWhenFalse() throws Exception {

        ExpandableNotificationRow row = mNotificationTestHelper.createRow(FLAG_CONTENT_VIEW_ALL);

        row.setNeedsRedaction(true);

        row.getPublicLayout().setVisibility(View.GONE);



        row.setNeedsRedaction(false);

        TestableLooper.get(this).processAllMessages();

        assertNull(row.getPublicLayout().getContractedChild());

    }



    @Test

    public void testAboveShelfChangedListenerCalled() throws Exception {

        ExpandableNotificationRow row = mNotificationTestHelper.createRow();