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

#213 Fix null reference

Browse Source
This commit is contained in:
Carmelo Messina
2023-08-24 17:50:46 +02:00
parent 22fa08f7c5
commit 7c985a4aeb
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/patches/00Add-option-to-disable-snapshots.patch
+8 -6
View File
@@ -3,27 +3,29 @@ Date: Mon, 21 Aug 2023 14:03:25 +0000
Subject: Add option to disable snapshots
---
.../tab_management/TabGridViewBinder.java | 6 ++-
.../tab_management/TabGridViewBinder.java | 8 +++-
.../java/res/xml/privacy_preferences.xml | 5 +++
.../chrome/browser/app/ChromeActivity.java | 3 +-
.../layouts/content/TabContentManager.java | 7 +++-
.../privacy/settings/PrivacySettings.java | 42 ++++++++++++++++++-
.../strings/android_chrome_strings.grd | 8 ++++
6 files changed, 65 insertions(+), 6 deletions(-)
6 files changed, 67 insertions(+), 6 deletions(-)
diff --git a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
--- a/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
+++ b/chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java
@@ -314,8 +314,10 @@ class TabGridViewBinder {
@@ -314,8 +314,12 @@ class TabGridViewBinder {
updateThumbnailMatrix(thumbnail, result, thumbnailSize);
thumbnail.setImageBitmap(result);
} else if (isMostRecentRequest) {
- // If the most recent request is a null bitmap ensure a placeholder is visible.
- thumbnail.setImageDrawable(null);
+ TabListFaviconProvider.TabFavicon tabFavicon = model.get(TabProperties.FAVICON);
+ thumbnail.setScaleType(ImageView.ScaleType.CENTER);
+ thumbnail.setImageDrawable(
+ isSelected ? tabFavicon.getSelectedDrawable() : tabFavicon.getDefaultDrawable());
+ if (tabFavicon != null) {
+ thumbnail.setScaleType(ImageView.ScaleType.CENTER);
+ thumbnail.setImageDrawable(
+ isSelected ? tabFavicon.getSelectedDrawable() : tabFavicon.getDefaultDrawable());
+ }
}
};
if (TabUiFeatureUtilities.isTabGroupsAndroidContinuationEnabled(view.getContext())