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

am ce57d168: Merge "More updates to battery optimization whitelist" into mnc-dev

Browse Source 
* commit 'ce57d168624b6b10b235cb41374e862cca25a1f3':
  More updates to battery optimization whitelist
This commit is contained in:
Jason Monk
2015-05-12 20:17:39 +00:00
committed by Android Git Automerger
parent 70ac19f803 ce57d16862
commit c51c98485c
5 changed files with 45 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
res/values/strings.xml
View File

@@ -5860,6 +5860,7 @@
<string name="keywords_all_apps">apps download applications system</string>
<string name="keywords_app_permissions">apps permissions security</string>
<string name="keywords_default_apps">apps default</string>
<string name="keywords_ignore_optimizations">ignore optimizations doze app standby</string>
<!-- Search keywords for different screen unlock modes : slide to unlock, password, pattern and PIN [CHAR LIMIT=none] -->
<string name="keywords_lockscreen">slide password pattern pin</string>
@@ -6564,22 +6565,19 @@
<!-- Filter for apps allowed to use a lot of power [CHAR LIMIT=25] -->
<string name="high_power_filter_on">Allowed</string>
<!-- Filter for apps not allowed to use a lot of power [CHAR LIMIT=25] -->
<string name="high_power_filter_off">Not allowed</string>
<!-- Summary of app allowed to use a lot of power [CHAR LIMIT=60] -->
<string name="high_power_on">Allowed to ignore optimizations</string>
<string name="high_power_on">Ignoring battery 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>
<string name="high_power_off">Off</string>
<!-- Description of high power switch [CHAR LIMIT=NONE] -->
<string name="high_power_desc">Ignore optimizations including Battery saver, allow instant content refresh etc.</string>
<string name="high_power_desc">Don\'t apply battery optimizations. May drain your battery more quickly.</string>
<!-- Description of number of apps with high power turned on [CHAR LIMIT=NONE] -->
<plurals name="high_power_count">
<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 are allowed to battery optimizations</item>
<item quantity="one">1 app allowed to ignore battery optimizations</item>
<item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> apps allowed to ignore battery optimizations</item>
</plurals>
<!-- Summary of power usage for an app [CHAR LIMIT=NONE] -->

3
res/xml/advanced_apps.xml
View File

@@ -43,7 +43,8 @@
<PreferenceScreen
android:key="high_power_apps"
android:title="@string/high_power_apps"
android:fragment="com.android.settings.applications.ManageApplications">
android:fragment="com.android.settings.applications.ManageApplications"
settings:keywords="@string/keywords_ignore_optimizations">
<extra
android:name="classname"
android:value="com.android.settings.Settings$HighPowerApplicationsActivity" />

21
res/xml/power_usage_details.xml
View File

@@ -25,23 +25,28 @@
android:layout="@layout/two_buttons_panel"
android:selectable="false" />
<Preference
android:key="high_power"
android:title="@string/high_power_apps" />
<PreferenceCategory
android:key="controls_parent"
android:title="@string/controls_subtitle">
<Preference
android:key="high_power"
android:title="@string/high_power_apps" />
</PreferenceCategory>
<PreferenceCategory
android:key="details_parent"
android:layout="@layout/tall_preference_category"
android:title="@string/details_subtitle" />
<PreferenceCategory
android:key="controls_parent"
android:title="@string/controls_subtitle" />
<PreferenceCategory
android:key="messages_parent" />
android:key="messages_parent"
android:layout="@layout/tall_preference_category" />
<PreferenceCategory
android:key="packages_parent"
android:layout="@layout/tall_preference_category"
android:title="@string/packages_subtitle" />
</PreferenceScreen>