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

Commit 35019028 authored by Lyn Han's avatar Lyn Han Committed by Android (Google) Code Review
Browse files

Merge "Remove half-swipe shelf behind notifications"

parents f929cba2 9c0941fe

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

+5 −2
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.content.pm.PackageInfo; 
import android.content.pm.PackageManager;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Color;

import android.graphics.Path;

import android.graphics.drawable.AnimatedVectorDrawable;

import android.graphics.drawable.AnimationDrawable;
@@ -43,6 +44,7 @@ import android.graphics.drawable.Drawable; 
import android.os.AsyncTask;

import android.os.Build;

import android.os.Bundle;

import android.provider.Settings;

import android.service.notification.StatusBarNotification;

import android.util.ArraySet;

import android.util.AttributeSet;
@@ -1163,10 +1165,11 @@ public class ExpandableNotificationRow extends ActivatableNotificationView 
     */

    @Nullable

    public NotificationMenuRowPlugin createMenu() {

        if (mMenuRow == null) {

        final boolean removeShelf = Settings.Global.getInt(mContext.getContentResolver(),

                Settings.Global.SHOW_NEW_NOTIF_DISMISS, 0 /* show shelf by default */) == 1;

        if (mMenuRow == null || removeShelf) {

            return null;

        }



        if (mMenuRow.getMenuView() == null) {

            mMenuRow.createMenu(this, mEntry.getSbn());

            mMenuRow.setAppName(mAppName);