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

update strings in battery settings(Round 1)

Browse Source 
This cl updates the strings in several battery
settings pages and dialogs, also add footers
for battery manager page and restrict app page.

Update the strings in battery settings except:
1. Summary for smart battery toggle
2. "Full charge lasts"
3. Restrict dialog
4. App info page

Bug: 73018395
Test: RunSettingsRoboTests
Change-Id: I4955cc7c19b5f1df18f21cfb47e8859c997e19d1
This commit is contained in:
Lei Yu
2018-03-13 14:19:04 -07:00
parent 34bfe74249
commit 206f406aeb
12 changed files with 94 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
View File

@@ -112,7 +112,7 @@ public class BatteryTipDialogFragmentTest {
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getMessage())
.isEqualTo(mContext.getString(R.string.battery_tip_dialog_message, "1h"));
.isEqualTo(mContext.getString(R.string.battery_tip_dialog_message, 1));
}
@Test
@@ -185,7 +185,7 @@ public class BatteryTipDialogFragmentTest {
final AlertDialog dialog = (AlertDialog) ShadowDialog.getLatestDialog();
ShadowAlertDialog shadowDialog = shadowOf(dialog);
assertThat(shadowDialog.getTitle()).isEqualTo("Remove restriction for app?");
assertThat(shadowDialog.getTitle()).isEqualTo("Remove restriction?");
assertThat(shadowDialog.getMessage())
.isEqualTo(mContext.getString(R.string.battery_tip_unrestrict_app_dialog_message));
}

2
tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipPreferenceControllerTest.java
View File

@@ -150,6 +150,6 @@ public class BatteryTipPreferenceControllerTest {
final Preference preference = preferenceGroup.getPreference(0);
assertThat(preference.getTitle()).isEqualTo("Battery is in good shape");
assertThat(preference.getSummary()).isEqualTo("Apps are behaving normally");
assertThat(preference.getSummary()).isEqualTo("Apps are running normally");
}
}

8
tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/EarlyWarningTipTest.java
View File

@@ -67,8 +67,8 @@ public class EarlyWarningTipTest {
final EarlyWarningTip tip =
new EarlyWarningTip(BatteryTip.StateType.NEW, false /* powerModeOn */);
assertThat(tip.getTitle(mContext)).isEqualTo("Turn on Low Battery Mode");
assertThat(tip.getSummary(mContext)).isEqualTo("Extend your battery life");
assertThat(tip.getTitle(mContext)).isEqualTo("Turn on Battery Saver");
assertThat(tip.getSummary(mContext)).isEqualTo("Battery may run out earlier than usual");
assertThat(tip.getIconId()).isEqualTo(R.drawable.ic_battery_alert_24dp);
}
@@ -77,8 +77,8 @@ public class EarlyWarningTipTest {
final EarlyWarningTip tip =
new EarlyWarningTip(BatteryTip.StateType.HANDLED, false /* powerModeOn */);
assertThat(tip.getTitle(mContext)).isEqualTo("Low Battery Mode is on");
assertThat(tip.getSummary(mContext)).isEqualTo("Some features are limited");
assertThat(tip.getTitle(mContext)).isEqualTo("Battery Saver is on");
assertThat(tip.getSummary(mContext)).isEqualTo("Some features may be limited");
assertThat(tip.getIconId()).isEqualTo(R.drawable.ic_perm_device_information_green_24dp);
}

2
tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTipTest.java
View File

@@ -72,7 +72,7 @@ public class HighUsageTipTest {
final HighUsageTip parcelTip = new HighUsageTip(parcel);
assertThat(parcelTip.getTitle(mContext)).isEqualTo("Phone used heavily");
assertThat(parcelTip.getTitle(mContext)).isEqualTo("Phone used more than usual");
assertThat(parcelTip.getType()).isEqualTo(BatteryTip.TipType.HIGH_DEVICE_USAGE);
assertThat(parcelTip.getState()).isEqualTo(BatteryTip.StateType.NEW);
assertThat(parcelTip.getScreenTimeMs()).isEqualTo(SCREEN_TIME);

29
tests/robotests/src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTipTest.java
View File

@@ -32,8 +32,10 @@ import android.os.Parcel;
import android.util.Pair;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import org.junit.Before;
@@ -106,20 +108,37 @@ public class RestrictAppTipTest {
}
@Test
public void getTitle_stateHandled_showHandledTitle() {
assertThat(mHandledBatteryTip.getTitle(mContext)).isEqualTo("1 recently restricted");
public void getTitle_oneAppHandled_showHandledTitle() {
assertThat(mHandledBatteryTip.getTitle(mContext)).isEqualTo("app recently restricted");
}
@Test
public void getTitle_moreAppsHandled_showHandledTitle() {
mUsageAppList.add(new AppInfo.Builder().build());
mHandledBatteryTip = new RestrictAppTip(BatteryTip.StateType.HANDLED, mUsageAppList);
assertThat(mHandledBatteryTip.getTitle(mContext)).isEqualTo("2 apps recently restricted");
}
@Test
public void getSummary_stateNew_showRestrictSummary() {
assertThat(mNewBatteryTip.getSummary(mContext))
.isEqualTo("app has high battery usage");
.isEqualTo("app has high background battery usage");
}
@Test
public void getSummary_stateHandled_showHandledSummary() {
public void getSummary_oneAppHandled_showHandledSummary() {
assertThat(mHandledBatteryTip.getSummary(mContext).toString())
.isEqualTo(mContext.getResources().getQuantityString(
R.plurals.battery_tip_restrict_handled_summary, 1));
}
@Test
public void getSummary_moreAppsHandled_showHandledSummary() {
mUsageAppList.add(new AppInfo.Builder().build());
mHandledBatteryTip = new RestrictAppTip(BatteryTip.StateType.HANDLED, mUsageAppList);
assertThat(mHandledBatteryTip.getSummary(mContext))
.isEqualTo("App changes are in progress");
.isEqualTo(mContext.getResources().getQuantityString(
R.plurals.battery_tip_restrict_handled_summary, 2));
}
@Test