commit 03565bfa311070221b988df3eb5e2ef6e3082aef
author Alan Viverette <alanv@google.com> Fri Sep 12 05:04:59 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Sep 12 05:04:59 2014 +0000
tree d65bb4984c2c10285ded7753027092a7b0a8c809
parent e8264992e597ebb79fda5fbf7d4b3c66acf4921d
parent 934f81a2a46e168683ea02d694f6f7069c987021

am 534c3d39: Merge "Make the TimePicker and light DatePicker styles public" into lmp-dev

* commit '534c3d3900406e30cd3ee15703ee9c2f9d362b0b':
  Make the TimePicker and light DatePicker styles public

api/current.txt

diff --git a/api/current.txt b/api/current.txt
index 87a7dd4..f41af79 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -2550,6 +2550,7 @@
     field public static final int Widget_Material_Light_CompoundButton_CheckBox = 16974504; // 0x10302a8
     field public static final int Widget_Material_Light_CompoundButton_RadioButton = 16974505; // 0x10302a9
     field public static final int Widget_Material_Light_CompoundButton_Star = 16974506; // 0x10302aa
+    field public static final int Widget_Material_Light_DatePicker = 16974578; // 0x10302f2
     field public static final int Widget_Material_Light_DropDownItem = 16974507; // 0x10302ab
     field public static final int Widget_Material_Light_DropDownItem_Spinner = 16974508; // 0x10302ac
     field public static final int Widget_Material_Light_EditText = 16974509; // 0x10302ad
@@ -2587,6 +2588,7 @@
     field public static final int Widget_Material_Light_TabWidget = 16974539; // 0x10302cb
     field public static final int Widget_Material_Light_TextView = 16974540; // 0x10302cc
     field public static final int Widget_Material_Light_TextView_SpinnerItem = 16974541; // 0x10302cd
+    field public static final int Widget_Material_Light_TimePicker = 16974577; // 0x10302f1
     field public static final int Widget_Material_Light_WebTextView = 16974542; // 0x10302ce
     field public static final int Widget_Material_Light_WebView = 16974543; // 0x10302cf
     field public static final int Widget_Material_ListPopupWindow = 16974455; // 0x1030277
@@ -2615,6 +2617,7 @@
     field public static final int Widget_Material_TabWidget = 16974476; // 0x103028c
     field public static final int Widget_Material_TextView = 16974477; // 0x103028d
     field public static final int Widget_Material_TextView_SpinnerItem = 16974478; // 0x103028e
+    field public static final int Widget_Material_TimePicker = 16974576; // 0x10302f0
     field public static final int Widget_Material_Toolbar = 16974479; // 0x103028f
     field public static final int Widget_Material_Toolbar_Button_Navigation = 16974480; // 0x1030290
     field public static final int Widget_Material_WebTextView = 16974481; // 0x1030291

core/res/res/values/public.xml

diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 7e3a6fa..99918a0 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -2562,6 +2562,9 @@
 
   <public type="style" name="Widget.Material.SearchView" />
   <public type="style" name="Widget.Material.Light.SearchView" />
+  <public type="style" name="Widget.Material.TimePicker" />
+  <public type="style" name="Widget.Material.Light.TimePicker" />
+  <public type="style" name="Widget.Material.Light.DatePicker" />
 
   <public-padding type="string" name="l_resource_pad" end="0x01040030" />