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

Commit 16ad7a88 authored by Jason Hsu's avatar Jason Hsu Committed by Android (Google) Code Review
Browse files

Merge "Add getTitle() for ButtonPreference"

parents 5f48d8bd fa6acf36

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

+4 −0
Original line number Diff line number Diff line
@@ -132,6 +132,10 @@ public class ButtonPreference extends Preference { 
        }

    }



    @Override public CharSequence getTitle() {

        return mTitle;

    }



    @Override

    public void setIcon(Drawable icon) {

        mIcon = icon;

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

+1 −0
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ public class ButtonPreferenceTest { 


        final Button button = mPreference.getButton();

        assertThat(button.getText().toString()).isEqualTo(testTitle);

        assertThat(mPreference.getTitle().toString()).isEqualTo(testTitle);

    }



    @Test