summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Salvador Martinez <dehboxturtle@google.com> 2018-03-23 20:43:10 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-03-23 20:43:10 +0000
commit4e83874b0b93a4eac70e94409a5e03033c95d364 (patch)
tree43e0a1928ecc84516393b2512be3d3626911b9f9
parent5558126b11bdef5fe7c525e7336ddcb6be10107c (diff)
parentf14e0677dc804224ffe8584c1988019f0790a9d0 (diff)
Merge "Revert "Add extra strings for 'tomorrow' text"" into pi-dev
-rw-r--r--packages/SettingsLib/res/values/strings.xml9
1 files changed, 0 insertions, 9 deletions
diff --git a/packages/SettingsLib/res/values/strings.xml b/packages/SettingsLib/res/values/strings.xml
index a4cd31d4ed7c..1a9ce95dc867 100644
--- a/packages/SettingsLib/res/values/strings.xml
+++ b/packages/SettingsLib/res/values/strings.xml
@@ -901,15 +901,6 @@
<string name="power_discharge_by">Should last until about <xliff:g id="time">%1$s</xliff:g> (<xliff:g id="level">%2$s</xliff:g>)</string>
<!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery -->
<string name="power_discharge_by_only">Should last until about <xliff:g id="time">%1$s</xliff:g></string>
- <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery tomorrow-->
- <string name="power_discharge_by_tomorrow_enhanced">Should last until about <xliff:g id="time">%1$s</xliff:g> tomorrow based on your usage (<xliff:g id="level">%2$s</xliff:g>)</string>
- <!-- [CHAR_LIMIT=100] Label for enhanced estimated time that phone will run out of battery tomorrow with no percentage -->
- <string name="power_discharge_by_tomorrow_only_enhanced">Should last until about <xliff:g id="time">%1$s</xliff:g> tomorrow based on your usage</string>
- <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery tomorrow -->
- <string name="power_discharge_by_tomorrow">Should last until about <xliff:g id="time">%1$s</xliff:g> tomorrow (<xliff:g id="level">%2$s</xliff:g>)</string>
- <!-- [CHAR_LIMIT=100] Label for estimated time that phone will run out of battery tomorrow-->
- <string name="power_discharge_by_tomorrow_only">Should last until about <xliff:g id="time">%1$s</xliff:g> tomorrow</string>
-
<!-- [CHAR_LIMIT=60] label for estimated remaining duration of battery when under a certain amount -->
<string name="power_remaining_less_than_duration_only">Less than <xliff:g id="threshold">%1$s</xliff:g> remaining</string>