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

Commit ed2db4aa authored by Fan Zhang's avatar Fan Zhang Committed by Android (Google) Code Review
Browse files

Merge "Mass clean up: don't cast class when not needed."

parents a670f752 7db118e3

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

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ public class AccountHeaderPreferenceController extends AbstractPreferenceControl 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mHeaderPreference = (LayoutPreference) screen.findPreference(KEY_ACCOUNT_HEADER);

        mHeaderPreference = screen.findPreference(KEY_ACCOUNT_HEADER);

    }



    @Override

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

+1 −2
Original line number Diff line number Diff line
@@ -66,8 +66,7 @@ public class RemoveAccountPreferenceController extends AbstractPreferenceControl 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        final LayoutPreference removeAccountPreference =

                (LayoutPreference) screen.findPreference(KEY_REMOVE_ACCOUNT);

        final LayoutPreference removeAccountPreference = screen.findPreference(KEY_REMOVE_ACCOUNT);

        Button removeAccountButton = (Button) removeAccountPreference.findViewById(R.id.button);

        removeAccountButton.setOnClickListener(this);

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -138,7 +138,7 @@ public class RecentAppsPreferenceController extends AbstractPreferenceController 


    @Override

    public void displayPreference(PreferenceScreen screen) {

        mCategory = (PreferenceCategory) screen.findPreference(getPreferenceKey());

        mCategory = screen.findPreference(getPreferenceKey());

        mSeeAllPref = screen.findPreference(KEY_SEE_ALL);

        mDivider = screen.findPreference(KEY_DIVIDER);

        super.displayPreference(screen);

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

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ public class AppHeaderViewPreferenceController extends BasePreferenceController 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mHeader = (LayoutPreference) screen.findPreference(KEY_HEADER);

        mHeader = screen.findPreference(KEY_HEADER);

        final Activity activity = mParent.getActivity();

        mEntityHeaderController = EntityHeaderController

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

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

+4 −4
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ public class InstantAppButtonsPreferenceController extends BasePreferenceControl 
    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);

        mPreference = (LayoutPreference) screen.findPreference(KEY_INSTANT_APP_BUTTONS);

        mPreference = screen.findPreference(KEY_INSTANT_APP_BUTTONS);

        initButtons(mPreference.findViewById(R.id.instant_app_button_container));

    }