PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683706

Change-Id: Ie01d33707536f511f144d82fc13b2d02f2825941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Darrell Shi
2022-12-12 17:01:34 +00:00
committed by Automerger Merge Worker
parent cd486c06d0 7bae5625a6
commit ef4fb09916
3 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -3378,6 +3378,10 @@
<string name="screensaver_settings_summary_dock">While docked</string> <string name="screensaver_settings_summary_dock">While docked</string>
<!-- Display settings screen, summary fragment for screen saver options, activated never [CHAR LIMIT=35] --> <!-- Display settings screen, summary fragment for screen saver options, activated never [CHAR LIMIT=35] -->
<string name="screensaver_settings_summary_never">Never</string> <string name="screensaver_settings_summary_never">Never</string>
<!-- Display settings screen, summary for screen saver options, screen saver is turned on [CHAR LIMIT=50] -->
<string name="screensaver_settings_summary_on">
On / <xliff:g id="screen_saver" example="Art gallery">%1$s</xliff:g>
</string>
<!-- Display settings screen, summary for screen saver options, screen saver is turned off [CHAR LIMIT=20] --> <!-- Display settings screen, summary for screen saver options, screen saver is turned off [CHAR LIMIT=20] -->
<string name="screensaver_settings_summary_off">Off</string> <string name="screensaver_settings_summary_off">Off</string>
<!-- Dream settings screen, action label, when to dream [CHAR LIMIT=20] --> <!-- Dream settings screen, action label, when to dream [CHAR LIMIT=20] -->

7
src/com/android/settings/dream/DreamSettings.java
View File

@@ -138,10 +138,11 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
@VisibleForTesting @VisibleForTesting
static CharSequence getSummaryTextFromBackend(DreamBackend backend, Context context) { static CharSequence getSummaryTextFromBackend(DreamBackend backend, Context context) {
if (!backend.isEnabled()) { if (backend.isEnabled()) {
return context.getString(R.string.screensaver_settings_summary_off); return context.getString(R.string.screensaver_settings_summary_on,
backend.getActiveDreamName());
} else { } else {
return backend.getActiveDreamName(); return context.getString(R.string.screensaver_settings_summary_off);
} }
} }

23
tests/robotests/src/com/android/settings/dream/DreamSettingsTest.java
View File

@@ -18,6 +18,8 @@ package com.android.settings.dream;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
@@ -104,23 +106,28 @@ public class DreamSettingsTest {
@Test @Test
public void summaryText_whenDreamsAreOff() { public void summaryText_whenDreamsAreOff() {
DreamBackend mockBackend = mock(DreamBackend.class); final String fakeSummaryOff = "test dream off";
Context mockContext = mock(Context.class); final DreamBackend mockBackend = mock(DreamBackend.class);
final Context mockContext = mock(Context.class);
when(mockBackend.isEnabled()).thenReturn(false); when(mockBackend.isEnabled()).thenReturn(false);
when(mockContext.getString(R.string.screensaver_settings_summary_off)).thenReturn(
fakeSummaryOff);
assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext)) assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext)).isEqualTo(
.isEqualTo(mockContext.getString(R.string.screensaver_settings_summary_off)); fakeSummaryOff);
} }
@Test @Test
public void summaryTest_WhenDreamsAreOn() { public void summaryTest_WhenDreamsAreOn() {
final String fakeName = "test_name"; final String fakeName = "test_name";
DreamBackend mockBackend = mock(DreamBackend.class); final DreamBackend mockBackend = mock(DreamBackend.class);
Context mockContext = mock(Context.class); final Context mockContext = mock(Context.class);
when(mockBackend.isEnabled()).thenReturn(true); when(mockBackend.isEnabled()).thenReturn(true);
when(mockBackend.getActiveDreamName()).thenReturn(fakeName); when(mockBackend.getActiveDreamName()).thenReturn(fakeName);
when(mockContext.getString(eq(R.string.screensaver_settings_summary_on), anyString()))
.thenAnswer(i -> i.getArgument(1) + " test dream is on");
assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext)) assertThat(DreamSettings.getSummaryTextFromBackend(mockBackend, mockContext)).isEqualTo(
.isEqualTo(fakeName); fakeName + " test dream is on");
} }
} }