Merge "Update duration text" into pi-dev (825ac25e) · Commits · e / os / android_frameworks_base

packages/SettingsLib/res/values/strings.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -1093,4 +1093,7 @@
		<string name="zen_mode_duration_settings_title">Duration</string>
		<!-- Do not disturb: Duration option to always prompt for the duration of dnd -->
		<string name="zen_mode_duration_always_prompt_title">Ask every time</string>

		<!-- time label for event have that happened very recently [CHAR LIMIT=60] -->
		<string name="time_unit_just_now">Just now</string>
		</resources>

packages/SettingsLib/src/com/android/settingslib/utils/StringUtil.java

+5 −3

Original line number	Diff line number	Diff line
		@@ -27,6 +27,9 @@ import android.icu.util.ULocale;
		import android.text.SpannableStringBuilder;
		import android.text.Spanned;
		import android.text.style.TtsSpan;

		import com.android.settingslib.R;

		import java.util.ArrayList;
		import java.util.Locale;

		@@ -121,8 +124,7 @@ public class StringUtil {
		final RelativeUnit unit;
		final int value;
		if (withSeconds && seconds < 2 * SECONDS_PER_MINUTE) {
		unit = RelativeUnit.SECONDS;
		value = seconds;
		return context.getResources().getString(R.string.time_unit_just_now);
		} else if (seconds < 2 * SECONDS_PER_HOUR) {
		unit = RelativeUnit.MINUTES;
		value = (seconds + SECONDS_PER_MINUTE / 2)
		@@ -141,7 +143,7 @@ public class StringUtil {
		final RelativeDateTimeFormatter formatter = RelativeDateTimeFormatter.getInstance(
		ULocale.forLocale(locale),
		null /* default NumberFormat */,
		RelativeDateTimeFormatter.Style.SHORT,
		RelativeDateTimeFormatter.Style.LONG,
		android.icu.text.DisplayContext.CAPITALIZATION_FOR_MIDDLE_OF_SENTENCE);

		return formatter.format(value, RelativeDateTimeFormatter.Direction.LAST, unit);

packages/SettingsLib/tests/robotests/src/com/android/settingslib/utils/StringUtilTest.java

+10 −10

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_WithSeconds_ShowSeconds() {
		final double testMillis = 40 * DateUtils.SECOND_IN_MILLIS;
		final String expectedTime = "40 sec. ago";
		final String expectedTime = "Just now";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
		expectedTime);
		@@ -123,7 +123,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_NoSeconds_DoNotShowSeconds() {
		final double testMillis = 40 * DateUtils.SECOND_IN_MILLIS;
		final String expectedTime = "1 min. ago";
		final String expectedTime = "1 minute ago";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, false).toString()).isEqualTo(
		expectedTime);
		@@ -132,7 +132,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_LessThanTwoMinutes_withSeconds() {
		final double testMillis = 119 * DateUtils.SECOND_IN_MILLIS;
		final String expectedTime = "119 sec. ago";
		final String expectedTime = "Just now";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
		expectedTime);
		@@ -141,7 +141,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_LessThanTwoMinutes_NoSeconds() {
		final double testMillis = 119 * DateUtils.SECOND_IN_MILLIS;
		final String expectedTime = "2 min. ago";
		final String expectedTime = "2 minutes ago";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, false).toString()).isEqualTo(
		expectedTime);
		@@ -150,7 +150,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_TwoMinutes_withSeconds() {
		final double testMillis = 2 * DateUtils.MINUTE_IN_MILLIS;
		final String expectedTime = "2 min. ago";
		final String expectedTime = "2 minutes ago";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
		expectedTime);
		@@ -159,7 +159,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_LessThanTwoHours_withSeconds() {
		final double testMillis = 119 * DateUtils.MINUTE_IN_MILLIS;
		final String expectedTime = "119 min. ago";
		final String expectedTime = "119 minutes ago";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
		expectedTime);
		@@ -168,7 +168,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_TwoHours_withSeconds() {
		final double testMillis = 2 * DateUtils.HOUR_IN_MILLIS;
		final String expectedTime = "2 hr. ago";
		final String expectedTime = "2 hours ago";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
		expectedTime);
		@@ -177,7 +177,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_LessThanTwoDays_withSeconds() {
		final double testMillis = 47 * DateUtils.HOUR_IN_MILLIS;
		final String expectedTime = "47 hr. ago";
		final String expectedTime = "47 hours ago";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
		expectedTime);
		@@ -195,7 +195,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_FormatZero_WithSeconds() {
		final double testMillis = 0;
		final String expectedTime = "0 sec. ago";
		final String expectedTime = "Just now";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, true).toString()).isEqualTo(
		expectedTime);
		@@ -204,7 +204,7 @@ public class StringUtilTest {
		@Test
		public void testFormatRelativeTime_FormatZero_NoSeconds() {
		final double testMillis = 0;
		final String expectedTime = "0 min. ago";
		final String expectedTime = "0 minutes ago";

		assertThat(StringUtil.formatRelativeTime(mContext, testMillis, false).toString()).isEqualTo(
		expectedTime);