Merge "By default, rich events have log level VERBOSE"

packages/SystemUI/src/com/android/systemui/log/RichEvent.java

@@ -67,7 +67,7 @@ public abstract class RichEvent extends Event {
         private B mBuilder = getBuilder();
         protected int mType = UNINITIALIZED;
         protected String mReason;
-        protected @Level int mLogLevel;
+        protected @Level int mLogLevel = VERBOSE;
 
         /**
          * Get the log-specific builder.

packages/SystemUI/src/com/android/systemui/log/SysuiLog.java

@@ -120,9 +120,9 @@ public class SysuiLog implements Dumpable {
     }
 
     /**
-     * @return user-readable string of the given event
+     * @return user-readable string of the given event with timestamp
      */
-    public String eventToString(Event event) {
+    public String eventToTimestampedString(Event event) {
         StringBuilder sb = new StringBuilder();
         sb.append(SysuiLog.DATE_FORMAT.format(event.getTimestamp()));
         sb.append(" ");
@@ -130,6 +130,13 @@ public class SysuiLog implements Dumpable {
         return sb.toString();
     }
 
+    /**
+     * @return user-readable string of the given event without a timestamp
+     */
+    public String eventToString(Event event) {
+        return event.getMessage();
+    }
+
     /**
      * only call on this method if you have the mDataLock
      */
@@ -137,7 +144,7 @@ public class SysuiLog implements Dumpable {
         pw.println("\tTimeline:");
 
         for (Event event : mTimeline) {
-            pw.println("\t" + eventToString(event));
+            pw.println("\t" + eventToTimestampedString(event));
         }
     }