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

Commit 40274bf8 authored by Jason Hsu's avatar Jason Hsu Committed by Automerger Merge Worker
Browse files

Merge "Add getTitle() for ButtonPreference" into tm-qpr-dev am: f568c59b 

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



Change-Id: I2466c461694e41f068318c408f52112bcbbd280a
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents aa8a18b4 f568c59b

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

+5 −0
Original line number Diff line number Diff line
@@ -132,6 +132,11 @@ 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