Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6
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:
@@ -138,10 +138,11 @@ public class DreamSettings extends DashboardFragment implements OnMainSwitchChan
|
||||
|
||||
@VisibleForTesting
|
||||
static CharSequence getSummaryTextFromBackend(DreamBackend backend, Context context) {
|
||||
if (!backend.isEnabled()) {
|
||||
return context.getString(R.string.screensaver_settings_summary_off);
|
||||
if (backend.isEnabled()) {
|
||||
return context.getString(R.string.screensaver_settings_summary_on,
|
||||
backend.getActiveDreamName());
|
||||
} else {
|
||||
return backend.getActiveDreamName();
|
||||
return context.getString(R.string.screensaver_settings_summary_off);
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user