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

Commit 05fb32a4 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Create a set icon visibility interface for footer" into tm-dev am: 7cb4f13f am: 67e771b0 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/18185944



Change-Id: I0763ab7ae5cc364a905faf1f7b8e834c37077954
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b509a81e 67e771b0

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

+16 −0
Original line number Diff line number Diff line
@@ -40,6 +40,8 @@ public class FooterPreference extends Preference { 
    static final int ORDER_FOOTER = Integer.MAX_VALUE - 1;

    @VisibleForTesting

    View.OnClickListener mLearnMoreListener;

    @VisibleForTesting

    int mIconVisibility = View.VISIBLE;

    private CharSequence mContentDescription;

    private CharSequence mLearnMoreText;

    private CharSequence mLearnMoreContentDescription;
@@ -84,6 +86,9 @@ public class FooterPreference extends Preference { 
        } else {

            learnMore.setVisibility(View.GONE);

        }



        View icon = holder.itemView.findViewById(R.id.icon_frame);

        icon.setVisibility(mIconVisibility);

    }



    @Override
@@ -165,6 +170,17 @@ public class FooterPreference extends Preference { 
        }

    }



    /**

     * Set visibility of footer icon.

     */

    public void setIconVisibility(int iconVisibility) {

        if (mIconVisibility == iconVisibility) {

            return;

        }

        mIconVisibility = iconVisibility;

        notifyChanged();

    }



    private void init() {

        setLayoutResource(R.layout.preference_footer);

        if (getIcon() == null) {

packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/FooterPreferenceTest.java

+9 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import static com.google.common.truth.Truth.assertThat; 


import android.content.Context;

import android.view.LayoutInflater;

import android.view.View;

import android.widget.TextView;



import androidx.preference.PreferenceViewHolder;
@@ -86,4 +87,11 @@ public class FooterPreferenceTest { 


        assertThat(mFooterPreference.mLearnMoreListener).isNotNull();

    }



    @Test

    public void setIconVisibility_shouldReturnSameVisibilityType() {

        mFooterPreference.setIconVisibility(View.GONE);



        assertThat(mFooterPreference.mIconVisibility).isEqualTo(View.GONE);

    }

}