Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cf0cae78 authored by Lei Yu's avatar Lei Yu Committed by Android (Google) Code Review
Browse files

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

parents 6b65ffaa 206f406a

res/values/strings.xml

+40 −31
Original line number Diff line number Diff line
@@ -4824,37 +4824,41 @@ 
    <!-- Title for the battery summary tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_summary_title">Battery is in good shape</string>

    <!-- Summary for the battery summary tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_summary_summary">Apps are behaving normally</string>

    <string name="battery_tip_summary_summary">Apps are running normally</string>

    <!-- Title for the low battery tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_low_battery_title">Low battery capacity</string>

    <!-- Summary for the low battery tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_low_battery_summary">Battery can\'t provide good battery life</string>

    <!-- Title for the smart battery tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_smart_battery_title">Turn on smart battery manager</string>

    <string name="battery_tip_smart_battery_title" product="default">Improve your phone\'s battery life</string>

    <!-- Title for the smart battery tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_smart_battery_title" product="tablet">Improve your tablet\'s battery life</string>

    <!-- Title for the smart battery tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_smart_battery_title" product="device">Improve your device\'s battery life</string>

    <!-- Summary for the smart battery tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_smart_battery_summary">Turn on to optimize battery usage</string>

    <string name="battery_tip_smart_battery_summary">Turn on Battery Manager</string>

    <!-- Title for the early heads up tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_early_heads_up_title">Turn on Low Battery Mode</string>

    <string name="battery_tip_early_heads_up_title">Turn on Battery Saver</string>

    <!-- Summary for the early hedas up tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_early_heads_up_summary">Extend your battery life</string>

    <string name="battery_tip_early_heads_up_summary">Battery may run out earlier than usual</string>

    <!-- Title when early heads up is solved [CHAR LIMIT=NONE] -->

    <string name="battery_tip_early_heads_up_done_title">Low Battery Mode is on</string>

    <string name="battery_tip_early_heads_up_done_title">Battery Saver is on</string>

    <!-- Summary when early heads up is solved [CHAR LIMIT=NONE] -->

    <string name="battery_tip_early_heads_up_done_summary">Some features are limited</string>

    <string name="battery_tip_early_heads_up_done_summary">Some features may be limited</string>

    <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_high_usage_title" product="default">Phone used heavily</string>

    <string name="battery_tip_high_usage_title" product="default">Phone used more than usual</string>

    <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_high_usage_title" product="tablet">Tablet used heavily</string>

    <string name="battery_tip_high_usage_title" product="tablet">Tablet used more than usual</string>

    <!-- Title for the battery high usage tip [CHAR LIMIT=NONE] -->

    <string name="battery_tip_high_usage_title" product="device">Device used heavily</string>

    <!-- Summary for the battery high usage tip, which presents how many hours the device been used since last full charge [CHAR LIMIT=NONE] -->

    <string name="battery_tip_high_usage_summary">About <xliff:g id="hour">%1$s</xliff:g> used since last full charge</string>

    <string name="battery_tip_high_usage_title" product="device">Device used more than usual</string>

    <!-- Summary for the battery high usage tip, which presents battery may run out soon [CHAR LIMIT=NONE] -->

    <string name="battery_tip_high_usage_summary">Battery may run out soon</string>

    <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

    <string name="battery_tip_dialog_message" product="default">Your phone was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your phone was used for about <xliff:g id="hour">%1$s</xliff:g> since last full charge.\n\n Total usage:</string>

    <string name="battery_tip_dialog_message" product="default">Your phone has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps since last charge:</string>

    <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

    <string name="battery_tip_dialog_message" product="tablet">Your tablet was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your tablet was used for about <xliff:g id="hour">%1$s</xliff:g> since last full charge.\n\n Total usage:</string>

    <string name="battery_tip_dialog_message" product="tablet">Your tablet has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps since last charge:</string>

    <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->

    <string name="battery_tip_dialog_message" product="device">Your device was used heavily and this consumed a lot of battery. Your battery is behaving normally.\n\n Your device was used for about <xliff:g id="hour">%1$s</xliff:g> since last full charge.\n\n Total usage:</string>

    <string name="battery_tip_dialog_message" product="device">Your device has been used more than usual. Your battery may run out sooner than expected.\n\nTop <xliff:g id="number">%1$d</xliff:g> apps since last charge:</string>

    <!-- Title for restricted app preference, showing how many app need to be restricted [CHAR LIMIT=NONE] -->

    <plurals name="battery_tip_restrict_title">

        <item quantity="one">Restrict %1$d app</item>
@@ -4862,16 +4866,19 @@ 
    </plurals>

    <!-- Title for restricted app preference, showing how many app been restricted [CHAR LIMIT=NONE] -->

    <plurals name="battery_tip_restrict_handled_title">

        <item quantity="one">%1$d recently restricted</item>

        <item quantity="other">%1$d apps recently restricted</item>

        <item quantity="one">%1$s recently restricted</item>

        <item quantity="other">%2$d apps recently restricted</item>

    </plurals>

    <!-- Summary for restricted app preference, showing the impact of the apps [CHAR LIMIT=NONE] -->

    <plurals name="battery_tip_restrict_summary">

        <item quantity="one">%1$s has high battery usage</item>

        <item quantity="other">%2$d apps have high battery usage</item>

        <item quantity="one">%1$s has high background battery usage</item>

        <item quantity="other">%2$d apps have high background battery usage</item>

    </plurals>

    <!-- Summary for restricted app preference, showing the impact of the apps [CHAR LIMIT=NONE] -->

    <string name="battery_tip_restrict_handled_summary">App changes are in progress</string>

    <plurals name="battery_tip_restrict_handled_summary">

        <item quantity="one">This app can\'t run in the background</item>

        <item quantity="other">These apps can\'t run in the background</item>

    </plurals>









    <!-- Title for dialog to restrict the app [CHAR LIMIT=NONE] -->









    <plurals name="battery_tip_restrict_app_dialog_title">








@@ -4887,13 +4894,13 @@







    <!-- OK button for battery tip dialog to show the restrict app list [CHAR LIMIT=NONE] -->









    <string name="battery_tip_restrict_app_dialog_ok">Restrict</string>









    <!-- Title for dialog to remove restriction for the app [CHAR LIMIT=NONE] -->









    <string name="battery_tip_unrestrict_app_dialog_title">Remove restriction for <xliff:g id="app">%1$s</xliff:g>?</string>









    <string name="battery_tip_unrestrict_app_dialog_title">Remove restriction?</string>









    <!-- Message for  dialog to show the impact if remove restriction for app [CHAR LIMIT=NONE] -->









    <string name="battery_tip_unrestrict_app_dialog_message">This app will be able to use battery in the background. This may cause your battery to be used up faster.</string>









    <string name="battery_tip_unrestrict_app_dialog_message">This app will be able to use battery in the background. Your battery may run out sooner than expected.</string>









    <!-- OK button for dialog to remove restriction for app [CHAR LIMIT=NONE] -->









    <string name="battery_tip_unrestrict_app_dialog_ok">Remove</string>









    <!-- CANCEL button for dialog to remove restriction for app [CHAR LIMIT=NONE] -->









    <string name="battery_tip_unrestrict_app_dialog_cancel">Not now</string>









    <string name="battery_tip_unrestrict_app_dialog_cancel">Cancel</string>

















    <!-- Message for battery tip dialog to show the battery summary -->









    <string name="battery_tip_dialog_summary_message">Based on your usage, your battery usually lasts about <xliff:g id="time_duration">%1$s</xliff:g> when fully charged.\n\nIf you need to extend your battery life, turn on Battery Saver.</string>








@@ -4901,11 +4908,13 @@







    <string name="battery_tip_dialog_summary_message_no_estimation">If you need to extend your battery life, turn on Battery Saver</string>

















    <!-- Title for the smart battery manager preference [CHAR LIMIT=NONE] -->









    <string name="smart_battery_manager_title">Smart battery manager</string>









    <string name="smart_battery_manager_title">Battery Manager</string>









    <!-- Title for the smart battery toggle [CHAR LIMIT=NONE] -->









    <string name="smart_battery_title">Auto-manage battery</string>









    <string name="smart_battery_title">Manage apps automatically</string>









    <!-- Summary for the smart battery toggle [CHAR LIMIT=NONE] -->









    <string name="smart_battery_summary">Automatically adjust power usage by apps based on usage</string>









    <string name="smart_battery_summary">Limit battery for infrequently used apps and apps that consume battery</string>









    <!-- Footer for the aosp smart battery page -->









    <string name="smart_battery_footer">Battery Manager prevents apps from consuming battery when you aren\’t using them</string>









    <!-- Title for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] -->









    <string name="restricted_app_title">Restricted apps</string>









    <!-- Summary for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] -->








@@ -4914,6 +4923,9 @@







        <item quantity="other">%1$d apps</item>









    </plurals>

















    <!-- Footer message for restrict app details page -->









    <string name="restricted_app_detail_footer">Apps shown here aren\'t behaving properly and have been using battery in the background.\n\nThese apps are now blocked from using battery in the background. As a result, some app notifications may be delayed.</string>

















    <!-- Title for auto restriction toggle -->









    <string name="battery_auto_restriction_title">Restrict apps automatically</string>









    <!-- Summary for auto restriction toggle -->








@@ -5167,13 +5179,10 @@







    <string name="process_dex2oat_label">App optimization</string>

















    <!-- Battery saver: Label for feature, title + menu item [CHAR_LIMIT=40] -->









    <string name="battery_saver">Reduced power mode</string>









    <string name="battery_saver">Battery Saver</string>

















    <!-- Battery saver: Label for preference to turn on battery saver automatically when battery is low [CHAR_LIMIT=40] -->









    <string name="battery_saver_auto_title">Schedule</string>

















    <!-- Battery saver: Summary for preference to turn on battery saver automatically when battery is low [CHAR_LIMIT=40] -->









    <string name="battery_saver_auto_summary">Turn on Reduced power mode automatically when battery is low</string>









    <string name="battery_saver_auto_title">Turn on automatically</string>

















    <!-- Battery saver: Label for seekbar to change battery saver threshold [CHAR_LIMIT=40] -->









    <string name="battery_saver_seekbar_title">Turn on automatically at <xliff:g id="percent">%1$s</xliff:g></string>
































res/xml/battery_saver_settings.xml



+0
−1






























Original line number
Diff line number
Diff line







@@ -24,7 +24,6 @@







    <SwitchPreference









        android:key="auto_battery_saver"









        android:title="@string/battery_saver_auto_title"









        android:summary="@string/battery_saver_auto_summary"









        settings:controller="com.android.settings.fuelgauge.batterysaver.AutoBatterySaverPreferenceController"/>



















    <com.android.settings.widget.SeekBarPreference
































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



+5
−0






























Original line number
Diff line number
Diff line







@@ -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();
































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



+1
−1






























Original line number
Diff line number
Diff line







@@ -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
































src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java



+2
−4






























Original line number
Diff line number
Diff line







@@ -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)