Snap for 7290612 from 649d23ec1b27d5d0c6aa7fa1d1899f9a6c586c20 to sc-v2-release

Change-Id: Iff07b1b0a296397c7e07f9ac5e0b3c27cfd001ff
diff --git a/searchuilib/src/com/android/app/search/LayoutType.java b/searchuilib/src/com/android/app/search/LayoutType.java
index ab8b6e8..cf27e2b 100644
--- a/searchuilib/src/com/android/app/search/LayoutType.java
+++ b/searchuilib/src/com/android/app/search/LayoutType.java
@@ -42,6 +42,7 @@
 
     // will replace ICON_DOUBLE_* ICON_SINGLE_* layouts
     public static final String ICON_HORIZONTAL_TEXT = "icon_row";
+    public static final String HORIZONTAL_MEDIUM_TEXT = "icon_row_medium";
     public static final String SMALL_ICON_HORIZONTAL_TEXT = "short_icon_row";
 
     // This layout creates square thumbnail image (currently 3 column)
@@ -67,4 +68,7 @@
 
     // horizontal bar to be inserted between fallback search results and low confidence section
     public static final String EMPTY_DIVIDER = "empty_divider";
+
+    // layout representing quick calculations
+    public static final String CALCULATOR = "calculator";
 }