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

Commit 1d1b1157 authored by Tiffany Nguyen's avatar Tiffany Nguyen
Browse files

Align strings and UX across the different pages. 

https://screenshot.googleplex.com/ercwXXcfg2QHkAW.png
https://screenshot.googleplex.com/AWfsrNWsJUbdF8x.png

Bug: 240711618
Test: Manual
Change-Id: I3d1083a7b50adffb67592b2e42914adf755bd6cd
parent 3acd34fe

res/values/strings.xml

+5 −7
Original line number Diff line number Diff line
@@ -6097,7 +6097,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 -->










@@ -6288,8 +6288,6 @@













    <string name="battery_footer_summary">Battery usage data is approximate and can change based on usage.</string>















    <!-- Title for battery usage amount by this app. [CHAR LIMIT=80] -->















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













    <!-- Title for the battery management group [CHAR LIMIT=40] -->













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





























    <!-- Description for battery total and background usage time for an app, i.e. 1 hr 15 min total • 39 min background from last full charge. Note: ^1 and ^2 should be used in all translations [CHAR LIMIT=120] -->















    <string name="battery_total_and_bg_usage"><xliff:g id="time" example="1 hr 15 min">^1</xliff:g> total • <xliff:g id="time" example="39 min">^2</xliff:g> background\nfrom last full charge</string>










@@ -11260,11 +11258,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








@@ -959,7 +959,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;










@@ -1674,6 +1674,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;