diff --git a/api/current.txt b/api/current.txt
index fd7c0534a9dd9..1519eb16f369b 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2047,6 +2047,8 @@ package android {
field public static final int TextAppearance_Material_Widget_TextView = 16974381; // 0x103022d
field public static final int TextAppearance_Material_Widget_TextView_PopupMenu = 16974382; // 0x103022e
field public static final int TextAppearance_Material_Widget_TextView_SpinnerItem = 16974383; // 0x103022f
+ field public static final int TextAppearance_Material_Widget_Toolbar_Subtitle = 16974569; // 0x10302e9
+ field public static final int TextAppearance_Material_Widget_Toolbar_Title = 16974568; // 0x10302e8
field public static final int TextAppearance_Material_WindowTitle = 16974361; // 0x1030219
field public static final int TextAppearance_Medium = 16973892; // 0x1030044
field public static final int TextAppearance_Medium_Inverse = 16973893; // 0x1030045
diff --git a/core/res/res/values/dimens_material.xml b/core/res/res/values/dimens_material.xml
index e5a3c17ea8fd2..250d5f810b1db 100644
--- a/core/res/res/values/dimens_material.xml
+++ b/core/res/res/values/dimens_material.xml
@@ -42,6 +42,8 @@
24sp
20sp
16sp
+ 20dp
+ 16dp
16sp
14sp
14sp
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 27c8207c57c1f..7ade51d9c1ad2 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2530,6 +2530,9 @@
+
+
+
diff --git a/core/res/res/values/styles_material.xml b/core/res/res/values/styles_material.xml
index 298fea3bc50ff..9420f3a1ed093 100644
--- a/core/res/res/values/styles_material.xml
+++ b/core/res/res/values/styles_material.xml
@@ -313,15 +313,38 @@ please see styles_device_defaults.xml.
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -759,6 +787,8 @@ please see styles_device_defaults.xml.