Merge "Disable RecyclerView animation to fix the broken UI" into sc-dev

src/com/android/settings/datausage/AppDataUsage.java

@@ -39,8 +39,10 @@ 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;
@@ -221,6 +223,14 @@ 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();
     }
 

src/com/android/settings/notification/app/AppNotificationSettings.java

@@ -25,9 +25,11 @@ 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;
@@ -78,6 +80,13 @@ 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);