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

Commit d36c2f7c authored by Tiffany Nguyen's avatar Tiffany Nguyen Committed by Automerger Merge Worker
Browse files

Align strings and UX across the different pages. am: c2ad30d4 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19728353



Change-Id: I0eabd6c4dd7f42020c2551f1f63f1cf20de33b23
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 9e491e0f c2ad30d4

res/values/strings.xml

+5 −5
Original line number Diff line number Diff line
@@ -6370,7 +6370,7 @@ 
    <string name="advanced_battery_preference_summary">View usage from last full charge</string>









    <!-- Activity title for battery usage details for an app. or power consumer -->









    <string name="battery_details_title">Battery usage</string>









    <string name="battery_details_title">App battery usage</string>









    <!-- Subtitle for application/subsystem details -->









    <string name="details_subtitle">Use details</string>









    <!-- Subtitle for possible options -->








@@ -11796,11 +11796,11 @@







    <!-- [CHAR_LIMIT=NONE] Label for when app is ignoring battery optimizations -->









    <string name="not_battery_optimizing">Not using battery optimization</string>

















    <!-- Preference title for battery optimization list page[CHAR_LIMIT=50]-->









    <string name="app_battery_optimization_title">Manage battery usage</string>









    <!-- Preference title for battery usage list page[CHAR_LIMIT=50]-->









    <string name="app_battery_usage_title">App battery usage</string>

















    <!-- Preference summary for battery optimization list page[CHAR_LIMIT=50]-->









    <string name="app_battery_optimization_summary">Set battery usage for apps</string>









    <!-- Preference summary for battery usage list page[CHAR_LIMIT=50]-->









    <string name="app_battery_usage_summary">Set battery usage for apps</string>

















    <!-- Filter title for battery unrestricted[CHAR_LIMIT=50]-->









    <string name="filter_battery_unrestricted_title">Unrestricted</string>

























res/xml/app_info_settings.xml



+1
−1






























Original line number
Diff line number
Diff line







@@ -85,7 +85,7 @@

















    <Preference









        android:key="battery"









        android:title="@string/power_usage_summary_title"









        android:title="@string/app_battery_usage_title"









        android:summary="@string/summary_placeholder" />



















    <Preference
































res/xml/apps.xml



+2
−2






























Original line number
Diff line number
Diff line







@@ -79,8 +79,8 @@







    <Preference









        android:key="app_battery_usage"









        android:order="17"









        android:title="@string/app_battery_optimization_title"









        android:summary="@string/app_battery_optimization_summary"









        android:title="@string/app_battery_usage_title"









        android:summary="@string/app_battery_usage_summary"









        settings:controller="com.android.settings.applications.AppBatteryUsagePreferenceController"









        android:fragment="com.android.settings.applications.manageapplications.ManageApplications">









        <extra
































res/xml/power_usage_detail.xml



+17
−22






























Original line number
Diff line number
Diff line







@@ -27,9 +27,6 @@







    <com.android.settingslib.widget.ActionButtonsPreference









        android:key="action_buttons"/>



















    <PreferenceCategory









        android:title="@string/battery_detail_manage_title">



















    <com.android.settingslib.widget.SelectorWithWidgetPreference









        android:key="unrestricted_pref"









        android:summary="@string/manager_battery_usage_unrestricted_summary"








@@ -48,8 +45,6 @@







        android:title="@string/manager_battery_usage_restricted_title"









        settings:controller="com.android.settings.fuelgauge.RestrictedPreferenceController"/>



















    </PreferenceCategory>



















    <com.android.settingslib.widget.FooterPreference









        android:key="app_usage_footer_preference"









        android:title="@string/manager_battery_usage_footer"
































src/com/android/settings/applications/manageapplications/ManageApplications.java



+4
−1






























Original line number
Diff line number
Diff line







@@ -955,7 +955,7 @@ public class ManageApplications extends InstrumentedFragment







        } else if (className.equals(AppLocaleDetails.class.getName())) {









            screenTitle = R.string.app_locales_picker_menu_title;









        } else if (className.equals(Settings.AppBatteryUsageActivity.class.getName())) {









            screenTitle = R.string.app_battery_optimization_title;









            screenTitle = R.string.app_battery_usage_title;









        } else {









            if (screenTitle == -1) {









                screenTitle = R.string.all_apps;








@@ -1670,6 +1670,9 @@ public class ManageApplications extends InstrumentedFragment







                case LIST_TYPE_APPS_LOCALE:









                    holder.setSummary(AppLocaleDetails.getSummary(mContext, entry));









                    break;









                case LIST_TYPE_BATTERY_OPTIMIZATION:









                    holder.setSummary(R.string.app_battery_usage_summary);









                    break;









                default:









                    holder.updateSizeText(entry, mManageApplications.mInvalidSizeStr, mWhichSize);









                    break;