From a538d2b97ab73e722ca8d46cb185d0cf7e1a42df Mon Sep 17 00:00:00 2001
From: Tony Wickham <twickham@google.com>
Date: Mon, 6 Jan 2020 18:08:05 -0800
Subject: [PATCH] Keep folder notification dot on rotation

FolderIcon#mDotInfo is stored per instance, but not kept up to date
when re-binding on rotation.

Bug: 144369875
Change-Id: Ia429e4b4039eb02fb4587f54e33a0717408e4ac2
---
 src/com/android/launcher3/folder/FolderIcon.java | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/com/android/launcher3/folder/FolderIcon.java b/src/com/android/launcher3/folder/FolderIcon.java
index 7bbd45dac3..f322061d59 100644
--- a/src/com/android/launcher3/folder/FolderIcon.java
+++ b/src/com/android/launcher3/folder/FolderIcon.java
@@ -180,6 +180,14 @@ public class FolderIcon extends FrameLayout implements FolderListener, IconLabel
         icon.mLauncher = launcher;
         icon.mDotRenderer = grid.mDotRendererWorkSpace;
         icon.setContentDescription(launcher.getString(R.string.folder_name_format, folderInfo.title));
+
+        // Keep the notification dot up to date with the sum of all the content's dots.
+        FolderDotInfo folderDotInfo = new FolderDotInfo();
+        for (WorkspaceItemInfo si : folderInfo.contents) {
+            folderDotInfo.addDotInfo(launcher.getDotInfoForItem(si));
+        }
+        icon.setDotInfo(folderDotInfo);
+
         Folder folder = Folder.fromXml(launcher);
         folder.setDragController(launcher.getDragController());
         folder.setFolderIcon(icon);