From 357b08a63ea2dfa30f18201d8a6ff39d4574cf10 Mon Sep 17 00:00:00 2001
From: Yi-Ling Chuang <emilychuang@google.com>
Date: Fri, 18 Jun 2021 08:35:32 +0000
Subject: [PATCH] Revert "Disable RecyclerView animation to fix the broken UI"

This reverts commit 5b219a34ab8659b0bc51d43ad61d630aeb4625e0.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I47ceb8d043e3b02a59e43a1ae021c3c7855cbe57
---
 src/com/android/settings/datausage/AppDataUsage.java   | 10 ----------
 .../notification/app/AppNotificationSettings.java      |  9 ---------
 2 files changed, 19 deletions(-)

diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java
index 5c5900e8f37..460f3909f74 100644
--- a/src/com/android/settings/datausage/AppDataUsage.java
+++ b/src/com/android/settings/datausage/AppDataUsage.java
@@ -39,10 +39,8 @@ import androidx.loader.content.Loader;
 import androidx.preference.Preference;
 import androidx.preference.Preference.OnPreferenceChangeListener;
 import androidx.preference.PreferenceCategory;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settings.applications.AppInfoBase;
 import com.android.settings.widget.EntityHeaderController;
 import com.android.settingslib.AppItem;
@@ -223,14 +221,6 @@ public class AppDataUsage extends DataUsageBaseFragment implements OnPreferenceC
         }
         LoaderManager.getInstance(this).restartLoader(LOADER_APP_USAGE_DATA, null /* args */,
                 mUidDataCallbacks);
-
-        if (Utils.isPageTransitionEnabled(mContext)) {
-            final RecyclerView recyclerView = getListView();
-            if (recyclerView != null) {
-                recyclerView.setItemAnimator(null);
-            }
-        }
-
         updatePrefs();
     }
 
diff --git a/src/com/android/settings/notification/app/AppNotificationSettings.java b/src/com/android/settings/notification/app/AppNotificationSettings.java
index 8d0819cd979..d7694d7e45e 100644
--- a/src/com/android/settings/notification/app/AppNotificationSettings.java
+++ b/src/com/android/settings/notification/app/AppNotificationSettings.java
@@ -25,11 +25,9 @@ import android.util.Log;
 import androidx.preference.Preference;
 import androidx.preference.PreferenceGroup;
 import androidx.preference.PreferenceScreen;
-import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.internal.widget.LockPatternUtils;
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settingslib.core.AbstractPreferenceController;
 
 import java.util.ArrayList;
@@ -80,13 +78,6 @@ public class AppNotificationSettings extends NotificationSettings {
             return;
         }
 
-        if (Utils.isPageTransitionEnabled(mContext)) {
-            final RecyclerView recyclerView = getListView();
-            if (recyclerView != null) {
-                recyclerView.setItemAnimator(null);
-            }
-        }
-
         for (NotificationPreferenceController controller : mControllers) {
             controller.onResume(mAppRow, mChannel, mChannelGroup, null, null, mSuspendedAppsAdmin,
                     null);