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

resolved conflicts for merge of 3269c409 to lmp-mr1-dev-plus-aosp

Browse Source 
Change-Id: I21a6ffe22c40c5c308487926d26d28dcae7f186d
This commit is contained in:
Elliott Hughes
2014-10-04 09:38:07 -07:00
parent 1713fe2524 3269c409eb
commit 22ea4c41ae
6 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values-ar/strings.xml
View File

@@ -1515,7 +1515,6 @@
<string name="awake" msgid="387122265874485088">"وقت الوضع النشط للجهاز"</string>
<string name="wifi_on_time" msgid="3208518458663637035">"‏وقت تشغيل Wi-Fi"</string>
<string name="bluetooth_on_time" msgid="3056108148042308690">"‏وقت تشغيل Wi-Fi"</string>
<string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
<string name="history_details_title" msgid="3608240585315506067">"تفاصيل السجل"</string>
<string name="details_title" msgid="3792801565213935385">"تفاصيل الاستخدام"</string>
<string name="details_subtitle" msgid="32593908269911734">"استخدام التفاصيل"</string>

1
res/values-fa/strings.xml
View File

@@ -1515,7 +1515,6 @@
<string name="awake" msgid="387122265874485088">"زمان بیداری دستگاه"</string>
<string name="wifi_on_time" msgid="3208518458663637035">"‏Wi-Fi به موقع"</string>
<string name="bluetooth_on_time" msgid="3056108148042308690">"‏Wi-Fi به موقع"</string>
<string name="usage_name_percent" msgid="7976919382448235858">"<xliff:g id="NAME">%1$s</xliff:g> - <xliff:g id="NUMBER">%2$s</xliff:g><xliff:g id="PERCENT">%%</xliff:g>"</string>
<string name="history_details_title" msgid="3608240585315506067">"جزئیات سابقه"</string>
<string name="details_title" msgid="3792801565213935385">"جزئیات استفاده"</string>
<string name="details_subtitle" msgid="32593908269911734">"جزئیات استفاده"</string>

17
res/values/strings.xml
View File

@@ -3795,22 +3795,22 @@
<!-- Display time remaining until battery is charged [CHAR_LIMIT=60] -->
<string name="power_charge_remaining"><xliff:g id="until_charged">%1$s</xliff:g> to charge</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when discharging with duration -->
<string name="power_discharging_duration"><xliff:g id="level">%1$d</xliff:g>%%
<string name="power_discharging_duration"><xliff:g id="level">%1$s</xliff:g>
- approx. <xliff:g id="time">%2$s</xliff:g> left</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging -->
<string name="power_charging"><xliff:g id="level">%1$d</xliff:g>%% -
<string name="power_charging"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="state">%2$s</xliff:g></string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
<string name="power_charging_duration"><xliff:g id="level">%1$d</xliff:g>%% -
<string name="power_charging_duration"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="time">%2$s</xliff:g> until full</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
<string name="power_charging_duration_ac"><xliff:g id="level">%1$d</xliff:g>%% -
<string name="power_charging_duration_ac"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="time">%2$s</xliff:g> until full on AC</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
<string name="power_charging_duration_usb"><xliff:g id="level">%1$d</xliff:g>%% -
<string name="power_charging_duration_usb"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="time">%2$s</xliff:g> until full over USB</string>
<!-- [CHAR_LIMIT=40] Label for battery level chart when charging with duration -->
<string name="power_charging_duration_wireless"><xliff:g id="level">%1$d</xliff:g>%% -
<string name="power_charging_duration_wireless"><xliff:g id="level">%1$s</xliff:g> -
<xliff:g id="time">%2$s</xliff:g> until full from wireless</string>
<!-- [CHAR_LIMIT=40] Label for list of apps using battery in power use UI -->
<string name="power_usage_list_summary">Use since last full charge</string>
@@ -3842,9 +3842,6 @@
<string name="wifi_on_time">Wi\u2011Fi on time</string>
<!-- Bluetooth on time -->
<string name="bluetooth_on_time">Wi\u2011Fi on time</string>
<!-- Application name and battery usage percentage -->
<string name="usage_name_percent"><xliff:g id="name">%1$s</xliff:g>" - "
<xliff:g id="number" example="30">%2$s</xliff:g><xliff:g id="percent" example="%">%%</xliff:g></string>
<!-- Activity title for battery usage history details -->
<string name="history_details_title">History details</string>
@@ -4012,7 +4009,7 @@
<string name="battery_saver_turn_on_automatically_never">Never</string>
<!-- [CHAR_LIMIT=40] Battery saver: Value for automatic entry option: pct% battery -->
<string name="battery_saver_turn_on_automatically_pct">at %1$d%% battery</string>
<string name="battery_saver_turn_on_automatically_pct">at %1$s battery</string>
<!-- Process Stats strings -->
<skip />

3
src/com/android/settings/Utils.java
View File

@@ -335,8 +335,7 @@ public final class Utils {
/** Formats a double from 0.0..1.0 as a percentage. */
private static String formatPercentage(double percentage) {
BidiFormatter bf = BidiFormatter.getInstance();
return bf.unicodeWrap(NumberFormat.getPercentInstance().format(percentage));
return NumberFormat.getPercentInstance().format(percentage);
}
public static boolean isBatteryPresent(Intent batteryChangedIntent) {

9
src/com/android/settings/fuelgauge/BatteryHistoryChart.java
View File

@@ -494,6 +494,7 @@ public class BatteryHistoryChart extends View {
mMinPercentLabelString = Utils.formatPercentage(0);
mBatteryLevel = com.android.settings.Utils.getBatteryLevel(mBatteryBroadcast);
String batteryPercentString = Utils.formatPercentage(mBatteryLevel);
long remainingTimeUs = 0;
mDischarging = true;
if (mBatteryBroadcast.getIntExtra(BatteryManager.EXTRA_PLUGGED, 0) == 0) {
@@ -503,9 +504,9 @@ public class BatteryHistoryChart extends View {
String timeString = Formatter.formatShortElapsedTime(getContext(),
drainTime / 1000);
mChargeLabelString = getContext().getResources().getString(
R.string.power_discharging_duration, mBatteryLevel, timeString);
R.string.power_discharging_duration, batteryPercentString, timeString);
} else {
mChargeLabelString = Utils.formatPercentage(mBatteryLevel);
mChargeLabelString = batteryPercentString;
}
} else {
final long chargeTime = mStats.computeChargeTimeRemaining(elapsedRealtimeUs);
@@ -530,10 +531,10 @@ public class BatteryHistoryChart extends View {
resId = R.string.power_charging_duration;
}
mChargeLabelString = getContext().getResources().getString(
resId, mBatteryLevel, timeString);
resId, batteryPercentString, timeString);
} else {
mChargeLabelString = getContext().getResources().getString(
R.string.power_charging, mBatteryLevel, statusLabel);
R.string.power_charging, batteryPercentString, statusLabel);
}
}
mDrainString = "";

4
src/com/android/settings/fuelgauge/BatterySaverSettings.java
View File

@@ -37,6 +37,7 @@ import android.widget.Switch;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.Utils;
import com.android.settings.notification.SettingPref;
import com.android.settings.widget.SwitchBar;
@@ -78,7 +79,8 @@ public class BatterySaverSettings extends SettingsPreferenceFragment
@Override
protected String getCaption(Resources res, int value) {
if (value > 0 && value < 100) {
return res.getString(R.string.battery_saver_turn_on_automatically_pct, value);
return res.getString(R.string.battery_saver_turn_on_automatically_pct,
Utils.formatPercentage(value));
}
return res.getString(R.string.battery_saver_turn_on_automatically_never);
}