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

Merge "Get clock title on demand"

Browse Source 
am: 7da7428409

Change-Id: I2127e29ce43888a376eac13314e08ae0f42d9acc
This commit is contained in:
Robert Snoeberger
2019-12-16 06:52:46 -08:00
committed by android-build-merger
parent 001cf41de5 7da7428409
commit f17c2e2e8e
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/keyguard/clock/ClockInfo.java
View File

@@ -25,12 +25,12 @@ import java.util.function.Supplier;
final class ClockInfo {
private final String mName;
private final String mTitle;
private final Supplier<String> mTitle;
private final String mId;
private final Supplier<Bitmap> mThumbnail;
private final Supplier<Bitmap> mPreview;
private ClockInfo(String name, String title, String id,
private ClockInfo(String name, Supplier<String> title, String id,
Supplier<Bitmap> thumbnail, Supplier<Bitmap> preview) {
mName = name;
mTitle = title;
@@ -50,7 +50,7 @@ final class ClockInfo {
* Gets the name (title) of the clock face to be shown in the picker app.
*/
String getTitle() {
return mTitle;
return mTitle.get();
}
/**
@@ -80,7 +80,7 @@ final class ClockInfo {
static class Builder {
private String mName;
private String mTitle;
private Supplier<String> mTitle;
private String mId;
private Supplier<Bitmap> mThumbnail;
private Supplier<Bitmap> mPreview;
@@ -94,7 +94,7 @@ final class ClockInfo {
return this;
}
public Builder setTitle(String title) {
public Builder setTitle(Supplier<String> title) {
mTitle = title;
return this;
}

2
packages/SystemUI/src/com/android/keyguard/clock/ClockManager.java
View File

@@ -322,7 +322,7 @@ public final class ClockManager {
mClocks.put(plugin.getClass().getName(), plugin);
mClockInfo.add(ClockInfo.builder()
.setName(plugin.getName())
.setTitle(plugin.getTitle())
.setTitle(plugin::getTitle)
.setId(id)
.setThumbnail(plugin::getThumbnail)
.setPreview(() -> plugin.getPreview(mWidth, mHeight))

2
packages/SystemUI/tests/src/com/android/keyguard/clock/ClockInfoTest.java
View File

@@ -57,7 +57,7 @@ public final class ClockInfoTest extends SysuiTestCase {
@Test
public void testGetTitle() {
final String title = "title";
ClockInfo info = ClockInfo.builder().setTitle(title).build();
ClockInfo info = ClockInfo.builder().setTitle(() -> title).build();
assertThat(info.getTitle()).isEqualTo(title);
}

4
packages/SystemUI/tests/src/com/android/keyguard/clock/ClockOptionsProviderTest.java
View File

@@ -117,12 +117,12 @@ public final class ClockOptionsProviderTest extends SysuiTestCase {
public void testQuery_listOptions() {
mClocks.add(ClockInfo.builder()
.setName("name_a")
.setTitle("title_a")
.setTitle(() -> "title_a")
.setId("id_a")
.build());
mClocks.add(ClockInfo.builder()
.setName("name_b")
.setTitle("title_b")
.setTitle(() -> "title_b")
.setId("id_b")
.build());
Cursor cursor = mProvider.query(mListOptionsUri, null, null, null);