Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6b3885e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 7e4b664d 357b08a6

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

+0 −10
Original line number Diff line number Diff line
@@ -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();

    }

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

+0 −9
Original line number Diff line number Diff line
@@ -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);