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

Merge "update strings in battery settings(Round 1)" into pi-dev

Browse Source
This commit is contained in:
Lei Yu
2018-03-16 18:26:49 +00:00
committed by Android (Google) Code Review
parent 6b65ffaab7 206f406aeb
commit cf0cae785f
12 changed files with 94 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/fuelgauge/RestrictedAppDetails.java
View File

@@ -39,6 +39,7 @@ import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.fuelgauge.batterytip.AppInfo;
import com.android.settings.widget.AppCheckBoxPreference;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.FooterPreferenceMixin;
import java.util.List;
@@ -63,6 +64,8 @@ public class RestrictedAppDetails extends DashboardFragment {
BatteryUtils mBatteryUtils;
@VisibleForTesting
PackageManager mPackageManager;
private final FooterPreferenceMixin mFooterPreferenceMixin =
new FooterPreferenceMixin(this, getLifecycle());
public static void startRestrictedAppDetails(SettingsActivity caller,
InstrumentedPreferenceFragment fragment, List<AppInfo> appInfos) {
@@ -82,6 +85,8 @@ public class RestrictedAppDetails extends DashboardFragment {
super.onCreate(icicle);
final Context context = getContext();
mFooterPreferenceMixin.createFooterPreference().setTitle(
R.string.restricted_app_detail_footer);
mRestrictedAppListGroup = (PreferenceGroup) findPreference(KEY_PREF_RESTRICTED_APP_LIST);
mAppInfos = getArguments().getParcelableArrayList(EXTRA_APP_INFO_LIST);
mPackageManager = context.getPackageManager();

2
src/com/android/settings/fuelgauge/SmartBatterySettings.java
View File

@@ -45,7 +45,7 @@ public class SmartBatterySettings extends DashboardFragment {
@Override
public void onCreate(Bundle icicle) {
super.onCreate(icicle);
mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.battery_footer_summary);
mFooterPreferenceMixin.createFooterPreference().setTitle(R.string.smart_battery_footer);
}
@Override

6
src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
View File

@@ -97,9 +97,7 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme
return new AlertDialog.Builder(context)
.setMessage(getString(R.string.battery_tip_dialog_message,
StringUtil.formatElapsedTime(
context, highUsageTip.getScreenTimeMs(),
false /* withSeconds */)))
highUsageTip.getHighUsageAppList().size()))
.setView(view)
.setPositiveButton(android.R.string.ok, null)
.create();
@@ -140,7 +138,7 @@ public class BatteryTipDialogFragment extends InstrumentedDialogFragment impleme
unrestrictAppTip.getPackageName());
return new AlertDialog.Builder(context)
.setTitle(getString(R.string.battery_tip_unrestrict_app_dialog_title, name))
.setTitle(getString(R.string.battery_tip_unrestrict_app_dialog_title))
.setMessage(R.string.battery_tip_unrestrict_app_dialog_message)
.setPositiveButton(R.string.battery_tip_unrestrict_app_dialog_ok, this)
.setNegativeButton(R.string.battery_tip_unrestrict_app_dialog_cancel, null)

3
src/com/android/settings/fuelgauge/batterytip/tips/HighUsageTip.java
View File

@@ -66,8 +66,7 @@ public class HighUsageTip extends BatteryTip {
@Override
public CharSequence getSummary(Context context) {
return context.getString(R.string.battery_tip_high_usage_summary,
StringUtil.formatElapsedTime(context, mScreenTimeMs, false));
return context.getString(R.string.battery_tip_high_usage_summary);
}
@Override

22
src/com/android/settings/fuelgauge/batterytip/tips/RestrictAppTip.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.fuelgauge.batterytip.tips;
import android.content.Context;
import android.content.res.Resources;
import android.icu.text.ListFormatter;
import android.os.Parcel;
import android.text.TextUtils;
@@ -58,11 +59,14 @@ public class RestrictAppTip extends BatteryTip {
@Override
public CharSequence getTitle(Context context) {
final int num = mRestrictAppList.size();
return context.getResources().getQuantityString(
mState == StateType.HANDLED
? R.plurals.battery_tip_restrict_handled_title
: R.plurals.battery_tip_restrict_title,
num, num);
final CharSequence appLabel = num > 0 ? Utils.getApplicationLabel(context,
mRestrictAppList.get(0).packageName) : "";
final Resources resources = context.getResources();
return mState == StateType.HANDLED
? resources.getQuantityString(R.plurals.battery_tip_restrict_handled_title, num,
appLabel, num)
: resources.getQuantityString(R.plurals.battery_tip_restrict_title, num, num);
}
@Override
@@ -70,10 +74,10 @@ public class RestrictAppTip extends BatteryTip {
final int num = mRestrictAppList.size();
final CharSequence appLabel = num > 0 ? Utils.getApplicationLabel(context,
mRestrictAppList.get(0).packageName) : "";
return mState == StateType.HANDLED
? context.getString(R.string.battery_tip_restrict_handled_summary)
: context.getResources().getQuantityString(R.plurals.battery_tip_restrict_summary,
num, appLabel, num);
final int resId = mState == StateType.HANDLED
? R.plurals.battery_tip_restrict_handled_summary
: R.plurals.battery_tip_restrict_summary;
return context.getResources().getQuantityString(resId, num, appLabel, num);
}
@Override