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

Commit 0ca9728f authored by Wesley.CW Wang's avatar Wesley.CW Wang Committed by Wesley Wang
Browse files

Clear UsageProgressBarPreference image view before setting images 

The legacy image view will be kept when setting different image view to UsageProgressBarPreference, this will cause UsageProgressBarPreference display duplicate views after setting many times, add removeAllViews() before addView() to fix it.

Bug: 174964885
Test: atest UsageProgressBarPreferenceTest
Change-Id: Id6b89dccb07a88f2f1be78a19c1de3ac3835087b
parent b6d634df

packages/SettingsLib/UsageProgressBarPreference/src/com/android/settingslib/widget/UsageProgressBarPreference.java

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ public class UsageProgressBarPreference extends Preference { 
            customLayout.removeAllViews();

            customLayout.setVisibility(View.GONE);

        } else {

            customLayout.removeAllViews();

            customLayout.addView(mCustomImageView);

            customLayout.setVisibility(View.VISIBLE);

        }

packages/SettingsLib/tests/integ/src/com/android/settingslib/widget/UsageProgressBarPreferenceTest.java

+16 −0
Original line number Diff line number Diff line
@@ -127,4 +127,20 @@ public class UsageProgressBarPreferenceTest { 
        assertThat(customContent.getChildAt(0)).isEqualTo(imageView);

        assertThat(customContent.getVisibility()).isEqualTo(View.VISIBLE);

    }



    @Test

    public void setCustomContent_setImageViewTwice_oneAndLatestChild() {

        final ImageView imageViewLegacy = mock(ImageView.class);

        final ImageView imageViewNew = mock(ImageView.class);

        mUsageProgressBarPreference.setCustomContent(imageViewLegacy);

        mUsageProgressBarPreference.setCustomContent(imageViewNew);



        mUsageProgressBarPreference.onBindViewHolder(mViewHolder);



        final FrameLayout customContent =

                (FrameLayout) mViewHolder.findViewById(R.id.custom_content);

        assertThat(customContent.getChildCount()).isEqualTo(1);

        assertThat(customContent.getChildAt(0)).isEqualTo(imageViewNew);

        assertThat(customContent.getVisibility()).isEqualTo(View.VISIBLE);

    }

}