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

Commit 7dafd21f authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge changes I24ba9196,Idc983746 

* changes:
  Fix some l18n issues
  Add more info to log statement
parents dcca9929 4307ce02

packages/SystemUI/res/layout/notification_conversation_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ 
                    android:clickable="false"

                    android:focusable="false"

                    android:ellipsize="end"

                    android:maxLines="3"

                    android:maxLines="4"

                    android:textAppearance="@style/TextAppearance.NotificationImportanceDetail"/>

            </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>

packages/SystemUI/res/layout/partial_conversation_info.xml

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ 
                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_centerVertical="true"

                    android:textDirection="locale"

                    style="@style/TextAppearance.NotificationImportanceChannelGroup" />

            </LinearLayout>

        </com.android.systemui.statusbar.notification.row.ButtonLinearLayout>

services/core/java/com/android/server/notification/NotificationManagerService.java

+2 −1
Original line number Diff line number Diff line
@@ -6103,7 +6103,8 @@ public class NotificationManagerService extends SystemService { 
    protected boolean isBlocked(NotificationRecord r, NotificationUsageStats usageStats) {

        if (isBlocked(r)) {

            if (DBG) {

                Slog.e(TAG, "Suppressing notification from package by user request.");

                Slog.e(TAG, "Suppressing notification from package " + r.getSbn().getPackageName()

                        + " by user request.");

            }

            usageStats.registerBlocked(r);

            return true;