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

Update strings for ignore optimizations control

Browse Source 
Bug: 19991702
Change-Id: Ie5b54fd70176cfceb8b88cf18a9974321ba84c28
This commit is contained in:
Jason Monk
2015-05-11 15:48:11 -04:00
parent 69a03f7517
commit bcb4f2c913
5 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/values/strings.xml
View File

@@ -6636,32 +6636,35 @@
<!-- Label for process [CHAR LIMIT=25] --> <!-- Label for process [CHAR LIMIT=25] -->
<string name="process_format"><xliff:g id="app_name" example="Settings">%1$s</xliff:g> (<xliff:g id="count" example="3">%2$d</xliff:g>)</string> <string name="process_format"><xliff:g id="app_name" example="Settings">%1$s</xliff:g> (<xliff:g id="count" example="3">%2$d</xliff:g>)</string>
<!-- Label for whether app is allowed to use a lot ef power [CHAR LIMIT=25]--> <!-- Label for list to control apps that ignore battery saving restrictions [CHAR LIMIT=25]-->
<string name="high_power" translatable="false">High power</string> <string name="high_power_apps">Ignore optimizations</string>
<!-- List of apps that are allowed to use a lot of power [CHAR LIMIT=25]--> <!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
<string name="high_power_apps" translatable="false">High power apps</string> <string name="high_power_filter_on">Allowed</string>
<!-- Summary of app allowed to use a lot of power [CHAR LIMIT=25] --> <!-- Filter for apps not allowed to use a lot of power [CHAR LIMIT=25] -->
<string name="high_power_on">On</string> <string name="high_power_filter_off">Not allowed</string>
<!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=25] --> <!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
<string name="high_power_off">Off</string> <string name="high_power_on">Allowed to ignore optimizations</string>
<!-- Summary of app not allowed to use a lot of power [CHAR LIMIT=60] -->
<string name="high_power_off">Not allowed to ignore optimizations</string>
<!-- Description of high power switch [CHAR LIMIT=NONE] --> <!-- Description of high power switch [CHAR LIMIT=NONE] -->
<string name="high_power_desc" translatable="false">High powered apps description text goes here. This is a placeholder.</string> <string name="high_power_desc">Ignore optimizations including Battery saver, allow instant content refresh etc.</string>
<!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] --> <!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
<plurals name="high_power_count" translatable="false"> <plurals name="high_power_count">
<item quantity="one">1 app is allowed to ignore restrictions like battery saver mode, sync etc.</item> <item quantity="one">1 app is allowed to ignore battery optimizations</item>
<item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> apps is allowed to ignore restrictions like battery saver mode, sync etc.</item> <item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> apps are allowed to battery optimizations</item>
</plurals> </plurals>
<!-- Summary of power usage for an app [CHAR LIMIT=NONE] --> <!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->
<string name="battery_summary" translatable="false"><xliff:g id="percentage" example="2">%1$d</xliff:g>%% use since last full charge</string> <string name="battery_summary"><xliff:g id="percentage" example="2">%1$d</xliff:g>%% use since last full charge</string>
<!-- Summary for app with no battery usage [CHAR LIMIT=NONE] --> <!-- Summary for app with no battery usage [CHAR LIMIT=NONE] -->
<string name="no_battery_summary" translatable="false">No battery use since last full charge</string> <string name="no_battery_summary">No battery use since last full charge</string>
<!-- Link to an apps notification settings [CHAR LIMIT=50] --> <!-- Link to an apps notification settings [CHAR LIMIT=50] -->
<string name="app_notification_preferences">App notification preferences</string> <string name="app_notification_preferences">App notification preferences</string>

7
res/xml/high_power_details.xml
View File

@@ -16,14 +16,11 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings" xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:title="@string/high_power"> android:title="@string/high_power_apps">
<SwitchPreference <SwitchPreference
android:key="high_power_switch" android:key="high_power_switch"
android:title="@string/high_power" />
<Preference
android:summary="@string/high_power_desc" android:summary="@string/high_power_desc"
android:selectable="false" /> android:title="@string/high_power_apps" />
</PreferenceScreen> </PreferenceScreen>

2
res/xml/power_usage_details.xml
View File

@@ -27,7 +27,7 @@
<Preference <Preference
android:key="high_power" android:key="high_power"
android:title="@string/high_power" /> android:title="@string/high_power_apps" />
<PreferenceCategory <PreferenceCategory
android:key="details_parent" android:key="details_parent"

6
src/com/android/settings/applications/ManageApplications.java
View File

@@ -136,8 +136,8 @@ public class ManageApplications extends InstrumentedFragment
R.string.filter_work_apps, // Work R.string.filter_work_apps, // Work
R.string.filter_with_domain_urls_apps, // Domain URLs R.string.filter_with_domain_urls_apps, // Domain URLs
R.string.filter_all_apps, // Usage access screen, never displayed R.string.filter_all_apps, // Usage access screen, never displayed
R.string.high_power_on, // High power whitelist, on R.string.high_power_filter_on, // High power whitelist, on
R.string.high_power_off, // High power whitelist, off R.string.high_power_filter_off, // High power whitelist, off
}; };
// This is the actual mapping to filters from FILTER_ constants above, the order must // This is the actual mapping to filters from FILTER_ constants above, the order must
// be kept in sync. // be kept in sync.
@@ -444,7 +444,7 @@ public class ManageApplications extends InstrumentedFragment
startAppInfoFragment(AppStorageSettings.class, R.string.storage_settings); startAppInfoFragment(AppStorageSettings.class, R.string.storage_settings);
break; break;
case LIST_TYPE_HIGH_POWER: case LIST_TYPE_HIGH_POWER:
startAppInfoFragment(HighPowerDetail.class, R.string.high_power); startAppInfoFragment(HighPowerDetail.class, R.string.high_power_apps);
break; break;
// TODO: Figure out if there is a way where we can spin up the profile's settings // TODO: Figure out if there is a way where we can spin up the profile's settings
// process ahead of time, to avoid a long load of data when user clicks on a managed app. // process ahead of time, to avoid a long load of data when user clicks on a managed app.

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

@@ -414,8 +414,9 @@ public class PowerUsageDetail extends PowerUsageBase implements Button.OnClickLi
mHighPower.setOnPreferenceClickListener(new OnPreferenceClickListener() { mHighPower.setOnPreferenceClickListener(new OnPreferenceClickListener() {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
AppInfoBase.startAppInfoFragment(HighPowerDetail.class, R.string.high_power, AppInfoBase.startAppInfoFragment(HighPowerDetail.class,
mApp.packageName, mApp.uid, PowerUsageDetail.this, 0); R.string.high_power_apps, mApp.packageName, mApp.uid,
PowerUsageDetail.this, 0);
return true; return true;
} }
}); });