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

Commit 2c6c99e1 authored by Julia Reynolds's avatar Julia Reynolds Committed by Automerger Merge Worker
Browse files

Merge "Fix some history issues" into tm-dev am: b28925ad 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17710594



Change-Id: I1e3c6396c2a6570bee3d18f68a5c0e9e810f92ed
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f0d733d5 b28925ad

res/layout/notification_sbn_log_row.xml

+2 −2
Original line number Diff line number Diff line
@@ -74,8 +74,8 @@ 


            <ImageView

                android:id="@+id/profile_badge"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_width="16dp"

                android:layout_height="16dp"

                android:layout_marginEnd="6dp"

                android:scaleType="fitCenter"

                android:contentDescription="@*android:string/notification_work_profile_content_description"

src/com/android/settings/notification/history/NotificationHistoryActivity.java

+4 −2
Original line number Diff line number Diff line
@@ -356,8 +356,10 @@ public class NotificationHistoryActivity extends CollapsingToolbarBaseActivity { 
                }

                final int newState = isChecked ? 1 : 0;

                if (oldState != newState) {

                    Settings.Secure.putInt(getContentResolver(),

                            NOTIFICATION_HISTORY_ENABLED, newState);

                    for (int user : mUm.getProfileIds(ActivityManager.getCurrentUser(), false)) {

                        Settings.Secure.putIntForUser(getContentResolver(),

                                NOTIFICATION_HISTORY_ENABLED, newState, user);

                    }

                    mUiEventLogger.log(isChecked ? NotificationHistoryEvent.NOTIFICATION_HISTORY_ON

                            : NotificationHistoryEvent.NOTIFICATION_HISTORY_OFF);

                    Log.d(TAG, "onSwitchChange history to " + isChecked);

src/com/android/settings/notification/history/NotificationSbnAdapter.java

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ public class NotificationSbnAdapter extends 
            int userId = normalizeUserId(sbn);

            if (!mUserBadgeCache.containsKey(userId)) {

                Drawable profile = mContext.getPackageManager().getUserBadgeForDensity(

                        UserHandle.of(userId), -1);

                        UserHandle.of(userId), 0);

                mUserBadgeCache.put(userId, profile);

            }

            holder.setProfileBadge(mUserBadgeCache.get(userId));