Currently, the bugreport screenshots are taken by dumpstate and passed to Shell as a path on BUGREPORT_RECEIVED; this change not only delegates the screenshot taking to Shell, but also allows user to take more screenshots while the bugreport is being generated. As a result of this change, the final ACTION_SEND_MULTIPLE intent might contain multiple screenshot attachments, all of them named "screenshot-PREFIX-NUMBER.png", where PREFIX is the bugreport name (either initial date provided by dumpstate or a name entered by the user) and NUMBER is the sequential number of the screenshot as taken by the user. The screenshot is taken using screencap, which not only is simpler than using Framework APIs, but also faster and less intrusive. The only drawback is that it might fail if an OEM is not providing screencap; if that happens in the field, we'll need to add fallback option to do it using such APIs. Prior to this change, all work done on BugreportProgressService was executed in one single thread (through the ServiceHandler class) but the code was guarded by unnecessary synchronization. Now there is another thread (ScreenshotHandler) that will be used just for taking the screenshot (so it doesn't handle the main thread). Despite the addition of a new thread, the code was simplified to remove most synchronization locks, excepted for the areas touched by both threads. Once this change is submitted, the bugreport service will be changed so it does not ask dumpstate to take a screenshot. BUG: 26274653 Change-Id: I1df883e3c0ca6e3e3cad2522a6a99585f71abb75
69 lines
3.9 KiB
XML
69 lines
3.9 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2013 The Android Open Source Project
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
-->
|
|
|
|
<resources>
|
|
<string name="app_label">Shell</string>
|
|
|
|
<!-- Title of notification indicating a bugreport is being generated. [CHAR LIMIT=50] -->
|
|
<string name="bugreport_in_progress_title">Bug report is being generated</string>
|
|
<!-- Title of notification indicating a bugreport has been successfully captured. [CHAR LIMIT=50] -->
|
|
<string name="bugreport_finished_title">Bug report captured</string>
|
|
|
|
<!-- Text of notification indicating that swipe left will share the captured bugreport. [CHAR LIMIT=100] -->
|
|
<string name="bugreport_finished_text" product="watch">Swipe left to share your bug report</string>
|
|
<!-- Text of notification indicating that touching will share the captured bugreport. [CHAR LIMIT=100] -->
|
|
<string name="bugreport_finished_text" product="default">Touch to share your bug report</string>
|
|
|
|
|
|
<!-- Body of dialog informing user about contents of a bugreport. [CHAR LIMIT=NONE] -->
|
|
<string name="bugreport_confirm">Bug reports contain data from the system\'s various log files, including personal and private information. Only share bug reports with apps and people you trust.</string>
|
|
<!-- Checkbox that indicates this dialog should be shown again when the next bugreport is taken. [CHAR LIMIT=50] -->
|
|
<string name="bugreport_confirm_repeat">Show this message next time</string>
|
|
|
|
<!-- Title for documents backend that offers bugreports. -->
|
|
<string name="bugreport_storage_title">Bug reports</string>
|
|
|
|
<!-- Toast message sent when the bugreport file could be read. -->
|
|
<string name="bugreport_unreadable_text">Bug report file could not be read</string>
|
|
|
|
<!-- Title for bug reports received from dumpstate without a name. [CHAR LIMIT=30]-->
|
|
<string name="bugreport_unnamed">unnamed</string>
|
|
|
|
<!-- Title of the notification action that opens the dialog for the user-defined bug report details. -->
|
|
<string name="bugreport_info_action">Details</string>
|
|
|
|
<!-- Title of the notification action that takes aditional screenshots. -->
|
|
<string name="bugreport_screenshot_action">Screenshot</string>
|
|
|
|
<!-- Toast message sent when the a screenshot for the bug report was taken successfully. -->
|
|
<string name="bugreport_screenshot_taken">Screenshot taken succesfully.</string>
|
|
<!-- Toast message sent when the a screenshot for the bug report was not taken due to an error. -->
|
|
<string name="bugreport_screenshot_failed">Screenshot could not be taken.</string>
|
|
|
|
<!-- Title of the dialog asking for user-defined bug report details like name, title, and description. -->
|
|
<string name="bugreport_info_dialog_title">Bug report details</string>
|
|
|
|
<!-- Text of the hint asking for the bug report name, which when set will define a suffix in the
|
|
bug report file names. [CHAR LIMIT=30] -->
|
|
<string name="bugreport_info_name">Short name</string>
|
|
<!-- Text of hint asking for the bug report title, which when set will define the
|
|
Subject of the email message. [CHAR LIMIT=60] -->
|
|
<string name="bugreport_info_title">1-line summary</string>
|
|
<!-- Text of hint asking for the bug report description, which when set will describe
|
|
what the bug report is about. [CHAR LIMIT=NONE] -->
|
|
<string name="bugreport_info_description">Detailed description</string>
|
|
</resources>
|