Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I2466c461694e41f068318c408f52112bcbbd280a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jason Hsu
2022-08-17 03:32:25 +00:00
committed by Automerger Merge Worker
parent aa8a18b4d3 f568c59b88
commit 40274bf8bf
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/SettingsLib/ButtonPreference/src/com/android/settingslib/widget/ButtonPreference.java
View File

@@ -132,6 +132,11 @@ public class ButtonPreference extends Preference {
} }
} }
@Override
public CharSequence getTitle() {
return mTitle;
}
@Override @Override
public void setIcon(Drawable icon) { public void setIcon(Drawable icon) {
mIcon = icon; mIcon = icon;

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

@@ -63,6 +63,7 @@ public class ButtonPreferenceTest {
final Button button = mPreference.getButton(); final Button button = mPreference.getButton();
assertThat(button.getText().toString()).isEqualTo(testTitle); assertThat(button.getText().toString()).isEqualTo(testTitle);
assertThat(mPreference.getTitle().toString()).isEqualTo(testTitle);
} }
@Test @Test