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

Commit 644ded01 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update screenshot saving strings." into pi-dev

parents 89868f29 2b840257

packages/SystemUI/res/values/strings.xml

+2 −4
Original line number Diff line number Diff line
@@ -191,16 +191,14 @@ 
    <string name="screenshot_saving_ticker">Saving screenshot\u2026</string>

    <!-- Notification title displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=50] -->

    <string name="screenshot_saving_title">Saving screenshot\u2026</string>

    <!-- Notification text displayed when a screenshot is being saved to the Gallery. [CHAR LIMIT=100] -->

    <string name="screenshot_saving_text">Screenshot is being saved</string>

    <!-- Notification title displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=50] -->

    <string name="screenshot_saved_title">Screenshot saved</string>

    <!-- Notification text displayed when a screenshot is saved to the Gallery. [CHAR LIMIT=100] -->

    <string name="screenshot_saved_text">Tap to view your screenshot</string>

    <!-- Notification title displayed when we fail to take a screenshot. [CHAR LIMIT=50] -->

    <string name="screenshot_failed_title">Couldn\'t capture screenshot</string>

    <string name="screenshot_failed_title">Couldn\'t save screenshot</string>

    <!-- Notification text displayed when we fail to save a screenshot for unknown reasons. [CHAR LIMIT=100] -->

    <string name="screenshot_failed_to_save_unknown_text">Problem encountered while saving screenshot</string>

    <string name="screenshot_failed_to_save_unknown_text">Try taking screenshot again</string>

    <!-- Notification text displayed when we fail to save a screenshot. [CHAR LIMIT=100] -->

    <string name="screenshot_failed_to_save_text">Can\'t save screenshot due to limited storage space</string>

    <!-- Notification text displayed when we fail to take a screenshot. [CHAR LIMIT=100] -->

packages/SystemUI/src/com/android/systemui/screenshot/GlobalScreenshot.java

+0 −2
Original line number Diff line number Diff line
@@ -189,7 +189,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
        mPublicNotificationBuilder =

                new Notification.Builder(context, NotificationChannels.SCREENSHOTS_HEADSUP)

                        .setContentTitle(r.getString(R.string.screenshot_saving_title))

                        .setContentText(r.getString(R.string.screenshot_saving_text))

                        .setSmallIcon(R.drawable.stat_notify_image)

                        .setCategory(Notification.CATEGORY_PROGRESS)

                        .setWhen(now)
@@ -203,7 +202,6 @@ class SaveImageInBackgroundTask extends AsyncTask<Void, Void, Void> { 
            .setTicker(r.getString(R.string.screenshot_saving_ticker)

                    + (mTickerAddSpace ? " " : ""))

            .setContentTitle(r.getString(R.string.screenshot_saving_title))

            .setContentText(r.getString(R.string.screenshot_saving_text))

            .setSmallIcon(R.drawable.stat_notify_image)

            .setWhen(now)

            .setShowWhen(true)