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

Commit 4957e2d0 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Clean up unused fields from EntityHeaderController" into main

parents a796508a cc2133ba

src/com/android/settings/accounts/AccountHeaderPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -95,6 +95,6 @@ public class AccountHeaderPreferenceController extends AbstractPreferenceControl 
                .newInstance(mActivity, mHost, mHeaderPreference.findViewById(R.id.entity_header))

                .setLabel(mAccount.name)

                .setIcon(helper.getDrawableForType(mContext, mAccount.type))

                .done(mActivity, true /* rebindButtons */);

                .done(true /* rebindButtons */);

    }

}

src/com/android/settings/accounts/AccountSyncSettings.java

+1 −2
Original line number Diff line number Diff line
@@ -140,11 +140,10 @@ public class AccountSyncSettings extends AccountPreferenceBase { 
        final Activity activity = getActivity();

        final Preference pref = EntityHeaderController

                .newInstance(activity, this, null /* header */)

                .setRecyclerView(getListView(), getSettingsLifecycle())

                .setIcon(getDrawableForType(mAccount.type))

                .setLabel(mAccount.name)

                .setSummary(getLabelForType(mAccount.type))

                .done(activity, getPrefContext());

                .done(getPrefContext());

        pref.setOrder(0);

        getPreferenceScreen().addPreference(pref);

        if (savedInstanceState != null && savedInstanceState.containsKey(UID_REQUEST_KEY)) {

src/com/android/settings/applications/AppInfoWithHeader.java

+1 −2
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ public abstract class AppInfoWithHeader extends AppInfoBase { 
        final Activity activity = getActivity();

        final Preference pref = EntityHeaderController

                .newInstance(activity, this, null /* header */)

                .setRecyclerView(getListView(), getSettingsLifecycle())

                .setIcon(Utils.getBadgedIcon(getContext(), mPackageInfo.applicationInfo))

                .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))

                .setSummary(mPackageInfo)
@@ -55,7 +54,7 @@ public abstract class AppInfoWithHeader extends AppInfoBase { 
                .setUid(mPackageInfo.applicationInfo.uid)

                .setHasAppInfoLink(true)

                .setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE)

                .done(activity, getPrefContext());

                .done(getPrefContext());

        getPreferenceScreen().addPreference(pref);

    }

}

src/com/android/settings/applications/ProcessStatsDetail.java

+1 −2
Original line number Diff line number Diff line
@@ -129,7 +129,6 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment { 
        final Activity activity = getActivity();

        final Preference pref = EntityHeaderController

                .newInstance(activity, this, null /* appHeader */)

                .setRecyclerView(getListView(), getSettingsLifecycle())

                .setIcon(mApp.mUiTargetApp != null

                        ? IconDrawableFactory.newInstance(activity).getBadgedIcon(mApp.mUiTargetApp)

                        : new ColorDrawable(0))
@@ -140,7 +139,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment { 
                        : UserHandle.USER_NULL)

                .setHasAppInfoLink(true)

                .setButtonActions(ActionType.ACTION_NONE, ActionType.ACTION_NONE)

                .done(activity, getPrefContext());

                .done(getPrefContext());

        getPreferenceScreen().addPreference(pref);

    }

src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceController.java

+1 −2
Original line number Diff line number Diff line
@@ -66,7 +66,6 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController 
        final Activity activity = mParent.getActivity();

        mEntityHeaderController = EntityHeaderController

                .newInstance(activity, mParent, mHeader.findViewById(R.id.entity_header))

                .setRecyclerView(mParent.getListView(), mLifecycle)

                .setPackageName(mPackageName)

                .setButtonActions(EntityHeaderController.ActionType.ACTION_NONE,

                        EntityHeaderController.ActionType.ACTION_NONE)
@@ -86,6 +85,6 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController 
                .setLabel(appEntry)

                .setIcon(appEntry)

                .setIsInstantApp(isInstantApp)

                .done(activity, false /* rebindActions */);

                .done(false /* rebindActions */);

    }

}