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

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

Merge "Adapt margin for actionless notifs with snooze button"

parents d620436b 3ff7884d

core/java/android/app/Notification.java

+5 −1
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ import android.os.Parcelable; 
import android.os.SystemClock;

import android.os.SystemProperties;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.BidiFormatter;

import android.text.SpannableStringBuilder;

import android.text.Spanned;
@@ -5348,8 +5349,11 @@ public class Notification implements Parcelable 
            big.setViewVisibility(R.id.notification_material_reply_text_3, View.GONE);

            big.setTextViewText(R.id.notification_material_reply_text_3, null);



            final boolean snoozeEnabled = mContext.getContentResolver() != null

                    && (Settings.Secure.getInt(mContext.getContentResolver(),

                        Settings.Secure.SHOW_NOTIFICATION_SNOOZE, 0) == 1);

            big.setViewLayoutMarginBottomDimen(R.id.notification_action_list_margin_target,

                    R.dimen.notification_content_margin);

                    snoozeEnabled ? 0 : R.dimen.notification_content_margin);

        }



        private RemoteViews applyStandardTemplateWithActions(int layoutId, int viewType,