Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev am: d6b3885ef5

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

Change-Id: If8255a8b6cda0aa6c1b6c479dc68693e3c125d77
This commit is contained in:
TreeHugger Robot
2021-06-18 11:03:15 +00:00
committed by Automerger Merge Worker
2 changed files with 0 additions and 19 deletions

View File

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

View File

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