summaryrefslogtreecommitdiff
path: root/logcat/resources
diff options
context:
space:
mode:
authorAlon Albert <aalbert@google.com>2022-02-08 10:26:58 -0800
committerAlon Albert <aalbert@google.com>2022-02-08 19:48:07 +0000
commitd9945cefeaee65c7f95f35dc7f229fe6af68c48b (patch)
tree5d3e351800faa756c51b80a6b70b2b63c3799cc5 /logcat/resources
parent2a6c6aab937472e6b50f42e267b873f20841575d (diff)
downloadidea-d9945cefeaee65c7f95f35dc7f229fe6af68c48b.tar.gz
Update Filter Color Per Spec
https://www.figma.com/proto/6now1ljuRbAHhvfU6sOvPD/Logcat?page-id=11%3A2338&node-id=835%3A198860&viewport=414%2C48%2C0.39&scaling=scale-down&starting-point-node-id=844%3A189819 According to the spec: * All search terms are colored the same, so in "foo tag:bar", the "foo" and "tag:bar" will have the same appearance. * There is no indication of how to color operators, so they are uncolored for now. * Dark colors were not specified, I added them myself. * The UX request to color the part of the filter that differs from the saved filter is not feasible. Bug: 191880898 Test: Added Change-Id: I3acccb587d67b34a9e8fa106831fad10d7e3cca8
Diffstat (limited to 'logcat/resources')
-rw-r--r--logcat/resources/colorSchemes/LogcatColorSchemeDarcula.xml31
-rw-r--r--logcat/resources/colorSchemes/LogcatColorSchemeDefault.xml30
-rw-r--r--logcat/resources/messages/LogcatBundle.properties4
3 files changed, 65 insertions, 0 deletions
diff --git a/logcat/resources/colorSchemes/LogcatColorSchemeDarcula.xml b/logcat/resources/colorSchemes/LogcatColorSchemeDarcula.xml
index 24afdde4429..68b13fbfe02 100644
--- a/logcat/resources/colorSchemes/LogcatColorSchemeDarcula.xml
+++ b/logcat/resources/colorSchemes/LogcatColorSchemeDarcula.xml
@@ -91,4 +91,35 @@
<option name="FOREGROUND" value="ff6b68"/>
</value>
</option>
+
+ <!-- TODO(aalbert): Update the filter colors to UX spec when provided -->
+ <option name="LOGCAT_FILTER_KEY">
+ <value>
+ <option name="BACKGROUND" value="32593D"/>
+ </value>
+ </option>
+
+ <option name="LOGCAT_FILTER_KVALUE">
+ <value>
+ <option name="BACKGROUND" value="32593D"/>
+ </value>
+ </option>
+
+ <option name="LOGCAT_FILTER_STRING_KVALUE">
+ <value>
+ <option name="BACKGROUND" value="32593D"/>
+ </value>
+ </option>
+
+ <option name="LOGCAT_FILTER_REGEX_KVALUE">
+ <value>
+ <option name="BACKGROUND" value="32593D"/>
+ </value>
+ </option>
+
+ <option name="LOGCAT_FILTER_VALUE">
+ <value>
+ <option name="BACKGROUND" value="32593D"/>
+ </value>
+ </option>
</list>
diff --git a/logcat/resources/colorSchemes/LogcatColorSchemeDefault.xml b/logcat/resources/colorSchemes/LogcatColorSchemeDefault.xml
index 28bd5adfdf6..fbc2cabd905 100644
--- a/logcat/resources/colorSchemes/LogcatColorSchemeDefault.xml
+++ b/logcat/resources/colorSchemes/LogcatColorSchemeDefault.xml
@@ -92,4 +92,34 @@
</value>
</option>
+ <option name="LOGCAT_FILTER_KEY">
+ <value>
+ <option name="BACKGROUND" value="E9F5E6"/>
+ </value>
+ </option>
+
+ <option name="LOGCAT_FILTER_KVALUE">
+ <value>
+ <option name="BACKGROUND" value="E9F5E6"/>
+ </value>
+ </option>
+
+ <option name="LOGCAT_FILTER_STRING_KVALUE">
+ <value>
+ <option name="BACKGROUND" value="E9F5E6"/>
+ </value>
+ </option>
+
+ <option name="LOGCAT_FILTER_REGEX_KVALUE">
+ <value>
+ <option name="BACKGROUND" value="E9F5E6"/>
+ </value>
+ </option>
+
+ <option name="LOGCAT_FILTER_VALUE">
+ <value>
+ <option name="BACKGROUND" value="E9F5E6"/>
+ </value>
+ </option>
+
</list>
diff --git a/logcat/resources/messages/LogcatBundle.properties b/logcat/resources/messages/LogcatBundle.properties
index c8206715244..82bad9ec78a 100644
--- a/logcat/resources/messages/LogcatBundle.properties
+++ b/logcat/resources/messages/LogcatBundle.properties
@@ -48,3 +48,7 @@ logcat.color.page.message={0} message
logcat.process.started= ---------------------------- PROCESS STARTED ({0}) for package {1} ----------------------------
logcat.process.ended= ---------------------------- PROCESS ENDED ({0}) for package {1} ----------------------------
+
+logcat.filter.error=Invalid {0}: {1}
+logcat.filter.error.log.level=log level
+logcat.filter.error.duration=duration