From adddc30c649a0e4de6ce29d156549ad43d28a619 Mon Sep 17 00:00:00 2001 From: Lei Yu Date: Tue, 8 May 2018 13:06:42 -0700 Subject: [PATCH] Update strings for summary tip. 1. Strings for the tip preference 2. Strings for the tip dialog Change-Id: I59c371328ec735a0b22f707d440f3be85cf59c77 Fixes: 79171948 Test: Manual & RunSettingsRoboTests --- res/values/strings.xml | 14 +++++++++---- .../batterytip/BatteryTipDialogFragment.java | 10 +--------- .../BatteryTipDialogFragmentTest.java | 20 ++++--------------- .../BatteryTipPreferenceControllerTest.java | 7 +++++-- 4 files changed, 20 insertions(+), 31 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index cc4b1c440d0..c327056e444 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -4995,9 +4995,13 @@ %1$d apps misbehaving - Battery is in good shape + Apps are running normally - Apps are running normally + Phone has typical background battery usage + + Tablet has typical background battery usage + + Device has typical background battery usage Low battery capacity @@ -5076,9 +5080,11 @@ Cancel - Based on your usage, your battery usually lasts about %1$s when fully charged.\n\nIf you need to extend your battery life, turn on Battery Saver. + Your apps are using a normal amount of battery. If apps use too much battery, your phone will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery. - If you need to extend your battery life, turn on Battery Saver + Your apps are using a normal amount of battery. If apps use too much battery, your tablet will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery. + + Your apps are using a normal amount of battery. If apps use too much battery, your device will suggest actions you can take.\n\nYou can always turn on Battery Saver if you\u2019re running low on battery. Battery Manager diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java index 74c65f955ee..ac6d6229e3b 100644 --- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java +++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java @@ -79,16 +79,8 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme switch (mBatteryTip.getType()) { case BatteryTip.TipType.SUMMARY: - final long averageTimeMs = ((SummaryTip) mBatteryTip).getAverageTimeMs(); - final String message = context.getString( - averageTimeMs == Estimate.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN - ? R.string.battery_tip_dialog_summary_message_no_estimation - : R.string.battery_tip_dialog_summary_message, - StringUtil.formatElapsedTime(context, averageTimeMs, - false /* withSeconds */)); - return new AlertDialog.Builder(context) - .setMessage(message) + .setMessage(R.string.battery_tip_dialog_summary_message) .setPositiveButton(android.R.string.ok, null) .create(); case BatteryTip.TipType.HIGH_DEVICE_USAGE: diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java index 1de1e486c94..7a41921789d 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java @@ -199,7 +199,7 @@ public class BatteryTipDialogFragmentTest { } @Test - public void testOnCreateDialog_summaryTipWithEstimation_fireDialogWithEstimation() { + public void testOnCreateDialog_summaryTip_fireDialog() { doReturn(AVERAGE_TIME_MS).when(mSummaryTip).getAverageTimeMs(); mDialogFragment = BatteryTipDialogFragment.newInstance(mSummaryTip, METRICS_KEY); @@ -209,20 +209,8 @@ public class BatteryTipDialogFragmentTest { ShadowAlertDialog shadowDialog = shadowOf(dialog); assertThat(shadowDialog.getMessage()).isEqualTo( - "Based on your usage, your battery usually lasts about 1 hr when fully charged" - + ".\n\nIf you need to extend your battery life, turn on Battery Saver."); - } - - @Test - public void testOnCreateDialog_summaryTipWithoutEstimation_fireDialogWithoutEstimation() { - mDialogFragment = BatteryTipDialogFragment.newInstance(mSummaryTip, METRICS_KEY); - - FragmentTestUtil.startFragment(mDialogFragment); - - final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog(); - ShadowAlertDialog shadowDialog = shadowOf(dialog); - - assertThat(shadowDialog.getMessage()).isEqualTo( - "If you need to extend your battery life, turn on Battery Saver"); + "Your apps are using a normal amount of battery. If apps use too much battery, " + + "your phone will suggest actions you can take.\n\nYou can always turn" + + " on Battery Saver if you’re running low on battery."); } } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java index 90d00fcccb9..ba829b13fd8 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java @@ -37,6 +37,7 @@ import android.support.v7.preference.PreferenceScreen; import android.text.format.DateUtils; import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; @@ -181,7 +182,9 @@ public class BatteryTipPreferenceControllerTest { assertThat(preferenceGroup.getPreferenceCount()).isEqualTo(1); final Preference preference = preferenceGroup.getPreference(0); - assertThat(preference.getTitle()).isEqualTo("Battery is in good shape"); - assertThat(preference.getSummary()).isEqualTo("Apps are running normally"); + assertThat(preference.getTitle()).isEqualTo( + mContext.getString(R.string.battery_tip_summary_title)); + assertThat(preference.getSummary()).isEqualTo( + mContext.getString(R.string.battery_tip_summary_summary)); } }