Merge "Shorten main settings battery string" into oc-mr1-dev (4e963f8f) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/fuelgauge/BatteryInfo.java

+2 −4

Original line number	Diff line number	Diff line
		@@ -219,9 +219,7 @@ public class BatteryInfo {
		CharSequence timeString = Utils.formatElapsedTime(context,
		BatteryUtils.convertUsToMs(drainTimeUs), false /* withSeconds */);
		info.remainingLabel = TextUtils.expandTemplate(context.getText(shortString ?
		(basedOnUsage ?
		R.string.power_remaining_duration_only_short_enhanced :
		R.string.power_remaining_duration_only_short) :
		R.string.power_remaining_duration_only_short :
		(basedOnUsage ?
		R.string.power_remaining_duration_only_enhanced :
		R.string.power_remaining_duration_only)), timeString);

+1 −1

Original line number	Diff line number	Diff line
		@@ -887,7 +887,7 @@ public class PowerUsageSummary extends PowerUsageBase implements
		public void onBatteryInfoLoaded(BatteryInfo info) {
		mLoader.setSummary(SummaryProvider.this, info.chargeLabel);
		}
		});
		}, true /* shortString */);
		});
		}

+4 −2

Original line number	Diff line number	Diff line
		@@ -131,7 +131,7 @@ public class BatteryInfoTest {
		}

		@Test
		public void testGetBatteryInfo_basedOnUsageTrue_usesUsageString() {
		public void testGetBatteryInfo_basedOnUsageTrue_usesCorrectString() {
		BatteryInfo info = BatteryInfo.getBatteryInfo(mContext, mDisChargingBatteryBroadcast,
		mBatteryStats, SystemClock.elapsedRealtime() * 1000, false /* shortString */,
		1000, true /* basedOnUsage */);
		@@ -139,8 +139,10 @@ public class BatteryInfoTest {
		mBatteryStats, SystemClock.elapsedRealtime() * 1000, true /* shortString */,
		1000, true /* basedOnUsage */);

		// We only add special mention for the long string
		assertThat(info.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
		assertThat(info2.remainingLabel.toString()).contains(ENHANCED_STRING_SUFFIX);
		// shortened string should not have extra text
		assertThat(info2.remainingLabel.toString()).doesNotContain(ENHANCED_STRING_SUFFIX);
		}

		@Test