From fa6acf364fbf2e039a455b719ff9dd3eb42aa384 Mon Sep 17 00:00:00 2001 From: jasonwshsu Date: Tue, 9 Aug 2022 13:52:58 +0800 Subject: [PATCH] Add getTitle() for ButtonPreference Bug: 233038449 Test: make RunSettingsRoboTests ROBOTEST_FILTER=ButtonPreferenceTest Change-Id: Ie2f24879bce026e5bc3d7fedfcb3a6475ab7d404 --- .../src/com/android/settingslib/widget/ButtonPreference.java | 4 ++++ .../com/android/settingslib/widget/ButtonPreferenceTest.java | 1 + 2 files changed, 5 insertions(+) diff --git a/packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java b/packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java index 56d2967099144..5364783b4c68a 100644 --- a/packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java +++ b/packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java @@ -132,6 +132,10 @@ public class ButtonPreference extends Preference { } } + @Override public CharSequence getTitle() { + return mTitle; + } + @Override public void setIcon(Drawable icon) { mIcon = icon; diff --git a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ButtonPreferenceTest.java b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ButtonPreferenceTest.java index 625b214544f19..d78f8e7e4e9b9 100644 --- a/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ButtonPreferenceTest.java +++ b/packages/SettingsLib/tests/robotests/src/com/android/settingslib/widget/ButtonPreferenceTest.java @@ -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