Merge "use different description strings for screen attention settings and contextual card" into qt-r1-dev am: d81e2c36f6

am: b7098b181f

Change-Id: I6cbea478176361733957adb06e63f1e9b58f1c8b
This commit is contained in:
Yi Jiang
2019-06-05 20:40:29 -07:00
committed by android-build-merger
2 changed files with 6 additions and 4 deletions

View File

@@ -80,7 +80,8 @@ public class ContextualAdaptiveSleepSlice implements CustomSliceable {
final IconCompat icon = IconCompat.createWithResource(mContext,
R.drawable.ic_settings_adaptive_sleep);
final CharSequence title = mContext.getText(R.string.adaptive_sleep_title);
final CharSequence subtitle = mContext.getText(R.string.adaptive_sleep_description);
final CharSequence subtitle = mContext.getText(
R.string.adaptive_sleep_contextual_slice_summary);
final SliceAction pAction = SliceAction.createDeeplink(getPrimaryAction(),
icon,