DO NOT MERGE am: 37295f86bf

Change-Id: I036454e184e0a1d4fe26240c3a1ec25d4fd55061
This commit is contained in:
Automerger Merge Worker
2020-03-12 10:49:26 +00:00

View File

@@ -5398,13 +5398,9 @@
<!-- Title for the smart battery toggle [CHAR LIMIT=NONE] --> <!-- Title for the smart battery toggle [CHAR LIMIT=NONE] -->
<string name="smart_battery_title">Manage apps automatically</string> <string name="smart_battery_title">Manage apps automatically</string>
<!-- Summary for the smart battery toggle [CHAR LIMIT=NONE] --> <!-- Summary for the smart battery toggle [CHAR LIMIT=NONE] -->
<string name="smart_battery_summary">Limit battery for apps that you don\u2019t use often</string> <string name="smart_battery_summary" product="default">Limit battery for apps that you don\u2019t use often</string>
<!-- Footer for the aosp smart battery page --> <!-- Footer for the aosp smart battery page -->
<string name="smart_battery_footer" product="default">When Battery Manager detects that apps are draining battery, you\u2019ll have the option to restrict these apps. Restricted apps may not work properly and notifications may be delayed.</string> <string name="smart_battery_footer">When Battery Manager detects that apps are draining battery, you\u2019ll have the option to restrict these apps. Restricted apps may not work properly and notifications may be delayed.</string>
<!-- Footer for the aosp smart battery page -->
<string name="smart_battery_footer" product="tablet">When Battery Manager detects that apps are draining battery, you\u2019ll have the option to restrict these apps. Restricted apps may not work properly and notifications may be delayed.</string>
<!-- Footer for the aosp smart battery page -->
<string name="smart_battery_footer" product="device">When Battery Manager detects that apps are draining battery, you\u2019ll have the option to restrict these apps. Restricted apps may not work properly and notifications may be delayed.</string>
<!-- Title for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] --> <!-- Title for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] -->
<string name="restricted_app_title">Restricted apps</string> <string name="restricted_app_title">Restricted apps</string>
<!-- Summary for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] --> <!-- Summary for restricted app preference, clicking it will goes to restricted app list [CHAR LIMIT=NONE] -->
@@ -5425,7 +5421,8 @@
<string name="battery_auto_restriction_summary">Detect when apps drain battery</string> <string name="battery_auto_restriction_summary">Detect when apps drain battery</string>
<!-- Summary for battery manager when it is on --> <!-- Summary for battery manager when it is on -->
<string name="battery_manager_on">On / Detecting when apps drain battery</string> <string name="battery_manager_on" product="default">On / Detecting when apps drain battery</string>
<!-- Summary for battery manager when it is off --> <!-- Summary for battery manager when it is off -->
<string name="battery_manager_off">Off</string> <string name="battery_manager_off">Off</string>
<!-- Summary for battery manager, showing app restricted --> <!-- Summary for battery manager, showing app restricted -->