Merge "Create Advanced battery page"

This commit is contained in:
Lei Yu
2017-02-08 20:33:35 +00:00
committed by Android (Google) Code Review
15 changed files with 569 additions and 12 deletions

View File

@@ -153,4 +153,8 @@
<attr name="aspectRatio" format="float" />
</declare-styleable>
<declare-styleable name="TintablePreference">
<attr name="android:tint" format="color|reference"/>
</declare-styleable>
</resources>

View File

@@ -4317,7 +4317,9 @@
<!-- Bluetooth on time -->
<string name="bluetooth_on_time">Wi\u2011Fi on time</string>
<!-- Activity title for battery usage history details -->
<!-- Activity title for advanced battery usage page [CHAR LIMIT=60] -->
<string name="advanced_battery_title">Advanced battery usage</string>
<!-- Activity title for battery usage history details [CHAR LIMIT=60] -->
<string name="history_details_title">History details</string>
<!-- Activity title for battery usage details for an app. or power consumer -->
@@ -4351,6 +4353,14 @@
<string name="power_unaccounted">Miscellaneous</string>
<!-- Label for power that we computed too much for -->
<string name="power_overcounted">Over-counted</string>
<!-- Label for power consumed by apps [CHAR LIMIT=30] -->
<string name="power_apps">Apps</string>
<!-- Label for power consumed by services [CHAR LIMIT=30] -->
<string name="power_service">Services</string>
<!-- Label for power consumed by system [CHAR LIMIT=30] -->
<string name="power_system">System</string>
<!-- Label for power consumed by user [CHAR LIMIT=30] -->
<string name="power_user">User</string>
<!-- Label for CPU usage time -->
<string name="usage_type_cpu">CPU total</string>
@@ -4470,6 +4480,8 @@
<!-- Description for battery usage time for an app, i.e. Used for 30min. [CHAR LIMIT=60] -->
<string name="battery_used_for">Used for %1$s</string>
<!-- Description for battery usage detail information since last full charge. [CHAR LIMIT=120] -->
<string name="battery_detail_since_full_charge">Usage breakdown since last full charge</string>
<!-- Menu label for viewing battery usage since unplugged -->
<string name="menu_stats_unplugged"><xliff:g id="unplugged">%1$s</xliff:g> since unplugged</string>

View File

@@ -433,5 +433,4 @@
</style>
<style name="AppActionPrimaryButton" parent="android:Widget.Material.Button.Colored"/>
</resources>