Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cb97ad28 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Allow footer string support both mobile and tablet devices" into... 

Merge "Allow footer string support both mobile and tablet devices" into tm-qpr-dev am: 282d38eb am: 641e7bc1

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19781367



Change-Id: I443b6a0cc4c17dafc546b093f83ba248d711015f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 046ea61c 641e7bc1

res/values/strings.xml

+10 −2
Original line number Diff line number Diff line
@@ -6537,9 +6537,17 @@ 
    <!-- [CHAR_LIMIT=NONE] Battery usage item for background usage time -->

    <string name="battery_usage_for_background_time">Background: <xliff:g id="time">%s</xliff:g></string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer content -->

    <string name="battery_usage_screen_footer">Battery usage data is approximate and doesn\'t measure usage when phone is charging</string>

    <string name="battery_usage_screen_footer" product="default">Battery usage data is approximate and doesn\'t measure usage when phone is charging</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer content -->

    <string name="battery_usage_screen_footer" product="tablet">Battery usage data is approximate and doesn\'t measure usage when tablet is charging</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer content -->

    <string name="battery_usage_screen_footer" product="device">Battery usage data is approximate and doesn\'t measure usage when device is charging</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer for empty content -->

    <string name="battery_usage_screen_footer_empty" product="default">Battery usage data will be available after you use your phone for a few hours</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer for empty content -->

    <string name="battery_usage_screen_footer_empty" product="tablet">Battery usage data will be available after you use your tablet for a few hours</string>

    <!-- [CHAR_LIMIT=NONE] Battery usage main screen footer for empty content -->

    <string name="battery_usage_screen_footer_empty">Battery usage data will be available after you use your phone for a few hours</string>

    <string name="battery_usage_screen_footer_empty" product="device">Battery usage data will be available after you use your device for a few hours</string>

    <!-- [CHAR_LIMIT=NONE] Accessibility content description for battery chart view. -->

    <string name="battery_usage_chart">Battery usage chart</string>

    <!-- [CHAR_LIMIT=NONE] Accessibility content description for daily battery chart view. -->