PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I1e3c6396c2a6570bee3d18f68a5c0e9e810f92ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Julia Reynolds
2022-04-12 17:44:43 +00:00
committed by Automerger Merge Worker
parent f0d733d51f b28925ad48
commit 2c6c99e1f1
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/notification_sbn_log_row.xml
View File

@@ -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"

6
src/com/android/settings/notification/history/NotificationHistoryActivity.java
View File

@@ -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);

2
src/com/android/settings/notification/history/NotificationSbnAdapter.java
View File

@@ -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));